[asterisk-commits] mmichelson: branch group/issue8824 r157369 - in /team/group/issue8824: ./ app...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Nov 18 13:46:33 CST 2008
Author: mmichelson
Date: Tue Nov 18 13:46:33 2008
New Revision: 157369
URL: http://svn.digium.com/view/asterisk?view=rev&rev=157369
Log:
Resolve conflict and reset automerge
Modified:
team/group/issue8824/ (props changed)
team/group/issue8824/apps/app_dial.c
team/group/issue8824/apps/app_followme.c
team/group/issue8824/apps/app_meetme.c
team/group/issue8824/channels/chan_local.c
team/group/issue8824/include/asterisk/channel.h
team/group/issue8824/main/config.c
team/group/issue8824/main/features.c
Propchange: team/group/issue8824/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/issue8824/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/issue8824/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 18 13:46:33 2008
@@ -1,1 +1,1 @@
-/trunk:1-157260
+/trunk:1-157368
Modified: team/group/issue8824/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_dial.c?view=diff&rev=157369&r1=157368&r2=157369
==============================================================================
--- team/group/issue8824/apps/app_dial.c (original)
+++ team/group/issue8824/apps/app_dial.c Tue Nov 18 13:46:33 2008
@@ -1528,6 +1528,10 @@
ast_channel_unlock(chan);
}
+static void end_bridge_callback_data_fixup(struct ast_bridge_config *bconfig, struct ast_channel *originator, struct ast_channel *terminator) {
+ bconfig->end_bridge_callback_data = originator;
+}
+
static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags64 *peerflags, int *continue_exec)
{
int res = -1; /* default: error */
@@ -2237,7 +2241,8 @@
config.end_bridge_callback = end_bridge_callback;
config.end_bridge_callback_data = chan;
-
+ config.end_bridge_callback_data_fixup = end_bridge_callback_data_fixup;
+
if (moh) {
moh = 0;
ast_moh_stop(chan);
Modified: team/group/issue8824/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_followme.c?view=diff&rev=157369&r1=157368&r2=157369
==============================================================================
--- team/group/issue8824/apps/app_followme.c (original)
+++ team/group/issue8824/apps/app_followme.c Tue Nov 18 13:46:33 2008
@@ -992,6 +992,11 @@
ast_channel_unlock(chan);
}
+static void end_bridge_callback_data_fixup(struct ast_bridge_config *bconfig, struct ast_channel *originator, struct ast_channel *terminator)
+{
+ bconfig->end_bridge_callback_data = originator;
+}
+
static int app_exec(struct ast_channel *chan, void *data)
{
struct fm_args targs;
@@ -1116,6 +1121,7 @@
ast_set_flag(&(config.features_caller), AST_FEATURE_AUTOMON);
config.end_bridge_callback = end_bridge_callback;
config.end_bridge_callback_data = chan;
+ config.end_bridge_callback_data_fixup = end_bridge_callback_data_fixup;
ast_moh_stop(caller);
/* Be sure no generators are left on it */
Modified: team/group/issue8824/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_meetme.c?view=diff&rev=157369&r1=157368&r2=157369
==============================================================================
--- team/group/issue8824/apps/app_meetme.c (original)
+++ team/group/issue8824/apps/app_meetme.c Tue Nov 18 13:46:33 2008
@@ -3647,7 +3647,7 @@
if (args.options) {
ast_app_parse_options(meetme_opts, &confflags, optargs, args.options);
dynamic = ast_test_flag(&confflags, CONFFLAG_DYNAMIC | CONFFLAG_DYNAMICPIN);
- if (ast_test_flag(&confflags, CONFFLAG_DYNAMICPIN) && !args.pin)
+ if (ast_test_flag(&confflags, CONFFLAG_DYNAMICPIN) && ast_strlen_zero(args.pin))
strcpy(the_pin, "q");
empty = ast_test_flag(&confflags, CONFFLAG_EMPTY | CONFFLAG_EMPTYNOPIN);
Modified: team/group/issue8824/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/channels/chan_local.c?view=diff&rev=157369&r1=157368&r2=157369
==============================================================================
--- team/group/issue8824/channels/chan_local.c (original)
+++ team/group/issue8824/channels/chan_local.c Tue Nov 18 13:46:33 2008
@@ -287,7 +287,7 @@
if (!ast_check_hangup(p->chan->_bridge)) {
if (!ast_channel_trylock(p->owner)) {
if (!ast_check_hangup(p->owner)) {
- if(p->owner->monitor && !p->chan->_bridge->monitor) {
+ if (p->owner->monitor && !p->chan->_bridge->monitor) {
/* If a local channel is being monitored, we don't want a masquerade
* to cause the monitor to go away. Since the masquerade swaps the monitors,
* pre-swapping the monitors before the masquerade will ensure that the monitor
@@ -296,6 +296,12 @@
tmp = p->owner->monitor;
p->owner->monitor = p->chan->_bridge->monitor;
p->chan->_bridge->monitor = tmp;
+ }
+ if (p->chan->audiohooks) {
+ struct ast_audiohook_list *audiohooks_swapper;
+ audiohooks_swapper = p->chan->audiohooks;
+ p->chan->audiohooks = p->owner->audiohooks;
+ p->owner->audiohooks = audiohooks_swapper;
}
ast_channel_masquerade(p->owner, p->chan->_bridge);
ast_set_flag(p, LOCAL_ALREADY_MASQED);
Modified: team/group/issue8824/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/include/asterisk/channel.h?view=diff&rev=157369&r1=157368&r2=157369
==============================================================================
--- team/group/issue8824/include/asterisk/channel.h (original)
+++ team/group/issue8824/include/asterisk/channel.h Tue Nov 18 13:46:33 2008
@@ -729,6 +729,10 @@
unsigned int flags;
void (* end_bridge_callback)(void *); /*!< A callback that is called after a bridge attempt */
void *end_bridge_callback_data; /*!< Data passed to the callback */
+ /*! If the end_bridge_callback_data refers to a channel which no longer is going to
+ * exist when the end_bridge_callback is called, then it needs to be fixed up properly
+ */
+ void (*end_bridge_callback_data_fixup)(struct ast_bridge_config *bconfig, struct ast_channel *originator, struct ast_channel *terminator);
};
struct chanmon;
Modified: team/group/issue8824/main/config.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/config.c?view=diff&rev=157369&r1=157368&r2=157369
==============================================================================
--- team/group/issue8824/main/config.c (original)
+++ team/group/issue8824/main/config.c Tue Nov 18 13:46:33 2008
@@ -1552,7 +1552,10 @@
stored in the precomments, but not printed back out.
I did have to make sure that comments following
the ;! header comments were not also deleted in the process */
- for (i=fi->lineno;i<lineno - precomment_lines; i++) {
+ if (lineno - precomment_lines - fi->lineno < 0) { /* insertions can mess up the line numbering and produce negative numbers that mess things up */
+ return;
+ }
+ for (i=fi->lineno; i<lineno - precomment_lines; i++) {
fprintf(fp,"\n");
}
fi->lineno = lineno+1; /* Advance the file lineno */
@@ -1641,7 +1644,7 @@
}
}
}
-
+
insert_leading_blank_lines(f, fi, cat->precomments, cat->lineno);
/* Dump section with any appropriate comment */
for (cmt = cat->precomments; cmt; cmt=cmt->next) {
@@ -1655,8 +1658,6 @@
if (cmtp)
fprintf(f,"%s", cmtp);
}
- if (!cat->precomments)
- fprintf(f,"\n");
fprintf(f, "[%s]", cat->name);
if (cat->ignored || !AST_LIST_EMPTY(&cat->template_instances)) {
fprintf(f, "(");
Modified: team/group/issue8824/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/features.c?view=diff&rev=157369&r1=157368&r2=157369
==============================================================================
--- team/group/issue8824/main/features.c (original)
+++ team/group/issue8824/main/features.c Tue Nov 18 13:46:33 2008
@@ -1425,6 +1425,10 @@
tobj->peer = xferchan;
tobj->bconfig = *config;
+ if (tobj->bconfig.end_bridge_callback_data_fixup) {
+ tobj->bconfig.end_bridge_callback_data_fixup(&tobj->bconfig, tobj->peer, tobj->chan);
+ }
+
ast_party_connected_line_collect_caller(&connected_line, &newchan->cid);
connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
ast_connected_line_update(xferchan, &connected_line);
@@ -1528,6 +1532,10 @@
tobj->chan = newchan;
tobj->peer = xferchan;
tobj->bconfig = *config;
+
+ if (tobj->bconfig.end_bridge_callback_data_fixup) {
+ tobj->bconfig.end_bridge_callback_data_fixup(&tobj->bconfig, tobj->peer, tobj->chan);
+ }
ast_party_connected_line_collect_caller(&connected_line, &newchan->cid);
connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
More information about the asterisk-commits
mailing list