Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv635/apps
Modified Files:
Makefile app_dial.c
Log Message:
Merging in xylome's beaerer capabilty patch (bug 3547)
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- Makefile 27 Mar 2005 22:39:16 -0000 1.96
+++ Makefile 1 Apr 2005 17:00:50 -0000 1.97
@@ -31,7 +31,7 @@
app_talkdetect.so app_alarmreceiver.so app_userevent.so app_verbose.so \
app_test.so app_forkcdr.so app_math.so app_realtime.so \
app_dumpchan.so app_waitforsilence.so app_while.so app_setrdnis.so \
- app_md5.so app_readfile.so app_chanspy.so
+ app_md5.so app_readfile.so app_chanspy.so app_settransfercapability.so
ifneq (${OSARCH},Darwin)
ifneq (${OSARCH},SunOS)
Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- app_dial.c 17 Mar 2005 22:39:04 -0000 1.143
+++ app_dial.c 1 Apr 2005 17:00:50 -0000 1.144
@@ -77,8 +77,8 @@
" 'r' -- indicate ringing to the calling party, pass no audio until
answered.\n"
" 'm[(class)]' -- provide hold music to the calling party until answered
(optionally\n"
" with the specified class.\n"
-" 'M(x[^arg]) -- Executes the macro (x with ^ delim arg list) upon
connect of the call.\n"
-" Also, the macro can set the MACRO_RESULT variable to do
the following:\n"
+" 'M(x[^arg])' -- Executes the macro (x with ^ delim arg list) upon
connect of the call.\n"
+" Also, the macro can set the MACRO_RESULT variable to do
the following:\n"
" -- ABORT - Hangup both legs of the call.\n"
" -- CONGESTION - Behave as if line congestion was
encountered.\n"
" -- BUSY - Behave as if a busy signal was encountered.
(n+101)\n"
@@ -1039,8 +1039,8 @@
tmp->chan->cid.cid_tns = chan->cid.cid_tns;
/* Presense of ADSI CPE on outgoing channel follows ours */
tmp->chan->adsicpe = chan->adsicpe;
- /* pass the digital flag */
- ast_copy_flags(tmp->chan, chan, AST_FLAG_DIGITAL);
+ /* Pass the transfer capability */
+ tmp->chan->transfercapability = chan->transfercapability;
/* If we have an outbound group, set this peer channel to it */
if (outbound_group)
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
