[asterisk-commits] oej: branch oej/pinedanish-copybridgeflags-1.6.0 r305740 - in /team/oej/pined...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Feb 2 01:49:55 CST 2011
Author: oej
Date: Wed Feb 2 01:49:49 2011
New Revision: 305740
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305740
Log:
Adding a bit more debugging
Modified:
team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c
team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c
team/oej/pinedanish-copybridgeflags-1.6.0/main/channel.c
team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c
team/oej/pinedanish-copybridgeflags-1.6.0/main/file.c
team/oej/pinedanish-copybridgeflags-1.6.0/main/frame.c
team/oej/pinedanish-copybridgeflags-1.6.0/sounds/Makefile
Modified: team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c?view=diff&rev=305740&r1=305739&r2=305740
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/apps/app_dial.c Wed Feb 2 01:49:49 2011
@@ -2014,8 +2014,11 @@
ast_copy_flags(&chan->bridgeflags, &config.features_callee,
AST_FEATURE_REDIRECT | AST_FEATURE_DISCONNECT |
AST_FEATURE_AUTOMON | AST_FEATURE_PARKCALL | AST_FEATURE_AUTOMIXMON);
+ ast_debug(1, "--- Settings bridgeflags on %s\n", peer->name);
+ ast_copy_flags(&peer->bridgeflags, &config.features_caller,
+ AST_FEATURE_REDIRECT | AST_FEATURE_DISCONNECT |
+ AST_FEATURE_AUTOMON | AST_FEATURE_PARKCALL | AST_FEATURE_AUTOMIXMON);
res = ast_bridge_call(chan, peer, &config);
- //peer->bridgeflags = { 0 } ; /* Reset bridgeflags */
}
strcpy(peer->context, chan->context);
Modified: team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c?view=diff&rev=305740&r1=305739&r2=305740
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/channels/chan_local.c Wed Feb 2 01:49:49 2011
@@ -299,7 +299,7 @@
/* Now, tell the owner's bridge that we had some interesting parameters in the bridge that
will disappear soon, so that we don't drop them */
ast_queue_control_data(p->owner, AST_CONTROL_BRIDGEPARAM, &p->chan->bridgeflags, sizeof(p->chan->bridgeflags));
- ast_debug(1, "----- Sending bridge flags from channel %s upstream\n", p->chan->name);
+ ast_debug(1, "----- Sending bridge flags from channel %s upstream to %s\n", p->chan->name, p->owner->name);
ast_debug(1, "----- We have these channels to play with: 1: %s 2: %s \n", p->chan->name, p->owner->name);
ast_channel_unlock(p->owner);
}
@@ -326,6 +326,9 @@
/* Just queue for delivery to the other side */
ast_mutex_lock(&p->lock);
isoutbound = IS_OUTBOUND(ast, p);
+ if (f && f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_BRIDGEPARAM) {
+ ast_log(LOG_DEBUG, "--- Bridge parameters shipped along ... \n");
+ }
if (isoutbound && f && (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO))
check_bridge(p);
if (!ast_test_flag(p, LOCAL_ALREADY_MASQED))
Modified: team/oej/pinedanish-copybridgeflags-1.6.0/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/main/channel.c?view=diff&rev=305740&r1=305739&r2=305740
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/main/channel.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/main/channel.c Wed Feb 2 01:49:49 2011
@@ -2468,6 +2468,7 @@
return -1;
case AST_CONTROL_RINGING:
case AST_CONTROL_ANSWER:
+ case AST_CONTROL_BRIDGEPARAM:
case AST_CONTROL_SRCUPDATE:
case AST_CONTROL_SRCCHANGE:
/* Unimportant */
@@ -3185,7 +3186,6 @@
case _XXX_AST_CONTROL_T38:
/* deprecated T.38 control frame */
return -1;
- case AST_CONTROL_BRIDGEPARAM:
case AST_CONTROL_T38_PARAMETERS:
/* there is no way to provide 'default' behavior for these
* control frames, so we need to return failure, but there
@@ -3216,6 +3216,7 @@
case AST_CONTROL_PROGRESS:
case AST_CONTROL_PROCEEDING:
case AST_CONTROL_VIDUPDATE:
+ case AST_CONTROL_BRIDGEPARAM:
case AST_CONTROL_SRCUPDATE:
case AST_CONTROL_SRCCHANGE:
case AST_CONTROL_RADIO_KEY:
Modified: team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c?view=diff&rev=305740&r1=305739&r2=305740
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/main/features.c Wed Feb 2 01:49:49 2011
@@ -2469,7 +2469,7 @@
ast_set_flag(&(config->features_callee), AST_FEATURE_AUTOMIXMON);
if (ast_test_flag(param, AST_FEATURE_PARKCALL))
ast_set_flag(&(config->features_callee), AST_FEATURE_PARKCALL);
- ast_debug(2, "--- Setting updated bridge flags from chan_local in this bridge for incoming channel %s Peer %s\n", chan->name, peer->name);
+ ast_debug(2, "--- Setting updated bridge flags from chan_local in this bridge for outgoing channel %s Peer %s\n", chan->name, peer->name);
break;
case AST_CONTROL_OPTION:
aoh = f->data;
Modified: team/oej/pinedanish-copybridgeflags-1.6.0/main/file.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/main/file.c?view=diff&rev=305740&r1=305739&r2=305740
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/main/file.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/main/file.c Wed Feb 2 01:49:49 2011
@@ -1261,6 +1261,7 @@
case AST_CONTROL_VIDUPDATE:
case AST_CONTROL_SRCUPDATE:
case AST_CONTROL_SRCCHANGE:
+ case AST_CONTROL_BRIDGEPARAM:
case AST_CONTROL_HOLD:
case AST_CONTROL_UNHOLD:
case -1:
Modified: team/oej/pinedanish-copybridgeflags-1.6.0/main/frame.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/main/frame.c?view=diff&rev=305740&r1=305739&r2=305740
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/main/frame.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/main/frame.c Wed Feb 2 01:49:49 2011
@@ -822,6 +822,9 @@
case AST_CONTROL_UNHOLD:
strcpy(subclass, "Unhold");
break;
+ case AST_CONTROL_BRIDGEPARAM:
+ strcpy(subclass, "Bridge parameters");
+ break;
case AST_CONTROL_T38_PARAMETERS:
if (f->datalen != sizeof(struct ast_control_t38_parameters)) {
message = "Invalid";
Modified: team/oej/pinedanish-copybridgeflags-1.6.0/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.6.0/sounds/Makefile?view=diff&rev=305740&r1=305739&r2=305740
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.6.0/sounds/Makefile (original)
+++ team/oej/pinedanish-copybridgeflags-1.6.0/sounds/Makefile Wed Feb 2 01:49:49 2011
@@ -17,7 +17,7 @@
SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.18
+CORE_SOUNDS_VERSION:=1.4.19
EXTRA_SOUNDS_VERSION:=1.4.11
MOH_VERSION:=2.03
SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases
More information about the asterisk-commits
mailing list