[asterisk-commits] mmichelson: branch group/v14_colp r157423 - in /team/group/v14_colp: ./ apps/...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Nov 18 14:07:55 CST 2008
Author: mmichelson
Date: Tue Nov 18 14:07:54 2008
New Revision: 157423
URL: http://svn.digium.com/view/asterisk?view=rev&rev=157423
Log:
Resolve conflict and reset automerge
Modified:
team/group/v14_colp/ (props changed)
team/group/v14_colp/apps/app_dial.c
team/group/v14_colp/apps/app_followme.c
team/group/v14_colp/apps/app_meetme.c
team/group/v14_colp/channels/chan_local.c
team/group/v14_colp/include/asterisk/channel.h
team/group/v14_colp/res/res_features.c
Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 18 14:07:54 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-157177
+/branches/1.4:1-157369
Modified: team/group/v14_colp/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/apps/app_dial.c?view=diff&rev=157423&r1=157422&r2=157423
==============================================================================
--- team/group/v14_colp/apps/app_dial.c (original)
+++ team/group/v14_colp/apps/app_dial.c Tue Nov 18 14:07:54 2008
@@ -898,6 +898,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_flags *peerflags, int *continue_exec)
{
int res = -1;
@@ -1854,6 +1858,7 @@
config.start_sound = start_sound;
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/v14_colp/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/apps/app_followme.c?view=diff&rev=157423&r1=157422&r2=157423
==============================================================================
--- team/group/v14_colp/apps/app_followme.c (original)
+++ team/group/v14_colp/apps/app_followme.c Tue Nov 18 14:07:54 2008
@@ -935,6 +935,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;
@@ -1057,6 +1062,7 @@
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/v14_colp/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/apps/app_meetme.c?view=diff&rev=157423&r1=157422&r2=157423
==============================================================================
--- team/group/v14_colp/apps/app_meetme.c (original)
+++ team/group/v14_colp/apps/app_meetme.c Tue Nov 18 14:07:54 2008
@@ -2711,7 +2711,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/v14_colp/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/channels/chan_local.c?view=diff&rev=157423&r1=157422&r2=157423
==============================================================================
--- team/group/v14_colp/channels/chan_local.c (original)
+++ team/group/v14_colp/channels/chan_local.c Tue Nov 18 14:07:54 2008
@@ -254,7 +254,7 @@
if (!p->chan->_bridge->_softhangup) {
if (!ast_mutex_trylock(&p->owner->lock)) {
if (!p->owner->_softhangup) {
- 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
@@ -263,6 +263,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/v14_colp/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/include/asterisk/channel.h?view=diff&rev=157423&r1=157422&r2=157423
==============================================================================
--- team/group/v14_colp/include/asterisk/channel.h (original)
+++ team/group/v14_colp/include/asterisk/channel.h Tue Nov 18 14:07:54 2008
@@ -698,6 +698,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/v14_colp/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/res/res_features.c?view=diff&rev=157423&r1=157422&r2=157423
==============================================================================
--- team/group/v14_colp/res/res_features.c (original)
+++ team/group/v14_colp/res/res_features.c Tue Nov 18 14:07:54 2008
@@ -982,6 +982,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