[Asterisk-cvs] asterisk acl.c, 1.60, 1.61 alaw.c, 1.7, 1.8 app.c, 1.87, 1.88 asterisk.c, 1.196, 1.197 astmm.c, 1.24, 1.25 autoservice.c, 1.16, 1.17 callerid.c, 1.39, 1.40 cdr.c, 1.59, 1.60 channel.c,
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv26648 Modified Files: acl.c alaw.c app.c asterisk.c astmm.c autoservice.c callerid.c cdr.c channel.c chanvars.c cli.c config.c db.c devicestate.c dns.c dnsmgr.c dsp.c enum.c file.c frame.c fskmodem.c image.c indications.c io.c jitterbuf.c loader.c logger.c manager.c md5.c netsock.c pbx.c plc.c privacy.c rtp.c say.c sched.c slinfactory.c srv.c tdd.c term.c translate.c ulaw.c utils.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: acl.c === RCS file: /usr/cvsroot/asterisk/acl.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- acl.c 28 Nov 2005 00:16:36 - 1.60 +++ acl.c 28 Nov 2005 02:13:33 - 1.61 @@ -59,7 +59,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.60 ) #include asterisk/acl.h #include asterisk/logger.h Index: alaw.c === RCS file: /usr/cvsroot/asterisk/alaw.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- alaw.c 28 Nov 2005 00:16:36 - 1.7 +++ alaw.c 28 Nov 2005 02:13:33 - 1.8 @@ -24,7 +24,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.7 ) #include asterisk/alaw.h Index: app.c === RCS file: /usr/cvsroot/asterisk/app.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- app.c 28 Nov 2005 00:16:36 - 1.87 +++ app.c 28 Nov 2005 02:13:33 - 1.88 @@ -36,7 +36,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.87 ) #include asterisk/channel.h #include asterisk/pbx.h Index: asterisk.c === RCS file: /usr/cvsroot/asterisk/asterisk.c,v retrieving revision 1.196 retrieving revision 1.197 diff -u -d -r1.196 -r1.197 --- asterisk.c 14 Nov 2005 19:00:38 - 1.196 +++ asterisk.c 28 Nov 2005 02:13:33 - 1.197 @@ -82,7 +82,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.196 ) #include asterisk/logger.h #include asterisk/options.h Index: astmm.c === RCS file: /usr/cvsroot/asterisk/astmm.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- astmm.c 16 Nov 2005 02:20:16 - 1.24 +++ astmm.c 28 Nov 2005 02:13:33 - 1.25 @@ -30,7 +30,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.24 ) #include asterisk/cli.h #include asterisk/logger.h Index: autoservice.c === RCS file: /usr/cvsroot/asterisk/autoservice.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- autoservice.c 28 Nov 2005 00:16:36 - 1.16 +++ autoservice.c 28 Nov 2005 02:13:33 - 1.17 @@ -33,7 +33,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.16 ) #include asterisk/pbx.h #include asterisk/frame.h Index: callerid.c === RCS file: /usr/cvsroot/asterisk/callerid.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- callerid.c 14 Nov 2005 19:00:38 - 1.39 +++ callerid.c 28 Nov 2005 02:13:33 - 1.40 @@ -32,7 +32,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.39 ) #include asterisk/ulaw.h #include asterisk/alaw.h Index: cdr.c === RCS file: /usr/cvsroot/asterisk/cdr.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- cdr.c 14 Nov 2005 19:00:38 - 1.59 +++ cdr.c 28 Nov 2005 02:13:33 - 1.60 @@ -37,7 +37,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.59 ) #include asterisk/lock.h #include asterisk/channel.h Index: channel.c === RCS file: /usr/cvsroot/asterisk/channel.c,v retrieving revision 1.260 retrieving revision 1.261 diff -u -d -r1.260 -r1.261 --- channel.c 16 Nov 2005 18:11:28 - 1.260 +++ channel.c 28 Nov 2005 02:13:33 - 1.261 @@ -45,7 +45,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__,
[Asterisk-cvs] asterisk/codecs codec_a_mu.c, 1.13, 1.14 codec_adpcm.c, 1.23, 1.24 codec_alaw.c, 1.16, 1.17 codec_g723_1.c, 1.22, 1.23 codec_g726.c, 1.16, 1.17 codec_gsm.c, 1.22, 1.23 codec_ilbc.c, 1.1
Update of /usr/cvsroot/asterisk/codecs In directory mongoose.digium.com:/tmp/cvs-serv26648/codecs Modified Files: codec_a_mu.c codec_adpcm.c codec_alaw.c codec_g723_1.c codec_g726.c codec_gsm.c codec_ilbc.c codec_lpc10.c codec_speex.c codec_ulaw.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: codec_a_mu.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_a_mu.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- codec_a_mu.c28 Nov 2005 00:16:36 - 1.13 +++ codec_a_mu.c28 Nov 2005 02:13:34 - 1.14 @@ -32,7 +32,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.13 ) #include asterisk/lock.h #include asterisk/logger.h Index: codec_adpcm.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_adpcm.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- codec_adpcm.c 28 Nov 2005 00:16:36 - 1.23 +++ codec_adpcm.c 28 Nov 2005 02:13:34 - 1.24 @@ -36,7 +36,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.23 ) #include asterisk/lock.h #include asterisk/logger.h Index: codec_alaw.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_alaw.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- codec_alaw.c28 Nov 2005 00:16:36 - 1.16 +++ codec_alaw.c28 Nov 2005 02:13:34 - 1.17 @@ -32,7 +32,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.16 ) #include asterisk/lock.h #include asterisk/logger.h Index: codec_g723_1.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_g723_1.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- codec_g723_1.c 28 Nov 2005 00:16:36 - 1.22 +++ codec_g723_1.c 28 Nov 2005 02:13:34 - 1.23 @@ -43,7 +43,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.22 ) #include asterisk/lock.h #include asterisk/translate.h Index: codec_g726.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_g726.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- codec_g726.c28 Nov 2005 00:16:36 - 1.16 +++ codec_g726.c28 Nov 2005 02:13:34 - 1.17 @@ -36,7 +36,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.16 ) #include asterisk/lock.h #include asterisk/logger.h Index: codec_gsm.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_gsm.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- codec_gsm.c 28 Nov 2005 00:16:36 - 1.22 +++ codec_gsm.c 28 Nov 2005 02:13:34 - 1.23 @@ -35,7 +35,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.22 ) #include asterisk/lock.h #include asterisk/translate.h Index: codec_ilbc.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_ilbc.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- codec_ilbc.c28 Nov 2005 00:16:36 - 1.15 +++ codec_ilbc.c28 Nov 2005 02:13:34 - 1.16 @@ -34,7 +34,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.15 ) #include asterisk/lock.h #include asterisk/translate.h Index: codec_lpc10.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_lpc10.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- codec_lpc10.c 28 Nov 2005 00:16:36 - 1.20 +++ codec_lpc10.c 28 Nov 2005 02:13:34 - 1.21 @@ -36,7 +36,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.20 ) #include asterisk/lock.h #include asterisk/translate.h Index: codec_speex.c === RCS file: /usr/cvsroot/asterisk/codecs/codec_speex.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- codec_speex.c 28 Nov 2005 00:16:36 - 1.22 +++ codec_speex.c 28 Nov 2005 02:13:34 - 1.23 @@ -66,7 +66,7 @@
[Asterisk-cvs] asterisk/formats format_au.c, 1.8, 1.9 format_g723.c, 1.25, 1.26 format_g726.c, 1.16, 1.17 format_g729.c, 1.25, 1.26 format_gsm.c, 1.30, 1.31 format_h263.c, 1.18, 1.19 format_ilbc.c, 1
Update of /usr/cvsroot/asterisk/formats In directory mongoose.digium.com:/tmp/cvs-serv26648/formats Modified Files: format_au.c format_g723.c format_g726.c format_g729.c format_gsm.c format_h263.c format_ilbc.c format_jpeg.c format_ogg_vorbis.c format_pcm.c format_pcm_alaw.c format_sln.c format_vox.c format_wav.c format_wav_gsm.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: format_au.c === RCS file: /usr/cvsroot/asterisk/formats/format_au.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- format_au.c 6 Nov 2005 15:09:47 - 1.8 +++ format_au.c 28 Nov 2005 02:13:34 - 1.9 @@ -34,7 +34,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.8 ) #include asterisk/lock.h #include asterisk/channel.h Index: format_g723.c === RCS file: /usr/cvsroot/asterisk/formats/format_g723.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- format_g723.c 6 Nov 2005 15:09:47 - 1.25 +++ format_g723.c 28 Nov 2005 02:13:34 - 1.26 @@ -36,7 +36,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.25 ) #include asterisk/lock.h #include asterisk/channel.h Index: format_g726.c === RCS file: /usr/cvsroot/asterisk/formats/format_g726.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- format_g726.c 6 Nov 2005 15:09:47 - 1.16 +++ format_g726.c 28 Nov 2005 02:13:34 - 1.17 @@ -39,7 +39,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.16 ) #include asterisk/lock.h #include asterisk/options.h Index: format_g729.c === RCS file: /usr/cvsroot/asterisk/formats/format_g729.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- format_g729.c 6 Nov 2005 15:09:47 - 1.25 +++ format_g729.c 28 Nov 2005 02:13:34 - 1.26 @@ -37,7 +37,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.25 ) #include asterisk/lock.h #include asterisk/channel.h Index: format_gsm.c === RCS file: /usr/cvsroot/asterisk/formats/format_gsm.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- format_gsm.c6 Nov 2005 15:09:47 - 1.30 +++ format_gsm.c28 Nov 2005 02:13:34 - 1.31 @@ -34,7 +34,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.30 ) #include asterisk/lock.h #include asterisk/channel.h Index: format_h263.c === RCS file: /usr/cvsroot/asterisk/formats/format_h263.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- format_h263.c 6 Nov 2005 15:09:47 - 1.18 +++ format_h263.c 28 Nov 2005 02:13:34 - 1.19 @@ -34,7 +34,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.18 ) #include asterisk/lock.h #include asterisk/channel.h Index: format_ilbc.c === RCS file: /usr/cvsroot/asterisk/formats/format_ilbc.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- format_ilbc.c 6 Nov 2005 15:09:47 - 1.18 +++ format_ilbc.c 28 Nov 2005 02:13:34 - 1.19 @@ -36,7 +36,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.18 ) #include asterisk/lock.h #include asterisk/channel.h Index: format_jpeg.c === RCS file: /usr/cvsroot/asterisk/formats/format_jpeg.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- format_jpeg.c 6 Nov 2005 15:09:47 - 1.13 +++ format_jpeg.c 28 Nov 2005 02:13:34 - 1.14 @@ -36,7 +36,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.13 ) #include asterisk/channel.h #include asterisk/file.h Index: format_ogg_vorbis.c === RCS file: /usr/cvsroot/asterisk/formats/format_ogg_vorbis.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- format_ogg_vorbis.c 16 Nov 2005 00:22:30
[Asterisk-cvs] asterisk/pbx dundi-parser.c, 1.11, 1.12 pbx_ael.c, 1.21, 1.22 pbx_config.c, 1.72, 1.73 pbx_dundi.c, 1.49, 1.50 pbx_gtkconsole.c, 1.21, 1.22 pbx_loopback.c, 1.12, 1.13 pbx_realtime.c, 1.
Update of /usr/cvsroot/asterisk/pbx In directory mongoose.digium.com:/tmp/cvs-serv26648/pbx Modified Files: dundi-parser.c pbx_ael.c pbx_config.c pbx_dundi.c pbx_gtkconsole.c pbx_loopback.c pbx_realtime.c pbx_spool.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: dundi-parser.c === RCS file: /usr/cvsroot/asterisk/pbx/dundi-parser.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- dundi-parser.c 24 Oct 2005 20:12:06 - 1.11 +++ dundi-parser.c 28 Nov 2005 02:13:34 - 1.12 @@ -33,7 +33,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.11 ) #include asterisk/frame.h #include asterisk/utils.h Index: pbx_ael.c === RCS file: /usr/cvsroot/asterisk/pbx/pbx_ael.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- pbx_ael.c 16 Nov 2005 17:16:23 - 1.21 +++ pbx_ael.c 28 Nov 2005 02:13:34 - 1.22 @@ -31,7 +31,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.21 ) #include asterisk/pbx.h #include asterisk/config.h Index: pbx_config.c === RCS file: /usr/cvsroot/asterisk/pbx/pbx_config.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- pbx_config.c14 Nov 2005 19:00:38 - 1.72 +++ pbx_config.c28 Nov 2005 02:13:34 - 1.73 @@ -32,7 +32,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.72 ) #include asterisk/pbx.h #include asterisk/config.h Index: pbx_dundi.c === RCS file: /usr/cvsroot/asterisk/pbx/pbx_dundi.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- pbx_dundi.c 8 Nov 2005 04:48:00 - 1.49 +++ pbx_dundi.c 28 Nov 2005 02:13:34 - 1.50 @@ -46,7 +46,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.49 ) #include asterisk/file.h #include asterisk/logger.h Index: pbx_gtkconsole.c === RCS file: /usr/cvsroot/asterisk/pbx/pbx_gtkconsole.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- pbx_gtkconsole.c24 Oct 2005 20:12:06 - 1.21 +++ pbx_gtkconsole.c28 Nov 2005 02:13:34 - 1.22 @@ -45,7 +45,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.21 ) #include asterisk/pbx.h #include asterisk/config.h Index: pbx_loopback.c === RCS file: /usr/cvsroot/asterisk/pbx/pbx_loopback.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- pbx_loopback.c 8 Nov 2005 04:48:00 - 1.12 +++ pbx_loopback.c 28 Nov 2005 02:13:35 - 1.13 @@ -30,7 +30,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.12 ) #include asterisk/file.h #include asterisk/logger.h Index: pbx_realtime.c === RCS file: /usr/cvsroot/asterisk/pbx/pbx_realtime.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- pbx_realtime.c 8 Nov 2005 04:48:00 - 1.15 +++ pbx_realtime.c 28 Nov 2005 02:13:35 - 1.16 @@ -31,7 +31,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.15 ) #include asterisk/file.h #include asterisk/logger.h Index: pbx_spool.c === RCS file: /usr/cvsroot/asterisk/pbx/pbx_spool.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- pbx_spool.c 20 Nov 2005 10:32:28 - 1.34 +++ pbx_spool.c 28 Nov 2005 02:13:35 - 1.35 @@ -36,7 +36,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.34 ) #include asterisk/lock.h #include asterisk/file.h ___ --Bandwidth and Colocation provided by Easynews.com -- Asterisk-Cvs mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/funcs func_callerid.c, 1.8, 1.9 func_cdr.c, 1.10, 1.11 func_db.c, 1.10, 1.11 func_env.c, 1.7, 1.8 func_groupcount.c, 1.10, 1.11 func_language.c, 1.4, 1.5 func_logic.c, 1.13, 1.
Update of /usr/cvsroot/asterisk/funcs In directory mongoose.digium.com:/tmp/cvs-serv26648/funcs Modified Files: func_callerid.c func_cdr.c func_db.c func_env.c func_groupcount.c func_language.c func_logic.c func_math.c func_md5.c func_strings.c func_timeout.c func_uri.c pbx_functions.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: func_callerid.c === RCS file: /usr/cvsroot/asterisk/funcs/func_callerid.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- func_callerid.c 8 Nov 2005 04:48:00 - 1.8 +++ func_callerid.c 28 Nov 2005 02:13:34 - 1.9 @@ -27,7 +27,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.8 ) #ifndef BUILTIN_FUNC #include asterisk/module.h Index: func_cdr.c === RCS file: /usr/cvsroot/asterisk/funcs/func_cdr.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- func_cdr.c 28 Nov 2005 00:16:37 - 1.10 +++ func_cdr.c 28 Nov 2005 02:13:34 - 1.11 @@ -28,7 +28,7 @@ #include asterisk.h -/* ASTERISK_FILE_VERSION(__FILE__, $Revision$) */ +/* ASTERISK_FILE_VERSION(__FILE__, Revision: 1.10 ) */ #include asterisk/channel.h #include asterisk/pbx.h Index: func_db.c === RCS file: /usr/cvsroot/asterisk/funcs/func_db.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- func_db.c 28 Nov 2005 00:16:37 - 1.10 +++ func_db.c 28 Nov 2005 02:13:34 - 1.11 @@ -31,7 +31,7 @@ #include asterisk.h -/* ASTERISK_FILE_VERSION(__FILE__, $Revision$) */ +/* ASTERISK_FILE_VERSION(__FILE__, Revision: 1.10 ) */ #include asterisk/channel.h #include asterisk/pbx.h Index: func_env.c === RCS file: /usr/cvsroot/asterisk/funcs/func_env.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- func_env.c 28 Nov 2005 00:16:37 - 1.7 +++ func_env.c 28 Nov 2005 02:13:34 - 1.8 @@ -26,7 +26,7 @@ #include asterisk.h -/* ASTERISK_FILE_VERSION(__FILE__, $Revision$) */ +/* ASTERISK_FILE_VERSION(__FILE__, Revision: 1.7 ) */ #include asterisk/channel.h #include asterisk/pbx.h Index: func_groupcount.c === RCS file: /usr/cvsroot/asterisk/funcs/func_groupcount.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- func_groupcount.c 8 Nov 2005 04:48:00 - 1.10 +++ func_groupcount.c 28 Nov 2005 02:13:34 - 1.11 @@ -27,7 +27,7 @@ #include asterisk.h -/* ASTERISK_FILE_VERSION(__FILE__, $Revision$) */ +/* ASTERISK_FILE_VERSION(__FILE__, Revision: 1.10 ) */ #include asterisk/channel.h #include asterisk/pbx.h Index: func_language.c === RCS file: /usr/cvsroot/asterisk/funcs/func_language.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- func_language.c 24 Oct 2005 20:12:06 - 1.4 +++ func_language.c 28 Nov 2005 02:13:34 - 1.5 @@ -26,7 +26,7 @@ #include asterisk.h -/* ASTERISK_FILE_VERSION(__FILE__, $Revision$) */ +/* ASTERISK_FILE_VERSION(__FILE__, Revision: 1.4 ) */ #include asterisk/channel.h #include asterisk/pbx.h Index: func_logic.c === RCS file: /usr/cvsroot/asterisk/funcs/func_logic.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- func_logic.c28 Nov 2005 00:16:37 - 1.13 +++ func_logic.c28 Nov 2005 02:13:34 - 1.14 @@ -27,7 +27,7 @@ #include asterisk.h -/* ASTERISK_FILE_VERSION(__FILE__, $Revision$) */ +/* ASTERISK_FILE_VERSION(__FILE__, Revision: 1.13 ) */ #include asterisk/channel.h #include asterisk/pbx.h Index: func_math.c === RCS file: /usr/cvsroot/asterisk/funcs/func_math.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- func_math.c 8 Nov 2005 04:48:00 - 1.6 +++ func_math.c 28 Nov 2005 02:13:34 - 1.7 @@ -29,7 +29,7 @@ #include asterisk.h -/* ASTERISK_FILE_VERSION(__FILE__, $Revision$) */ +/* ASTERISK_FILE_VERSION(__FILE__, Revision: 1.6 ) */ #include asterisk/channel.h #include asterisk/pbx.h Index: func_md5.c === RCS file: /usr/cvsroot/asterisk/funcs/func_md5.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- func_md5.c 28 Nov 2005 00:16:37 - 1.9 +++ func_md5.c 28 Nov 2005 02:13:34 - 1.10 @@ -28,7 +28,7 @@
[Asterisk-cvs] asterisk/channels chan_agent.c, 1.168, 1.169 chan_alsa.c, 1.53, 1.54 chan_features.c, 1.20, 1.21 chan_h323.c, 1.134, 1.135 chan_iax2.c, 1.383, 1.384 chan_local.c, 1.57, 1.58 chan_mgcp.c
Update of /usr/cvsroot/asterisk/channels In directory mongoose.digium.com:/tmp/cvs-serv26648/channels Modified Files: chan_agent.c chan_alsa.c chan_features.c chan_h323.c chan_iax2.c chan_local.c chan_mgcp.c chan_modem.c chan_modem_aopen.c chan_modem_bestdata.c chan_modem_i4l.c chan_nbs.c chan_oss.c chan_oss_old.c chan_phone.c chan_sip.c chan_skinny.c chan_vpb.c chan_zap.c iax2-parser.c iax2-provision.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: chan_agent.c === RCS file: /usr/cvsroot/asterisk/channels/chan_agent.c,v retrieving revision 1.168 retrieving revision 1.169 diff -u -d -r1.168 -r1.169 --- chan_agent.c8 Nov 2005 04:02:35 - 1.168 +++ chan_agent.c28 Nov 2005 02:13:34 - 1.169 @@ -42,7 +42,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.168 ) #include asterisk/lock.h #include asterisk/channel.h Index: chan_alsa.c === RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- chan_alsa.c 15 Nov 2005 20:56:19 - 1.53 +++ chan_alsa.c 28 Nov 2005 02:13:34 - 1.54 @@ -41,7 +41,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.53 ) #include asterisk/frame.h #include asterisk/logger.h Index: chan_features.c === RCS file: /usr/cvsroot/asterisk/channels/chan_features.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- chan_features.c 28 Nov 2005 00:16:36 - 1.20 +++ chan_features.c 28 Nov 2005 02:13:34 - 1.21 @@ -39,7 +39,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.20 ) #include asterisk/lock.h #include asterisk/channel.h Index: chan_h323.c === RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- chan_h323.c 28 Nov 2005 00:16:36 - 1.134 +++ chan_h323.c 28 Nov 2005 02:13:34 - 1.135 @@ -57,7 +57,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.134 ) #include asterisk/lock.h #include asterisk/logger.h Index: chan_iax2.c === RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v retrieving revision 1.383 retrieving revision 1.384 diff -u -d -r1.383 -r1.384 --- chan_iax2.c 21 Nov 2005 19:27:26 - 1.383 +++ chan_iax2.c 28 Nov 2005 02:13:34 - 1.384 @@ -57,7 +57,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.383 ) #include asterisk/lock.h #include asterisk/frame.h Index: chan_local.c === RCS file: /usr/cvsroot/asterisk/channels/chan_local.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- chan_local.c8 Nov 2005 20:38:10 - 1.57 +++ chan_local.c28 Nov 2005 02:13:34 - 1.58 @@ -37,7 +37,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.57 ) #include asterisk/lock.h #include asterisk/channel.h Index: chan_mgcp.c === RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- chan_mgcp.c 28 Nov 2005 00:16:36 - 1.134 +++ chan_mgcp.c 28 Nov 2005 02:13:34 - 1.135 @@ -88,7 +88,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.134 ) #include asterisk/lock.h #include asterisk/channel.h Index: chan_modem.c === RCS file: /usr/cvsroot/asterisk/channels/chan_modem.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- chan_modem.c28 Nov 2005 00:16:36 - 1.50 +++ chan_modem.c28 Nov 2005 02:13:34 - 1.51 @@ -39,7 +39,7 @@ #include asterisk.h -ASTERISK_FILE_VERSION(__FILE__, $Revision$) +ASTERISK_FILE_VERSION(__FILE__, Revision: 1.50 ) #include asterisk/lock.h #include asterisk/channel.h Index: chan_modem_aopen.c === RCS file: /usr/cvsroot/asterisk/channels/chan_modem_aopen.c,v retrieving revision 1.20 retrieving
[Asterisk-cvs] zaptel zaptel.c,1.125,1.126
Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv10029
Modified Files:
zaptel.c
Log Message:
eliminate preprocessor warnings
Index: zaptel.c
===
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- zaptel.c11 Nov 2005 20:48:43 - 1.125
+++ zaptel.c23 Nov 2005 17:32:58 - 1.126
@@ -1260,7 +1260,7 @@
#ifndef LINUX26
MOD_INC_USE_COUNT;
#endif
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(ZAPNET: Opened channel %d name %s\n, ms-channo, ms-name);
#endif
return 0;
@@ -1421,7 +1421,7 @@
dev-trans_start = jiffies;
stats-tx_packets++;
stats-tx_bytes += ss-writen[oldbuf];
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Buffered %d bytes to go out in buffer %d\n,
ss-writen[oldbuf], oldbuf);
for (x=0;xss-writen[oldbuf];x++)
printk(%02x , ss-writebuf[oldbuf][x]);
@@ -1522,7 +1522,7 @@
some space for us */
ss-outwritebuf = oldbuf;
}
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Buffered %d bytes (skblen = %d) to go out in buffer
%d\n, ss-writen[oldbuf], skb-len, oldbuf);
for (x=0;xss-writen[oldbuf];x++)
printk(%02x , ss-writebuf[oldbuf][x]);
@@ -1733,7 +1733,7 @@
amnt = chan-blocksize;
}
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(zt_chan_write(unit: %d, inwritebuf: %d, outwritebuf: %d amnt:
%d\n,
unit, chan-inwritebuf, chan-outwritebuf, amnt);
#endif
@@ -1920,7 +1920,7 @@
} else {
for (x=0;xNUM_SIGS;x++) {
if (outs[x][0] == chan-sig) {
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Setting bits to %d for channel %s state
%d in %d signalling\n, outs[x][txsig + 1], chan-name, txsig, chan-sig);
#endif
chan-txhooksig = txsig;
@@ -3029,14 +3029,14 @@
if (!chan-span)
return;
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Recalculating slaves on %s\n, chan-name);
#endif
/* Link all slaves appropriately */
for (x=chan-chanpos;xchan-span-channels;x++)
if (chan-span-chans[x].master == chan) {
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Channel %s, slave to %s, last is %s, its next
will be %d\n,
chan-span-chans[x].name, chan-name,
last-name, x);
#endif
@@ -3045,7 +3045,7 @@
}
/* Terminate list */
last-nextslave = 0;
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Done Recalculating slaves on %s (last is %s)\n, chan-name,
last-name);
#endif
}
@@ -3292,7 +3292,7 @@
if (y = 0) chans[ch.chan]-rxsig = (unsigned char)y;
chans[ch.chan]-rxhooksig = ZT_RXSIG_INITIAL;
}
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Configured channel %s, flags %04x, sig %04x\n,
chans[ch.chan]-name, chans[ch.chan]-flags, chans[ch.chan]-sig);
#endif
spin_unlock_irqrestore(chans[ch.chan]-lock, flags);
@@ -5284,7 +5284,7 @@
zt_rbs_sethook(chan,ZT_TXSIG_OFFHOOK,
ZT_TXSTATE_AFTERSTART, ZT_AFTERSTART_TIME);
}
chan-kewlonhook = 0;
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Off hook on channel %d, itimer = %d, gotgs =
%d\n, chan-channo, chan-itimer, chan-gotgs);
#endif
if (chan-itimer) /* if timer still running */
@@ -5803,7 +5803,7 @@
oldbuf = ms-inreadbuf;
ms-infcs = PPP_INITFCS;
ms-readn[ms-inreadbuf] =
ms-readidx[ms-inreadbuf];
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(EOF, len is %d\n,
ms-readn[ms-inreadbuf]);
#endif
#if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP)
@@ -5873,7 +5873,7 @@
/* Whoops, we're full, and have
no where else
to store into at the moment.
We'll drop it
until there's a buffer
available */
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Out of storage
space\n);
#endif
ms-inreadbuf = -1;
@@ -5896,7 +5896,7 @@
if (!ms-rxdisable) { /* if
[Asterisk-cvs] zaptel zaptel.c,1.125,1.125.2.1
Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv10056
Modified Files:
Tag: v1-2
zaptel.c
Log Message:
eliminate preprocessor warnings
Index: zaptel.c
===
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.125
retrieving revision 1.125.2.1
diff -u -d -r1.125 -r1.125.2.1
--- zaptel.c11 Nov 2005 20:48:43 - 1.125
+++ zaptel.c23 Nov 2005 17:33:44 - 1.125.2.1
@@ -1260,7 +1260,7 @@
#ifndef LINUX26
MOD_INC_USE_COUNT;
#endif
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(ZAPNET: Opened channel %d name %s\n, ms-channo, ms-name);
#endif
return 0;
@@ -1421,7 +1421,7 @@
dev-trans_start = jiffies;
stats-tx_packets++;
stats-tx_bytes += ss-writen[oldbuf];
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Buffered %d bytes to go out in buffer %d\n,
ss-writen[oldbuf], oldbuf);
for (x=0;xss-writen[oldbuf];x++)
printk(%02x , ss-writebuf[oldbuf][x]);
@@ -1522,7 +1522,7 @@
some space for us */
ss-outwritebuf = oldbuf;
}
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Buffered %d bytes (skblen = %d) to go out in buffer
%d\n, ss-writen[oldbuf], skb-len, oldbuf);
for (x=0;xss-writen[oldbuf];x++)
printk(%02x , ss-writebuf[oldbuf][x]);
@@ -1733,7 +1733,7 @@
amnt = chan-blocksize;
}
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(zt_chan_write(unit: %d, inwritebuf: %d, outwritebuf: %d amnt:
%d\n,
unit, chan-inwritebuf, chan-outwritebuf, amnt);
#endif
@@ -1920,7 +1920,7 @@
} else {
for (x=0;xNUM_SIGS;x++) {
if (outs[x][0] == chan-sig) {
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Setting bits to %d for channel %s state
%d in %d signalling\n, outs[x][txsig + 1], chan-name, txsig, chan-sig);
#endif
chan-txhooksig = txsig;
@@ -3029,14 +3029,14 @@
if (!chan-span)
return;
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Recalculating slaves on %s\n, chan-name);
#endif
/* Link all slaves appropriately */
for (x=chan-chanpos;xchan-span-channels;x++)
if (chan-span-chans[x].master == chan) {
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Channel %s, slave to %s, last is %s, its next
will be %d\n,
chan-span-chans[x].name, chan-name,
last-name, x);
#endif
@@ -3045,7 +3045,7 @@
}
/* Terminate list */
last-nextslave = 0;
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Done Recalculating slaves on %s (last is %s)\n, chan-name,
last-name);
#endif
}
@@ -3292,7 +3292,7 @@
if (y = 0) chans[ch.chan]-rxsig = (unsigned char)y;
chans[ch.chan]-rxhooksig = ZT_RXSIG_INITIAL;
}
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Configured channel %s, flags %04x, sig %04x\n,
chans[ch.chan]-name, chans[ch.chan]-flags, chans[ch.chan]-sig);
#endif
spin_unlock_irqrestore(chans[ch.chan]-lock, flags);
@@ -5284,7 +5284,7 @@
zt_rbs_sethook(chan,ZT_TXSIG_OFFHOOK,
ZT_TXSTATE_AFTERSTART, ZT_AFTERSTART_TIME);
}
chan-kewlonhook = 0;
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Off hook on channel %d, itimer = %d, gotgs =
%d\n, chan-channo, chan-itimer, chan-gotgs);
#endif
if (chan-itimer) /* if timer still running */
@@ -5803,7 +5803,7 @@
oldbuf = ms-inreadbuf;
ms-infcs = PPP_INITFCS;
ms-readn[ms-inreadbuf] =
ms-readidx[ms-inreadbuf];
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(EOF, len is %d\n,
ms-readn[ms-inreadbuf]);
#endif
#if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP)
@@ -5873,7 +5873,7 @@
/* Whoops, we're full, and have
no where else
to store into at the moment.
We'll drop it
until there's a buffer
available */
-#if CONFIG_ZAPATA_DEBUG
+#ifdef CONFIG_ZAPATA_DEBUG
printk(Out of storage
space\n);
#endif
ms-inreadbuf = -1;
@@ -5896,7 +5896,7 @@
[Asterisk-cvs] asterisk ChangeLog,1.171,1.172
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25480 Modified Files: ChangeLog Log Message: fix a bug found during a recent upgrade Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.171 retrieving revision 1.172 diff -u -d -r1.171 -r1.172 --- ChangeLog 21 Nov 2005 15:09:31 - 1.171 +++ ChangeLog 21 Nov 2005 19:20:26 - 1.172 @@ -1,3 +1,7 @@ +2005-11-21 Kevin P. Fleming [EMAIL PROTECTED] + + * ensure that case changes made to chan_sip and chan_iax2 peer/user names are not ignored during reload operations + 2005-11-21 Josh Roberson [EMAIL PROTECTED] * Makefile: Re-fix Darwin poll issues. ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_iax2.c, 1.381, 1.382 chan_sip.c, 1.915, 1.916
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv25480/channels
Modified Files:
chan_iax2.c chan_sip.c
Log Message:
fix a bug found during a recent upgrade
Index: chan_iax2.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -d -r1.381 -r1.382
--- chan_iax2.c 21 Nov 2005 13:04:36 - 1.381
+++ chan_iax2.c 21 Nov 2005 19:20:26 - 1.382
@@ -8104,7 +8104,7 @@
if (!temponly) {
peer = peerl.peers;
while(peer) {
- if (!strcasecmp(peer-name, name)) {
+ if (!strcmp(peer-name, name)) {
break;
}
prev = peer;
@@ -8297,7 +8297,7 @@
if (!temponly) {
user = userl.users;
while(user) {
- if (!strcasecmp(user-name, name)) {
+ if (!strcmp(user-name, name)) {
break;
}
prev = user;
Index: chan_sip.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -d -r1.915 -r1.916
--- chan_sip.c 21 Nov 2005 00:57:35 - 1.915
+++ chan_sip.c 21 Nov 2005 19:20:26 - 1.916
@@ -11967,7 +11967,11 @@
if (!realtime)
/* Note we do NOT use find_peer here, to avoid realtime
recursion */
- peer = ASTOBJ_CONTAINER_FIND_UNLINK(peerl, name);
+ /* We also use a case-sensitive comparison (unlike find_peer) so
+ that case changes made to the peer name will be properly
handled
+ during reload
+ */
+ peer = ASTOBJ_CONTAINER_FIND_UNLINK_FULL(peerl, name, name, 0,
0, strcmp);
if (peer) {
/* Already in the list, remove it and it will be added back (or
FREE'd) */
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.172,1.173
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25522 Modified Files: ChangeLog Log Message: proper entry formatting (doh!) Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.172 retrieving revision 1.173 diff -u -d -r1.172 -r1.173 --- ChangeLog 21 Nov 2005 19:20:26 - 1.172 +++ ChangeLog 21 Nov 2005 19:24:43 - 1.173 @@ -1,6 +1,7 @@ 2005-11-21 Kevin P. Fleming [EMAIL PROTECTED] - * ensure that case changes made to chan_sip and chan_iax2 peer/user names are not ignored during reload operations + * channels/chan_sip.c: ensure that case changes made to peer/user names are not ignored during reload operations + * channels/chan_iax2.c: ensure that case changes made to peer/user names are not ignored during reload operations 2005-11-21 Josh Roberson [EMAIL PROTECTED] ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.173,1.174
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25590 Modified Files: ChangeLog Log Message: fix port number handling in peer building functions Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.173 retrieving revision 1.174 diff -u -d -r1.173 -r1.174 --- ChangeLog 21 Nov 2005 19:24:43 - 1.173 +++ ChangeLog 21 Nov 2005 19:27:26 - 1.174 @@ -1,7 +1,10 @@ 2005-11-21 Kevin P. Fleming [EMAIL PROTECTED] - * channels/chan_sip.c: ensure that case changes made to peer/user names are not ignored during reload operations - * channels/chan_iax2.c: ensure that case changes made to peer/user names are not ignored during reload operations + * channels/chan_sip.c (build_peer): ensure that case changes made to peer names are not ignored during reload operations + (build_peer): when a peer is changed from dynamic to static mode, reset the default port number if no other has been specified + + * channels/chan_iax2.c (build_peer and build_user): ensure that case changes made to peer/user names are not ignored during reload operations + (build_peer): when a peer is changed from dynamic to static mode, reset the default port number if no other has been specified 2005-11-21 Josh Roberson [EMAIL PROTECTED] ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_iax2.c, 1.382, 1.383 chan_sip.c, 1.916, 1.917
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv25590/channels
Modified Files:
chan_iax2.c chan_sip.c
Log Message:
fix port number handling in peer building functions
Index: chan_iax2.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -d -r1.382 -r1.383
--- chan_iax2.c 21 Nov 2005 19:20:26 - 1.382
+++ chan_iax2.c 21 Nov 2005 19:27:26 - 1.383
@@ -8200,6 +8200,8 @@
free(peer);
return NULL;
}
+ if (!peer-addr.sin_port)
+ peer-addr.sin_port =
htons(IAX_DEFAULT_PORTNO);
}
if (!maskfound)
inet_aton(255.255.255.255,
peer-mask);
Index: chan_sip.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -d -r1.916 -r1.917
--- chan_sip.c 21 Nov 2005 19:20:26 - 1.916
+++ chan_sip.c 21 Nov 2005 19:27:26 - 1.917
@@ -12100,8 +12100,11 @@
}
if (!strcasecmp(v-name, outboundproxy))
obproxyfound=1;
- else
+ else {
ast_copy_string(peer-tohost, v-value,
sizeof(peer-tohost));
+ if (!peer-addr.sin_port)
+ peer-addr.sin_port =
htons(DEFAULT_SIP_PORT);
+ }
}
} else if (!strcasecmp(v-name, defaultip)) {
if (ast_get_ip(peer-defaddr, v-value)) {
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_iax2.c, 1.378.2.3, 1.378.2.4 chan_sip.c, 1.913.2.2, 1.913.2.3
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv25630/channels
Modified Files:
Tag: v1-2
chan_iax2.c chan_sip.c
Log Message:
backport fix from HEAD branch
Index: chan_iax2.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.378.2.3
retrieving revision 1.378.2.4
diff -u -d -r1.378.2.3 -r1.378.2.4
--- chan_iax2.c 21 Nov 2005 13:17:32 - 1.378.2.3
+++ chan_iax2.c 21 Nov 2005 19:29:51 - 1.378.2.4
@@ -8104,7 +8104,7 @@
if (!temponly) {
peer = peerl.peers;
while(peer) {
- if (!strcasecmp(peer-name, name)) {
+ if (!strcmp(peer-name, name)) {
break;
}
prev = peer;
@@ -8297,7 +8297,7 @@
if (!temponly) {
user = userl.users;
while(user) {
- if (!strcasecmp(user-name, name)) {
+ if (!strcmp(user-name, name)) {
break;
}
prev = user;
Index: chan_sip.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.913.2.2
retrieving revision 1.913.2.3
diff -u -d -r1.913.2.2 -r1.913.2.3
--- chan_sip.c 21 Nov 2005 01:00:51 - 1.913.2.2
+++ chan_sip.c 21 Nov 2005 19:29:51 - 1.913.2.3
@@ -11967,7 +11967,11 @@
if (!realtime)
/* Note we do NOT use find_peer here, to avoid realtime
recursion */
- peer = ASTOBJ_CONTAINER_FIND_UNLINK(peerl, name);
+ /* We also use a case-sensitive comparison (unlike find_peer) so
+ that case changes made to the peer name will be properly
handled
+ during reload
+ */
+ peer = ASTOBJ_CONTAINER_FIND_UNLINK_FULL(peerl, name, name, 0,
0, strcmp);
if (peer) {
/* Already in the list, remove it and it will be added back (or
FREE'd) */
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.146.2.21,1.146.2.22
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25691 Modified Files: Tag: v1-2 ChangeLog Log Message: backport fix from HEAD branch Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.146.2.21 retrieving revision 1.146.2.22 diff -u -d -r1.146.2.21 -r1.146.2.22 --- ChangeLog 21 Nov 2005 19:29:51 - 1.146.2.21 +++ ChangeLog 21 Nov 2005 19:31:26 - 1.146.2.22 @@ -1,8 +1,10 @@ 2005-11-21 Kevin P. Fleming [EMAIL PROTECTED] * channels/chan_sip.c (build_peer): ensure that case changes made to peer names are not ignored during reload operations + (build_peer): when a peer is changed from dynamic to static mode, reset the default port number if no other has been specified * channels/chan_iax2.c (build_peer and build_user): ensure that case changes made to peer/user names are not ignored during reload operations + (build_peer): when a peer is changed from dynamic to static mode, reset the default port number if no other has been specified 2005-11-21 Russell Bryant [EMAIL PROTECTED] ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_iax2.c, 1.378.2.4, 1.378.2.5 chan_sip.c, 1.913.2.3, 1.913.2.4
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv25691/channels
Modified Files:
Tag: v1-2
chan_iax2.c chan_sip.c
Log Message:
backport fix from HEAD branch
Index: chan_iax2.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.378.2.4
retrieving revision 1.378.2.5
diff -u -d -r1.378.2.4 -r1.378.2.5
--- chan_iax2.c 21 Nov 2005 19:29:51 - 1.378.2.4
+++ chan_iax2.c 21 Nov 2005 19:31:26 - 1.378.2.5
@@ -8200,6 +8200,8 @@
free(peer);
return NULL;
}
+ if (!peer-addr.sin_port)
+ peer-addr.sin_port =
htons(IAX_DEFAULT_PORTNO);
}
if (!maskfound)
inet_aton(255.255.255.255,
peer-mask);
Index: chan_sip.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.913.2.3
retrieving revision 1.913.2.4
diff -u -d -r1.913.2.3 -r1.913.2.4
--- chan_sip.c 21 Nov 2005 19:29:51 - 1.913.2.3
+++ chan_sip.c 21 Nov 2005 19:31:26 - 1.913.2.4
@@ -12100,8 +12100,11 @@
}
if (!strcasecmp(v-name, outboundproxy))
obproxyfound=1;
- else
+ else {
ast_copy_string(peer-tohost, v-value,
sizeof(peer-tohost));
+ if (!peer-addr.sin_port)
+ peer-addr.sin_port =
htons(DEFAULT_SIP_PORT);
+ }
}
} else if (!strcasecmp(v-name, defaultip)) {
if (ast_get_ip(peer-defaddr, v-value)) {
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.174,1.175
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25737 Modified Files: ChangeLog Log Message: remove extraneous header Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.174 retrieving revision 1.175 diff -u -d -r1.174 -r1.175 --- ChangeLog 21 Nov 2005 19:27:26 - 1.174 +++ ChangeLog 21 Nov 2005 19:33:33 - 1.175 @@ -1,5 +1,7 @@ 2005-11-21 Kevin P. Fleming [EMAIL PROTECTED] + * apps/app_cut.c: remove unnecessary include that causes spurious rebuilding + * channels/chan_sip.c (build_peer): ensure that case changes made to peer names are not ignored during reload operations (build_peer): when a peer is changed from dynamic to static mode, reset the default port number if no other has been specified ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_cut.c,1.22,1.23
Update of /usr/cvsroot/asterisk/apps In directory mongoose.digium.com:/tmp/cvs-serv25737/apps Modified Files: app_cut.c Log Message: remove extraneous header Index: app_cut.c === RCS file: /usr/cvsroot/asterisk/apps/app_cut.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- app_cut.c 11 Nov 2005 13:34:38 - 1.22 +++ app_cut.c 21 Nov 2005 19:33:33 - 1.23 @@ -36,7 +36,6 @@ #include asterisk/channel.h #include asterisk/pbx.h #include asterisk/module.h -#include asterisk/version.h #include asterisk/app.h /* Maximum length of any variable */ ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_cut.c,1.22,1.22.2.1
Update of /usr/cvsroot/asterisk/apps In directory mongoose.digium.com:/tmp/cvs-serv25767/apps Modified Files: Tag: v1-2 app_cut.c Log Message: backport fix from HEAD branch Index: app_cut.c === RCS file: /usr/cvsroot/asterisk/apps/app_cut.c,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -d -r1.22 -r1.22.2.1 --- app_cut.c 11 Nov 2005 13:34:38 - 1.22 +++ app_cut.c 21 Nov 2005 19:34:09 - 1.22.2.1 @@ -36,7 +36,6 @@ #include asterisk/channel.h #include asterisk/pbx.h #include asterisk/module.h -#include asterisk/version.h #include asterisk/app.h /* Maximum length of any variable */ ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels Makefile,1.78,1.79
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv14613/channels
Modified Files:
Makefile
Log Message:
backport chan_modem fixes from v1-2
Index: Makefile
===
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Makefile16 Nov 2005 20:54:15 - 1.78
+++ Makefile17 Nov 2005 16:57:25 - 1.79
@@ -61,7 +61,9 @@
ifneq (${OSARCH},Darwin)
ifneq (${OSARCH},SunOS)
ifneq (${OSARCH},CYGWIN)
- CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so
+# the ISDN4Linux channel driver is probably broken on all modern kernels,
+# but if you wish to try to use it, uncomment the line below
+# CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so
endif
endif
endif
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.146,1.147
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv14613 Modified Files: ChangeLog Log Message: backport chan_modem fixes from v1-2 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.146 retrieving revision 1.147 diff -u -d -r1.146 -r1.147 --- ChangeLog 16 Nov 2005 21:07:52 - 1.146 +++ ChangeLog 17 Nov 2005 16:57:25 - 1.147 @@ -1,3 +1,7 @@ +2005-11-16 Kevin P. Fleming [EMAIL PROTECTED] + + * Asterisk 1.2.0 released. + 2005-11-16 Jeremy McNamara [EMAIL PROTECTED] * apps/app_voicemail.c (load_config): do not terminate asterisk if no voicemail config file @@ -10,7 +14,8 @@ 2005-11-16 Kevin P. Fleming [EMAIL PROTECTED] * channels/Makefile: don't build chan_modem and sub-modules by default - + * configs/modules.conf.sample: explicitly 'noload' chan_modem.so and submodules, in case old versions exist + * res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make' * apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/pbx pbx_ael.c,1.20,1.21
Update of /usr/cvsroot/asterisk/pbx
In directory mongoose.digium.com:/tmp/cvs-serv6326/pbx
Modified Files:
pbx_ael.c
Log Message:
issue #5761
Index: pbx_ael.c
===
RCS file: /usr/cvsroot/asterisk/pbx/pbx_ael.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- pbx_ael.c 13 Nov 2005 02:19:14 - 1.20
+++ pbx_ael.c 16 Nov 2005 17:16:23 - 1.21
@@ -407,7 +407,7 @@
int inpar = 0;
c = variable;
- while (*c (*c 32)) {
+ while (*c) {
if(*c == ')' (inpar 0)) {
inpar--;
} else if(*c == '(' (inpar = 0)) {
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.136,1.137
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv6390 Modified Files: ChangeLog Log Message: issue #5764 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.136 retrieving revision 1.137 diff -u -d -r1.136 -r1.137 --- ChangeLog 16 Nov 2005 17:16:23 - 1.136 +++ ChangeLog 16 Nov 2005 17:26:11 - 1.137 @@ -1,5 +1,7 @@ 2005-11-16 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_sip.c (process_sdp): don't pass video codec number into ast_getformatname(), it is not valid input for that function (issue #5764) + * pbx/pbx_ael.c (match_assignment): properly parse equal signs surrounded by whitespace (issue #5761) 2005-11-16 Kevin P. Fleming [EMAIL PROTECTED] ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_sip.c,1.911,1.912
Update of /usr/cvsroot/asterisk/channels In directory mongoose.digium.com:/tmp/cvs-serv6390/channels Modified Files: chan_sip.c Log Message: issue #5764 Index: chan_sip.c === RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v retrieving revision 1.911 retrieving revision 1.912 diff -u -d -r1.911 -r1.912 --- chan_sip.c 15 Nov 2005 22:50:43 - 1.911 +++ chan_sip.c 16 Nov 2005 17:26:11 - 1.912 @@ -3461,7 +3461,7 @@ return -1; } if (debug) - ast_verbose(Found video format %s\n, ast_getformatname(codec)); + ast_verbose(Found video format %s\n, codec); ast_rtp_set_m_type(p-vrtp, codec); codecs = ast_skip_blanks(codecs + len); } ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.137,1.138
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv6525 Modified Files: ChangeLog Log Message: issue #5766 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.137 retrieving revision 1.138 diff -u -d -r1.137 -r1.138 --- ChangeLog 16 Nov 2005 17:26:11 - 1.137 +++ ChangeLog 16 Nov 2005 17:48:18 - 1.138 @@ -1,5 +1,7 @@ 2005-11-16 Kevin P. Fleming [EMAIL PROTECTED] + * res/res_musiconhold.c: don't spit out incorrect log messages (and leak memory) during reload (issue #5766) + * channels/chan_sip.c (process_sdp): don't pass video codec number into ast_getformatname(), it is not valid input for that function (issue #5764) * pbx/pbx_ael.c (match_assignment): properly parse equal signs surrounded by whitespace (issue #5761) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog, 1.138, 1.139 channel.c, 1.259, 1.260
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv6757
Modified Files:
ChangeLog channel.c
Log Message:
issue #5770
Index: ChangeLog
===
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- ChangeLog 16 Nov 2005 17:48:18 - 1.138
+++ ChangeLog 16 Nov 2005 18:11:28 - 1.139
@@ -1,5 +1,7 @@
2005-11-16 Kevin P. Fleming [EMAIL PROTECTED]
+ * channel.c (ast_queue_hangup): ensure that the channel lock is held
before changing its fields... (issue #5770)
+
* res/res_musiconhold.c: don't spit out incorrect log messages (and
leak memory) during reload (issue #5766)
* channels/chan_sip.c (process_sdp): don't pass video codec number into
ast_getformatname(), it is not valid input for that function (issue #5764)
Index: channel.c
===
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- channel.c 11 Nov 2005 03:48:28 - 1.259
+++ channel.c 16 Nov 2005 18:11:28 - 1.260
@@ -667,7 +667,11 @@
int ast_queue_hangup(struct ast_channel *chan)
{
struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_HANGUP };
- chan-_softhangup |= AST_SOFTHANGUP_DEV;
+ /* Yeah, let's not change a lock-critical value without locking */
+ if (!ast_mutex_trylock(chan-lock)) {
+ chan-_softhangup |= AST_SOFTHANGUP_DEV;
+ ast_mutex_unlock(chan-lock);
+ }
return ast_queue_frame(chan, f);
}
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/res Makefile,1.30,1.31
Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv7847/res
Modified Files:
Makefile
Log Message:
small improvement :-)
Index: Makefile
===
RCS file: /usr/cvsroot/asterisk/res/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile14 Nov 2005 00:45:07 - 1.30
+++ Makefile16 Nov 2005 20:49:44 - 1.31
@@ -76,6 +76,17 @@
rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so
rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ;
done
+ @if [ x`which mpg123 2/dev/null | grep -v '^no'` != x ] ; then \
+ if mpg123 --longhelp 21 | grep -q .59r 21 /dev/null ; then echo
; else \
+ echo
*;\
+ echo *** You have the WRONG version of mpg123... you
need .59r ***;\
+ echo *** Use 'make mpg123' to get the right verison
***;\
+ echo
*;\
+ fi ;\
+ else \
+ echo *** You don't have mpg123 installed. You may need ***;\
+ echo *** it if you want to use MusicOnHold ***;\
+ fi
res_crypto.so: res_crypto.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $ ${CYGSOLIB} $(CRYPTO_LIBS)
@@ -105,17 +116,6 @@
depend: .depend
.depend:
- @if [ x`which mpg123 2/dev/null | grep -v '^no'` != x ] ; then \
- if mpg123 --longhelp 21 | grep -q .59r 21 /dev/null ; then echo
; else \
- echo
*;\
- echo *** You have the WRONG version of mpg123... you
need .59r ***;\
- echo *** Use 'make mpg123' to get the right verison
***;\
- echo
*;\
- fi ;\
- else \
- echo *** You don't have mpg123 installed. You're going to need
***;\
- echo *** it if you want MusicOnHold
***;\
- fi
../build_tools/mkdep $(CFLAGS) `ls *.c`
env:
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.142,1.143
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv7847 Modified Files: ChangeLog Log Message: small improvement :-) Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.142 retrieving revision 1.143 diff -u -d -r1.142 -r1.143 --- ChangeLog 16 Nov 2005 20:23:53 - 1.142 +++ ChangeLog 16 Nov 2005 20:49:44 - 1.143 @@ -4,6 +4,8 @@ 2005-11-16 Kevin P. Fleming [EMAIL PROTECTED] + * res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make' + * apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763) * channel.c (ast_queue_hangup): ensure that the channel lock is held before changing its fields... (issue #5770) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels Makefile,1.77,1.78
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv7923/channels
Modified Files:
Makefile
Log Message:
don't build chan_modem by default
Index: Makefile
===
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- Makefile8 Nov 2005 00:12:21 - 1.77
+++ Makefile16 Nov 2005 20:54:15 - 1.78
@@ -17,7 +17,8 @@
CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so
chan_skinny.so chan_features.so
ifneq (${OSARCH},CYGWIN)
-CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
+# if you really, really want to use these drivers, uncomment the line below
+#CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
endif
ifeq ($(findstring BSD,${OSARCH}),BSD)
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.146,1.146.2.1
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv10526 Modified Files: Tag: v1-2 ChangeLog Log Message: fix remaining breakage related to chan_modem modules Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.146 retrieving revision 1.146.2.1 diff -u -d -r1.146 -r1.146.2.1 --- ChangeLog 16 Nov 2005 21:07:52 - 1.146 +++ ChangeLog 17 Nov 2005 04:26:07 - 1.146.2.1 @@ -1,3 +1,7 @@ +2005-11-16 Kevin P. Fleming [EMAIL PROTECTED] + + * Asterisk 1.2.0 released. + 2005-11-16 Jeremy McNamara [EMAIL PROTECTED] * apps/app_voicemail.c (load_config): do not terminate asterisk if no voicemail config file @@ -10,7 +14,8 @@ 2005-11-16 Kevin P. Fleming [EMAIL PROTECTED] * channels/Makefile: don't build chan_modem and sub-modules by default - + * configs/modules.conf.sample: explicitly 'noload' chan_modem.so and submodules, in case old versions exist + * res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make' * apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels Makefile,1.78,1.78.2.1
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv10526/channels
Modified Files:
Tag: v1-2
Makefile
Log Message:
fix remaining breakage related to chan_modem modules
Index: Makefile
===
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.78
retrieving revision 1.78.2.1
diff -u -d -r1.78 -r1.78.2.1
--- Makefile16 Nov 2005 20:54:15 - 1.78
+++ Makefile17 Nov 2005 04:26:07 - 1.78.2.1
@@ -61,7 +61,9 @@
ifneq (${OSARCH},Darwin)
ifneq (${OSARCH},SunOS)
ifneq (${OSARCH},CYGWIN)
- CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so
+# the ISDN4Linux channel driver is probably broken on all modern kernels,
+# but if you wish to try to use it, uncomment the line below
+# CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so
endif
endif
endif
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/configs modules.conf.sample,1.8,1.8.2.1
Update of /usr/cvsroot/asterisk/configs In directory mongoose.digium.com:/tmp/cvs-serv10526/configs Modified Files: Tag: v1-2 modules.conf.sample Log Message: fix remaining breakage related to chan_modem modules Index: modules.conf.sample === RCS file: /usr/cvsroot/asterisk/configs/modules.conf.sample,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- modules.conf.sample 16 Nov 2005 22:40:43 - 1.8 +++ modules.conf.sample 17 Nov 2005 04:26:07 - 1.8.2.1 @@ -31,10 +31,14 @@ ; noload = app_intercom.so ; -; Explicitly load the chan_modem.so early on to be sure -; it loads before any of the chan_modem_* 's afte rit +; The 'modem' channel driver and its subdrivers are +; obsolete, don't load them. +; +noload = chan_modem.so +noload = chan_modem_aopen.so +noload = chan_modem_bestdata.so +noload = chan_modem_i4l.so ; -;load = chan_modem.so load = res_musiconhold.so ; ; Load either OSS or ALSA, not both @@ -47,4 +51,3 @@ ; exported to modules loaded after them. ; [global] -;chan_modem.so=yes ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] zaptel ChangeLog, 1.1.2.17, 1.1.2.18 tor2.c, 1.19.2.5, 1.19.2.6 wcfxo.c, 1.25.2.4, 1.25.2.5 wcfxs.c, 1.84.2.16, 1.84.2.17 wct1xxp.c, 1.19.2.5, 1.19.2.6 wcte11xp.c, 1.1.2.11, 1.1.2.12 z
Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv26207
Modified Files:
Tag: v1-0
ChangeLog tor2.c wcfxo.c wcfxs.c wct1xxp.c wcte11xp.c zaptel.h
Log Message:
port API call update from HEAD
Index: ChangeLog
===
RCS file: /usr/cvsroot/zaptel/ChangeLog,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- ChangeLog 8 Nov 2005 16:01:12 - 1.1.2.17
+++ ChangeLog 15 Nov 2005 14:28:44 - 1.1.2.18
@@ -1,4 +1,5 @@
-- support DACS w/RBS on single-span cards
+ -- use newer API call on 2.6.10+ kernels
zaptel 1.0.9.2
-- fix build issues for Linux 2.6.13
-- fixed tor2 to work on 64-bit architectures
Index: tor2.c
===
RCS file: /usr/cvsroot/zaptel/tor2.c,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -d -r1.19.2.5 -r1.19.2.6
--- tor2.c 31 Aug 2005 21:43:39 - 1.19.2.5
+++ tor2.c 15 Nov 2005 14:28:44 - 1.19.2.6
@@ -628,7 +628,7 @@
static int __init tor2_init(void) {
int res;
- res = pci_module_init(tor2_driver);
+ res = zap_pci_module(tor2_driver);
printk(Registered Tormenta2 PCI\n);
return res;
}
Index: wcfxo.c
===
RCS file: /usr/cvsroot/zaptel/wcfxo.c,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -d -r1.25.2.4 -r1.25.2.5
--- wcfxo.c 31 Oct 2005 18:53:47 - 1.25.2.4
+++ wcfxo.c 15 Nov 2005 14:28:44 - 1.25.2.5
@@ -1007,7 +1007,7 @@
printk(%d: %s\n, x, fxo_modes[x].name);
return -ENODEV;
}
- res = pci_module_init(wcfxo_driver);
+ res = zap_pci_module(wcfxo_driver);
if (res)
return -ENODEV;
return 0;
Index: wcfxs.c
===
RCS file: /usr/cvsroot/zaptel/Attic/wcfxs.c,v
retrieving revision 1.84.2.16
retrieving revision 1.84.2.17
diff -u -d -r1.84.2.16 -r1.84.2.17
--- wcfxs.c 4 Nov 2005 04:53:57 - 1.84.2.16
+++ wcfxs.c 15 Nov 2005 14:28:44 - 1.84.2.17
@@ -2206,7 +2206,7 @@
return -ENODEV;
}
- res = pci_module_init(wcfxs_driver);
+ res = zap_pci_module(wcfxs_driver);
if (res)
return -ENODEV;
return 0;
Index: wct1xxp.c
===
RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -d -r1.19.2.5 -r1.19.2.6
--- wct1xxp.c 8 Nov 2005 16:00:44 - 1.19.2.5
+++ wct1xxp.c 15 Nov 2005 14:28:44 - 1.19.2.6
@@ -1390,7 +1390,7 @@
static int __init t1xxp_init(void)
{
int res;
- res = pci_module_init(t1xxp_driver);
+ res = zap_pci_module(t1xxp_driver);
if (res)
return -ENODEV;
return 0;
Index: wcte11xp.c
===
RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- wcte11xp.c 8 Nov 2005 16:00:44 - 1.1.2.11
+++ wcte11xp.c 15 Nov 2005 14:28:44 - 1.1.2.12
@@ -1554,7 +1554,7 @@
static int __init t1xxp_init(void)
{
int res;
- res = pci_module_init(t1xxp_driver);
+ res = zap_pci_module(t1xxp_driver);
if (res)
return -ENODEV;
return 0;
Index: zaptel.h
===
RCS file: /usr/cvsroot/zaptel/zaptel.h,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -d -r1.38.2.1 -r1.38.2.2
--- zaptel.h15 Jun 2005 21:31:22 - 1.38.2.1
+++ zaptel.h15 Nov 2005 14:28:44 - 1.38.2.2
@@ -48,6 +48,12 @@
#define LINUX26
#endif
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,10)
+#define zap_pci_module pci_register_driver
+#else
+#define zap_pci_module pci_module_init
+#endif
+
#include ecdis.h
#include fasthdlc.h
#endif
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/doc README.variables,1.54,1.55
Update of /usr/cvsroot/asterisk/doc
In directory mongoose.digium.com:/tmp/cvs-serv27878/doc
Modified Files:
README.variables
Log Message:
correct typo
Index: README.variables
===
RCS file: /usr/cvsroot/asterisk/doc/README.variables,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- README.variables15 Nov 2005 18:16:46 - 1.54
+++ README.variables15 Nov 2005 19:15:19 - 1.55
@@ -598,7 +598,7 @@
-
In Asterisk 1.2, many applications return the result in a variable
instead of, as in Asterisk 1.0, changing the dial plan priority (+101).
-For the varioius status values, see each application's help text.
+For the various status values, see each application's help text.
${AQMSTATUS} * addqueuemember()
${AVAILSTATUS} * chanisavail()
@@ -630,7 +630,6 @@
${WAITSTATUS} * waitforsilence()
-
Various application variables
-
${CURL}* Resulting page content for curl()
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.124,1.125
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv27957 Modified Files: ChangeLog Log Message: issue #5736 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- ChangeLog 15 Nov 2005 18:35:30 - 1.124 +++ ChangeLog 15 Nov 2005 19:27:18 - 1.125 @@ -1,3 +1,7 @@ +2005-11-15 Kevin P. Fleming [EMAIL PROTECTED] + + * apps/app_disa.c (disa_exec): use standard arg parsing routines (issue #5736) + 2005-11-15 Russell Bryant [EMAIL PROTECTED] * manager.c: Don't crash on a SetVar action if the channel name is not set, or variable's value is not set (issue #5760) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_disa.c,1.45,1.46
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv27957/apps
Modified Files:
app_disa.c
Log Message:
issue #5736
Index: app_disa.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_disa.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- app_disa.c 11 Nov 2005 00:53:19 - 1.45
+++ app_disa.c 15 Nov 2005 19:27:18 - 1.46
@@ -118,15 +118,20 @@
int firstdigittimeout = 2;
int digittimeout = 1;
struct localuser *u;
- char *tmp, arg2[256]=,exten[AST_MAX_EXTENSION],acctcode[20]=;
+ char *tmp, exten[AST_MAX_EXTENSION],acctcode[20]=;
char pwline[256];
- char *ourcontext,*ourcallerid,ourcidname[256],ourcidnum[256],*mailbox;
+ char ourcidname[256],ourcidnum[256];
struct ast_frame *f;
struct timeval lastdigittime;
int res;
time_t rstart;
FILE *fp;
- char *stringp=NULL;
+ AST_DECLARE_APP_ARGS(args,
+ AST_APP_ARG(passcode);
+ AST_APP_ARG(context);
+ AST_APP_ARG(cid);
+ AST_APP_ARG(mailbox);
+ );
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, disa requires an argument
(passcode/passcode file)\n);
@@ -161,24 +166,14 @@
return -1;
}
- stringp=tmp;
- strsep(stringp, |);
- ourcontext = strsep(stringp, |);
- /* if context specified, save 2nd arg and parse third */
- if (ourcontext) {
- ast_copy_string(arg2, ourcontext, sizeof(arg2));
- ourcallerid = strsep(stringp,|);
- }
- /* if context not specified, use disa */
- else {
- arg2[0] = 0;
- ourcallerid = NULL;
- ourcontext = disa;
- }
- mailbox = strsep(stringp, |);
- if (!mailbox)
- mailbox = ;
- ast_log(LOG_DEBUG, Mailbox: %s\n,mailbox);
+ AST_STANDARD_APP_ARGS(args, tmp);
+
+ if (ast_strlen_zero(args.context))
+ args.context = ast_strdupa(disa);
+ if (ast_strlen_zero(args.mailbox))
+ args.mailbox = ast_strdupa();
+
+ ast_log(LOG_DEBUG, Mailbox: %s\n,args.mailbox);
if (chan-_state != AST_STATE_UP) {
/* answer */
@@ -190,15 +185,15 @@
acctcode[0] = 0;
/* can we access DISA without password? */
- ast_log(LOG_DEBUG, Context: %s\n,ourcontext);
+ ast_log(LOG_DEBUG, Context: %s\n,args.context);
- if (!strcasecmp(tmp, no-password)) {
+ if (!strcasecmp(args.passcode, no-password)) {
k |= 1; /* We have the password */
ast_log(LOG_DEBUG, DISA no-password login success\n);
}
lastdigittime = ast_tvnow();
- play_dialtone(chan, mailbox);
+ play_dialtone(chan, args.mailbox);
for (;;) {
/* if outa time, give em reorder */
@@ -254,19 +249,18 @@
if (j == '#') /* end of password */
{
/* see if this is an integer */
- if (sscanf(tmp,%d,j) 1)
+ if (sscanf(args.passcode,%d,j) 1)
{ /* nope, it must be a filename */
- fp = fopen(tmp,r);
+ fp = fopen(args.passcode,r);
if (!fp)
{
-
ast_log(LOG_WARNING,DISA password file %s not found on chan
%s\n,tmp,chan-name);
+
ast_log(LOG_WARNING,DISA password file %s not found on chan
%s\n,args.passcode,chan-name);
LOCAL_USER_REMOVE(u);
return -1;
}
pwline[0] = 0;
while(fgets(pwline,sizeof(pwline) - 1,fp))
{
- char
*stringp=NULL,*stringp2;
if (!pwline[0])
continue;
if
(pwline[strlen(pwline) - 1] == '\n')
pwline[strlen(pwline) - 1] = 0;
@@ -274,28 +268,26 @@
/* skip comments */
if (pwline[0] == '#')
continue;
[Asterisk-cvs] asterisk ChangeLog,1.125,1.126
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv28023 Modified Files: ChangeLog Log Message: issue #5752 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- ChangeLog 15 Nov 2005 19:27:18 - 1.125 +++ ChangeLog 15 Nov 2005 19:33:15 - 1.126 @@ -1,5 +1,7 @@ 2005-11-15 Kevin P. Fleming [EMAIL PROTECTED] + * apps/app_playback.c (playback_exec): use correct logic tests for options (issue #5752) + * apps/app_disa.c (disa_exec): use standard arg parsing routines (issue #5736) 2005-11-15 Russell Bryant [EMAIL PROTECTED] ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_playback.c,1.28,1.29
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv28023/apps
Modified Files:
app_playback.c
Log Message:
issue #5752
Index: app_playback.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_playback.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- app_playback.c 8 Nov 2005 04:48:00 - 1.28
+++ app_playback.c 15 Nov 2005 19:33:15 - 1.29
@@ -99,9 +99,9 @@
AST_STANDARD_APP_ARGS(args, tmp);
if (args.options) {
- if (!strcasestr(args.options, skip))
+ if (strcasestr(args.options, skip))
option_skip = 1;
- if (!strcasestr(args.options, noanswer))
+ if (strcasestr(args.options, noanswer))
option_noanswer = 1;
if (strchr(args.options, 'j'))
priority_jump = 1;
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.126,1.127
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv28072 Modified Files: ChangeLog Log Message: correct a small problem with recent commit Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- ChangeLog 15 Nov 2005 19:33:15 - 1.126 +++ ChangeLog 15 Nov 2005 19:40:08 - 1.127 @@ -1,5 +1,7 @@ 2005-11-15 Kevin P. Fleming [EMAIL PROTECTED] + * apps/app_disa.c (disa_exec): don't duplicate constant strings when not needed + * apps/app_playback.c (playback_exec): use correct logic tests for options (issue #5752) * apps/app_disa.c (disa_exec): use standard arg parsing routines (issue #5736) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_disa.c,1.46,1.47
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv28072/apps
Modified Files:
app_disa.c
Log Message:
correct a small problem with recent commit
Index: app_disa.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_disa.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- app_disa.c 15 Nov 2005 19:27:18 - 1.46
+++ app_disa.c 15 Nov 2005 19:40:08 - 1.47
@@ -169,9 +169,9 @@
AST_STANDARD_APP_ARGS(args, tmp);
if (ast_strlen_zero(args.context))
- args.context = ast_strdupa(disa);
+ args.context = disa;
if (ast_strlen_zero(args.mailbox))
- args.mailbox = ast_strdupa();
+ args.mailbox = ;
ast_log(LOG_DEBUG, Mailbox: %s\n,args.mailbox);
@@ -278,9 +278,9 @@
/* if we got it */
if
(!strcmp(exten,args.passcode)) {
if
(ast_strlen_zero(args.context))
-
args.context = ast_strdupa(disa);
+
args.context = disa;
if
(ast_strlen_zero(args.mailbox))
-
args.mailbox = ast_strdupa();
+
args.mailbox = ;
break;
}
}
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.127,1.128
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv28151 Modified Files: ChangeLog Log Message: issue #5751 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- ChangeLog 15 Nov 2005 19:40:08 - 1.127 +++ ChangeLog 15 Nov 2005 19:52:25 - 1.128 @@ -1,5 +1,7 @@ 2005-11-15 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_sip.c (handle_request_info): properly forward 'flash' events received via SIP INFO (issue #5751, different patch) + * apps/app_disa.c (disa_exec): don't duplicate constant strings when not needed * apps/app_playback.c (playback_exec): use correct logic tests for options (issue #5752) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.128,1.129
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv28401 Modified Files: ChangeLog Log Message: issue #5739 (plus ast_copy_string() usage conversion) Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- ChangeLog 15 Nov 2005 19:52:25 - 1.128 +++ ChangeLog 15 Nov 2005 20:20:45 - 1.129 @@ -1,5 +1,7 @@ 2005-11-15 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_misdn.c (and other files): various fixes (issue #5739) + * channels/chan_sip.c (handle_request_info): properly forward 'flash' events received via SIP INFO (issue #5751, different patch) * apps/app_disa.c (disa_exec): don't duplicate constant strings when not needed ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_misdn.c, 1.6, 1.7 chan_misdn_config.c, 1.3, 1.4
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv28401/channels
Modified Files:
chan_misdn.c chan_misdn_config.c
Log Message:
issue #5739 (plus ast_copy_string() usage conversion)
Index: chan_misdn.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_misdn.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- chan_misdn.c11 Nov 2005 00:35:21 - 1.6
+++ chan_misdn.c15 Nov 2005 20:20:45 - 1.7
@@ -152,6 +152,7 @@
static void free_robin_list ( void )
{
free_robin_list_r(robin);
+ robin = NULL;
}
struct robin_list* get_robin_position (char *group)
@@ -1040,21 +1041,29 @@
int r;
struct chan_list *ch=MISDN_ASTERISK_TECH_PVT(ast);
struct misdn_bchannel *newbc;
- char *opts=NULL;
+ char *opts=NULL, *ext=NULL;
char dest_cp[256];
+ char *tokb;
{
strncpy(dest_cp,dest,sizeof(dest_cp)-1);
dest_cp[sizeof(dest_cp)]=0;
- opts=strchr(dest_cp,'/');
- if ( opts (opts=strchr(++opts,'/')) ) {
- if (opts) {
- opts++;
- if (!*opts) opts=NULL;
+
+ ext=strtok_r(dest_cp,/,tokb);
+
+ if (ext) {
+ ext=strtok_r(NULL,/,tokb);
+ if (ext) {
+ opts=strtok_r(NULL,/,tokb);
+ } else {
+ chan_misdn_log(-1,0,misdn_call: No Extension
given!\n);
+ return -1;
}
}
+
+
}
-
+
if (!ast) {
ast_log(LOG_WARNING, -- ! misdn_call called on ast_channel
*ast where ast == NULL\n);
return -1;
@@ -1085,7 +1094,10 @@
}
port=newbc-port;
-
+
+ ast_copy_string(newbc-dad, ext, sizeof(newbc-dad));
+ ast_copy_string(ast-exten, ext, sizeof(ast-exten));
+
chan_misdn_log(1, 0, * CALL: %s\n,dest);
@@ -1148,17 +1160,40 @@
int def_callingpres;
misdn_cfg_get( port, MISDN_CFG_USE_CALLINGPRES,
def_callingpres, sizeof(int));
if ( def_callingpres) {
- switch (ast-cid.cid_pres){
- case AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED:
+ switch (ast-cid.cid_pres 0x60){
+
+ case AST_PRES_RESTRICTED:
newbc-pres=1;
break;
- case AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN:
- newbc-pres=0;
+ case AST_PRES_UNAVAILABLE:
+ newbc-pres=2;
break;
+
default:
newbc-pres=0;
}
+
+ switch (ast-cid.cid_pres 0x3){
+
+ case AST_PRES_USER_NUMBER_UNSCREENED:
+ newbc-screen=0;
+ break;
+
+ case AST_PRES_USER_NUMBER_PASSED_SCREEN:
+ newbc-screen=1;
+ break;
+ case AST_PRES_USER_NUMBER_FAILED_SCREEN:
+ newbc-screen=2;
+ break;
+
+ case AST_PRES_NETWORK_NUMBER:
+ newbc-screen=3;
+ break;
+
+ default:
+ newbc-screen=0;
+ }
}
@@ -1289,12 +1324,19 @@
}
}
+
+ {
+ char *async=pbx_builtin_getvar_helper(ast,
MISDN_DIGITAL_TRANS);
+ if (async) {
+ chan_misdn_log(1, p-bc-port, -- Connection is
transparent digital\n);
+ p-bc-async=1;
+ }
+ }
p-state = MISDN_CONNECTED;
misdn_lib_send_event( p-bc, EVENT_CONNECT);
start_bc_tones(p);
-
return 0;
}
@@ -1506,6 +1548,13 @@
return 0 ;
}
+ bc=p-bc;
+
+ if (!bc) {
+ release_unlock;
+ ast_log(LOG_WARNING,Hangup with private but no bc ?\n);
+ return 0;
+ }
MISDN_ASTERISK_TECH_PVT(ast)=NULL;
@@ -1529,12 +1578,9 @@
[Asterisk-cvs] asterisk/channels chan_alsa.c, 1.52, 1.53 chan_oss_old.c, 1.4, 1.5
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv28606/channels
Modified Files:
chan_alsa.c chan_oss_old.c
Log Message:
issue #5672
Index: chan_alsa.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- chan_alsa.c 6 Nov 2005 15:09:46 - 1.52
+++ chan_alsa.c 15 Nov 2005 20:56:19 - 1.53
@@ -582,8 +582,14 @@
usecnt--;
ast_mutex_unlock(usecnt_lock);
if (hookstate) {
- res = 2;
- write(sndcmd[1], res, sizeof(res));
+ if (autoanswer) {
+ hookstate = 0;
+ } else {
+ /* Congestion noise */
+ res = 2;
+ write(sndcmd[1], res, sizeof(res));
+ hookstate = 0;
+ }
}
snd_pcm_drop(alsa.icard);
ast_mutex_unlock(alsalock);
Index: chan_oss_old.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_oss_old.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- chan_oss_old.c 6 Nov 2005 15:09:46 - 1.4
+++ chan_oss_old.c 15 Nov 2005 20:56:19 - 1.5
@@ -565,6 +565,7 @@
/* Make congestion noise */
res = 2;
write(sndcmd[1], res, sizeof(res));
+ hookstate = 0;
}
}
return 0;
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.130,1.131
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv29501 Modified Files: ChangeLog Log Message: issue #5539 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- ChangeLog 15 Nov 2005 20:56:19 - 1.130 +++ ChangeLog 15 Nov 2005 22:50:42 - 1.131 @@ -1,5 +1,7 @@ 2005-11-15 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_sip.c (add_codec_to_sdp): add 'annexb=no' to G.729A SDP (issue #5539) + * channels/chan_alsa.c (alsa_hangup): handle autohangup properly (issue #5672) * channels/chan_misdn.c (and other files): various fixes (issue #5739) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.107,1.108
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv16848 Modified Files: ChangeLog Log Message: update for mark's commit Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- ChangeLog 11 Nov 2005 16:02:56 - 1.107 +++ ChangeLog 11 Nov 2005 18:03:31 - 1.108 @@ -1,4 +1,8 @@ -2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] +2005-11-11 Mark Spencer [EMAIL PROTECTED] + + * channels/chan_zap.c (zt_bridge): only enable/disable DTMF detection on SUB_REAL channels + +2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] * channels/chan_iax2.c: ensure that system headers that provide basic types are included first (issue #5713) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.108,1.109
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv17963 Modified Files: ChangeLog Log Message: issue #5663 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 --- ChangeLog 11 Nov 2005 18:03:31 - 1.108 +++ ChangeLog 11 Nov 2005 21:04:10 - 1.109 @@ -1,3 +1,7 @@ +2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] + + * apps/app_voicemail.c (close_mailbox): properly remove deleted messages at mailbox close time (issue #5663) + 2005-11-11 Mark Spencer [EMAIL PROTECTED] * channels/chan_zap.c (zt_bridge): only enable/disable DTMF detection on SUB_REAL channels ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_voicemail.c,1.266,1.267
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv17963/apps
Modified Files:
app_voicemail.c
Log Message:
issue #5663
Index: app_voicemail.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- app_voicemail.c 11 Nov 2005 17:14:13 - 1.266
+++ app_voicemail.c 11 Nov 2005 21:04:10 - 1.267
@@ -3869,7 +3869,7 @@
static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
{
- int x;
+ int x, nummsg;
int res = 0;
if (vms-lastmsg = -1)
@@ -3902,12 +3902,14 @@
}
}
}
- for (x = vms-curmsg + 1; x = vmu-maxmsg; x++) {
- make_file(vms-fn, sizeof(vms-fn), vms-curdir, x);
- if (!EXISTS(vms-curdir, x, vms-fn, NULL))
- break;
- DELETE(vms-curdir, x, vms-fn);
- }
+
+ /* Delete ALL remaining messages */
+ nummsg = x;
+ for (x = vms-curmsg + 1; x = nummsg; x++) {
+ make_file(vms-fn, sizeof(vms-fn), vms-curdir, x);
+ if (EXISTS(vms-curdir, x, vms-fn, NULL))
+ DELETE(vms-curdir, x, vms-fn);
+ }
ast_unlock_path(vms-curdir);
done:
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.109,1.110
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv18177 Modified Files: ChangeLog Log Message: minor fixes Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- ChangeLog 11 Nov 2005 21:04:10 - 1.109 +++ ChangeLog 11 Nov 2005 21:41:54 - 1.110 @@ -1,5 +1,7 @@ 2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_sip.c (transmit_invite): remove useless debug message; don't try to add OSP tokens to OPTIONS pings + * apps/app_voicemail.c (close_mailbox): properly remove deleted messages at mailbox close time (issue #5663) 2005-11-11 Mark Spencer [EMAIL PROTECTED] ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_sip.c,1.907,1.908
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv18177/channels
Modified Files:
chan_sip.c
Log Message:
minor fixes
Index: chan_sip.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.907
retrieving revision 1.908
diff -u -d -r1.907 -r1.908
--- chan_sip.c 8 Nov 2005 01:55:30 - 1.907
+++ chan_sip.c 11 Nov 2005 21:41:54 - 1.908
@@ -4845,11 +4845,9 @@
add_header(req, Referred-By, p-referred_by);
}
#ifdef OSP_SUPPORT
- if (p-options !ast_strlen_zero(p-options-osptoken)) {
+ if ((req.method != SIP_OPTIONS) p-options
!ast_strlen_zero(p-options-osptoken)) {
ast_log(LOG_DEBUG,Adding OSP Token: %s\n,
p-options-osptoken);
add_header(req, P-OSP-Auth-Token, p-options-osptoken);
- } else {
- ast_log(LOG_DEBUG,NOT Adding OSP Token\n);
}
#endif
if (p-options !ast_strlen_zero(p-options-distinctive_ring))
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.110,1.111
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv18923 Modified Files: ChangeLog Log Message: issue #5663 again Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- ChangeLog 11 Nov 2005 21:41:54 - 1.110 +++ ChangeLog 12 Nov 2005 00:09:43 - 1.111 @@ -1,5 +1,7 @@ 2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] + * apps/app_voicemail.c (close_mailbox): correct previous commit (issue #5663) + * channels/chan_sip.c (transmit_invite): remove useless debug message; don't try to add OSP tokens to OPTIONS pings * apps/app_voicemail.c (close_mailbox): properly remove deleted messages at mailbox close time (issue #5663) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_voicemail.c,1.267,1.268
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv18923/apps
Modified Files:
app_voicemail.c
Log Message:
issue #5663 again
Index: app_voicemail.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- app_voicemail.c 11 Nov 2005 21:04:10 - 1.267
+++ app_voicemail.c 12 Nov 2005 00:09:43 - 1.268
@@ -3904,7 +3904,7 @@
}
/* Delete ALL remaining messages */
- nummsg = x;
+ nummsg = x - 1;
for (x = vms-curmsg + 1; x = nummsg; x++) {
make_file(vms-fn, sizeof(vms-fn), vms-curdir, x);
if (EXISTS(vms-curdir, x, vms-fn, NULL))
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.111,1.112
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv19150 Modified Files: ChangeLog Log Message: issue #5721 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- ChangeLog 12 Nov 2005 00:09:43 - 1.111 +++ ChangeLog 12 Nov 2005 00:52:08 - 1.112 @@ -1,6 +1,7 @@ 2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] * apps/app_voicemail.c (close_mailbox): correct previous commit (issue #5663) + (vm_change_password): fix password change writing (issue #5721) * channels/chan_sip.c (transmit_invite): remove useless debug message; don't try to add OSP tokens to OPTIONS pings ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_iax2.c,1.376,1.377
Update of /usr/cvsroot/asterisk/channels In directory mongoose.digium.com:/tmp/cvs-serv19180/channels Modified Files: chan_iax2.c Log Message: fix typo Index: chan_iax2.c === RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v retrieving revision 1.376 retrieving revision 1.377 diff -u -d -r1.376 -r1.377 --- chan_iax2.c 11 Nov 2005 16:02:56 - 1.376 +++ chan_iax2.c 12 Nov 2005 00:53:47 - 1.377 @@ -441,7 +441,7 @@ int sockfd; /*! Last received voice format */ int voiceformat; - /*! Last received voice format */ + /*! Last received video format */ int videoformat; /*! Last sent voice format */ int svoiceformat; ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.113,1.114
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv19489 Modified Files: ChangeLog Log Message: issue #5720 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- ChangeLog 12 Nov 2005 00:53:47 - 1.113 +++ ChangeLog 12 Nov 2005 01:33:10 - 1.114 @@ -1,5 +1,7 @@ 2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] + * apps/app_dial.c (wait_for_answer): correct flag copying for automon feature (issue #5720) + * channels/chan_iax2.c: correct comment * apps/app_voicemail.c (close_mailbox): correct previous commit (issue #5663) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.115,1.116
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv19843 Modified Files: ChangeLog Log Message: issue #5704 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- ChangeLog 12 Nov 2005 02:34:01 - 1.115 +++ ChangeLog 12 Nov 2005 02:39:06 - 1.116 @@ -1,6 +1,7 @@ 2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] * apps/app_voicemail.c (forward_message): correct bugs in message forwarding (issue #5718) + (copy_message): use correct path for locking (issue #5704) * apps/app_dial.c (wait_for_answer): correct flag copying for automon feature (issue #5720) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_voicemail.c,1.270,1.271
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv19843/apps
Modified Files:
app_voicemail.c
Log Message:
issue #5704
Index: app_voicemail.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- app_voicemail.c 12 Nov 2005 02:34:01 - 1.270
+++ app_voicemail.c 12 Nov 2005 02:39:06 - 1.271
@@ -2285,7 +2285,7 @@
make_dir(fromdir, sizeof(fromdir), vmu-context, vmu-mailbox, frombox);
make_file(frompath, sizeof(frompath), fromdir, msgnum);
- if (vm_lock_path(topath))
+ if (vm_lock_path(todir))
return ERROR_LOCK_PATH;
recipmsgnum = 0;
@@ -2300,7 +2300,7 @@
} else {
ast_log(LOG_ERROR, Recipient mailbox [EMAIL PROTECTED] is
full\n, recip-mailbox, recip-context);
}
- ast_unlock_path(topath);
+ ast_unlock_path(todir);
notify_new_message(chan, recip, recipmsgnum, duration, fmt,
chan-cid.cid_num, chan-cid.cid_name);
return 0;
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.116,1.117
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv19977 Modified Files: ChangeLog Log Message: issue #5712 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- ChangeLog 12 Nov 2005 02:39:06 - 1.116 +++ ChangeLog 12 Nov 2005 02:57:43 - 1.117 @@ -1,5 +1,7 @@ 2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_sip.c (thread_safe_rand): ensure that threads don't get the same random number (issue #5712) + * apps/app_voicemail.c (forward_message): correct bugs in message forwarding (issue #5718) (copy_message): use correct path for locking (issue #5704) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.117,1.118
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv20289 Modified Files: ChangeLog Log Message: rc2 update Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- ChangeLog 12 Nov 2005 02:57:43 - 1.117 +++ ChangeLog 12 Nov 2005 03:37:13 - 1.118 @@ -1,5 +1,9 @@ 2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] + * Asterisk 1.2.0-rc2 released. + +2005-11-11 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_sip.c (thread_safe_rand): ensure that threads don't get the same random number (issue #5712) * apps/app_voicemail.c (forward_message): correct bugs in message forwarding (issue #5718) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_queue.c,1.179,1.180
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv9961/apps
Modified Files:
app_queue.c
Log Message:
issue #5707
Index: app_queue.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- app_queue.c 8 Nov 2005 04:48:00 - 1.179
+++ app_queue.c 10 Nov 2005 23:22:37 - 1.180
@@ -2720,7 +2720,7 @@
AST_STANDARD_APP_ARGS(args, parse);
if (ast_strlen_zero(args.interface)) {
- ast_copy_string(args.interface, chan-name,
sizeof(args.interface));
+ args.interface = ast_strdupa(chan-name);
temppos = strrchr(args.interface, '-');
if (temppos)
*temppos = '\0';
@@ -2788,7 +2788,7 @@
AST_STANDARD_APP_ARGS(args, parse);
if (ast_strlen_zero(args.interface)) {
- ast_copy_string(args.interface, chan-name,
sizeof(args.interface));
+ args.interface = ast_strdupa(chan-name);
temppos = strrchr(args.interface, '-');
if (temppos)
*temppos = '\0';
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.88,1.89
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv10017 Modified Files: ChangeLog Log Message: issue #5703 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- ChangeLog 10 Nov 2005 23:22:37 - 1.88 +++ ChangeLog 10 Nov 2005 23:26:40 - 1.89 @@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * res/res_features.c (load_config): properly initialize referenced variable (issue #5703) + * apps/app_queue.c (rqm_exec): correct segfault problem (issue #5705) (aqm_exec): ditto ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/res res_features.c,1.81,1.82
Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv10017/res
Modified Files:
res_features.c
Log Message:
issue #5703
Index: res_features.c
===
RCS file: /usr/cvsroot/asterisk/res/res_features.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- res_features.c 9 Nov 2005 00:16:08 - 1.81
+++ res_features.c 10 Nov 2005 23:26:40 - 1.82
@@ -1949,7 +1949,7 @@
struct ast_config *cfg = NULL;
struct ast_variable *var = NULL;
char old_parking_ext[AST_MAX_EXTENSION];
- char old_parking_con[AST_MAX_EXTENSION];
+ char old_parking_con[AST_MAX_EXTENSION] = ;
if (!ast_strlen_zero(parking_con)) {
strcpy(old_parking_ext, parking_ext);
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.89,1.90
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv10049 Modified Files: ChangeLog Log Message: issue #5701 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- ChangeLog 10 Nov 2005 23:26:40 - 1.89 +++ ChangeLog 10 Nov 2005 23:28:55 - 1.90 @@ -1,5 +1,8 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * pbx/pbx_ael.c (handle_macro): don't leak memory (issue #5701) + (handle_context): ditto + * res/res_features.c (load_config): properly initialize referenced variable (issue #5703) * apps/app_queue.c (rqm_exec): correct segfault problem (issue #5705) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/pbx pbx_ael.c,1.17,1.18
Update of /usr/cvsroot/asterisk/pbx
In directory mongoose.digium.com:/tmp/cvs-serv10049/pbx
Modified Files:
pbx_ael.c
Log Message:
issue #5701
Index: pbx_ael.c
===
RCS file: /usr/cvsroot/asterisk/pbx/pbx_ael.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pbx_ael.c 8 Nov 2005 01:55:30 - 1.17
+++ pbx_ael.c 10 Nov 2005 23:28:55 - 1.18
@@ -966,6 +966,7 @@
}
} else
ast_log(LOG_WARNING, Unable to create context '%s'\n, name);
+ arg_free(paramv);
arg_free(argv);
if (vars-next)
ast_log(LOG_NOTICE, Ignoring excess tokens in macro definition
around line %d of %s!\n, lineno, filename);
@@ -1013,7 +1014,6 @@
static void handle_context(struct ast_context **local_contexts, struct
stringlink *vars, const char *filename, int lineno)
{
struct stringlink *argv;
- struct stringlink *paramv;
struct stringlink *cur2;
struct stringlink *argv2;
struct stringlink *cur;
@@ -1026,7 +1026,6 @@
if (aeldebug DEBUG_CONTEXTS)
ast_verbose(Root context def is '%s'\n, vars-data);
argv = split_token(vars-data, filename, lineno);
- paramv = split_params(vars-data, filename, lineno);
if (aeldebug DEBUG_CONTEXTS)
ast_verbose(Found context '%s'\n, vars-data);
snprintf(name, sizeof(name), %s, vars-data);
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_iax2.c,1.373,1.374
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv10159/channels
Modified Files:
chan_iax2.c
Log Message:
issue #5685
Index: chan_iax2.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- chan_iax2.c 9 Nov 2005 19:05:52 - 1.373
+++ chan_iax2.c 10 Nov 2005 23:34:30 - 1.374
@@ -1970,6 +1970,7 @@
{
int which = 0;
struct iax2_peer *p;
+ char *res = NULL;
/* 0 - iax2; 1 - show; 2 - peer; 3 - peername */
if(pos == 3) {
@@ -1977,14 +1978,15 @@
for(p = peerl.peers ; p ; p = p-next) {
if(!strncasecmp(p-name, word, strlen(word))) {
if(++which state) {
- return strdup(p-name);
+ res = strdup(p-name);
+ break;
}
}
}
ast_mutex_unlock(peerl.lock);
}
- return NULL;
+ return res;
}
static int iax2_show_stats(int fd, int argc, char *argv[])
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.93,1.94
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv10426 Modified Files: ChangeLog Log Message: issue #5689 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- ChangeLog 10 Nov 2005 23:42:45 - 1.93 +++ ChangeLog 11 Nov 2005 00:10:44 - 1.94 @@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * configs/voicemail.conf.sample (format): add strong warning about changing format list when mailboxes contain messages (issue #5689) + * many files: ensure that system headers are included before Asterisk headers (issue #5693) * channels/chan_iax2.c (complete_iax2_show_peer): don't return from function without releasing lock (issue #5685) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/configs voicemail.conf.sample,1.54,1.55
Update of /usr/cvsroot/asterisk/configs In directory mongoose.digium.com:/tmp/cvs-serv10426/configs Modified Files: voicemail.conf.sample Log Message: issue #5689 Index: voicemail.conf.sample === RCS file: /usr/cvsroot/asterisk/configs/voicemail.conf.sample,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- voicemail.conf.sample 4 Oct 2005 22:51:59 - 1.54 +++ voicemail.conf.sample 11 Nov 2005 00:10:44 - 1.55 @@ -5,6 +5,20 @@ ; Default formats for writing Voicemail ;format=g723sf|wav49|wav format=wav49|gsm|wav +; +; WARNING: +; If you change the list of formats that you record voicemail in +; when you have mailboxes that contain messages, you _MUST_ absolutely +; manually go through those mailboxes and convert/delete/add the +; the message files so that they appear to have been stored using +; your new format list. If you don't do this, very unpleasant +; things may happen to your users while they are retrieving and +; manipulating their voicemail. +; +; In other words: don't change the format list on a production system +; unless you are _VERY_ sure that you know what you are doing and are +; prepared for the consequences. +; ; Who the e-mail notification should appear to come from serveremail=asterisk ;[EMAIL PROTECTED] ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/pbx pbx_ael.c,1.18,1.19
Update of /usr/cvsroot/asterisk/pbx
In directory mongoose.digium.com:/tmp/cvs-serv10463/pbx
Modified Files:
pbx_ael.c
Log Message:
issue #5354
Index: pbx_ael.c
===
RCS file: /usr/cvsroot/asterisk/pbx/pbx_ael.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- pbx_ael.c 10 Nov 2005 23:28:55 - 1.18
+++ pbx_ael.c 11 Nov 2005 00:14:13 - 1.19
@@ -512,7 +512,7 @@
mlen = strlen(exten) + 128 + strlen(args) +
strlen(name);
margs = alloca(mlen);
app = Goto;
- sprintf(margs, sw-%s-%d-%s|1, name, *pos, args);
+ sprintf(margs, sw-%d-%s|1, *pos, args);
ast_process_quotes_and_slashes(margs, ',', '|');
oargs = args;
args = margs;
@@ -523,7 +523,7 @@
(*pos)++;
}
app = NoOp;
- sprintf(margs, Finish switch-%s-%d, name, *pos - 1);
+ sprintf(margs, Finish switch-%d, *pos - 1);
if (ast_add_extension2(con, 0, exten, *pos, *label,
NULL, app, strdup(args), FREE, registrar))
ast_log(LOG_WARNING, Unable to add step at
priority '%d' of %s '%s'\n, *pos, what, name);
else {
@@ -543,15 +543,15 @@
if (curcase) {
/* Handle fall through */
char tmp[strlen(newcase) +
strlen(name) + 40];
- sprintf(tmp, sw-%s-%d-%s|%d,
name, *pos - 2, newcase, 1);
+ sprintf(tmp, sw-%d-%s|%d,
*pos - 2, newcase, 1);
ast_add_extension2(con, 0,
margs, cpos, NULL, NULL, Goto, strdup(tmp), FREE, registrar);
}
curcase = newcase;
cpos = 1;
if (pattern)
- snprintf(margs, mlen,
_sw-%s-%d-%s, name, *pos - 2, curcase);
+ snprintf(margs, mlen,
_sw-%d-%s, *pos - 2, curcase);
else
- snprintf(margs, mlen,
sw-%s-%d-%s, name, *pos - 2, curcase);
+ snprintf(margs, mlen,
sw-%d-%s, *pos - 2, curcase);
if (!strcasecmp(rest, break)) {
char tmp[strlen(exten) + 10];
sprintf(tmp, %s|%d, exten,
*pos - 1);
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.95,1.96
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv10521 Modified Files: ChangeLog Log Message: issue #5668, modified to compile on non-Cygwin platforms :-) Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- ChangeLog 11 Nov 2005 00:14:13 - 1.95 +++ ChangeLog 11 Nov 2005 00:21:42 - 1.96 @@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * include/asterisk/lock.h (PTHREAD_MUTEX_RECURSIVE_NP): work around header problems on Cygwin (issue #5668) + * pbx/pbx_ael.c: handle switch default cases inside macros properly (issue #5354) * configs/voicemail.conf.sample (format): add strong warning about changing format list when mailboxes contain messages (issue #5689) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps Makefile, 1.119, 1.120 app_striplsd.c, 1.13, NONE app_substring.c, 1.17, NONE
Update of /usr/cvsroot/asterisk/apps In directory mongoose.digium.com:/tmp/cvs-serv10630/apps Modified Files: Makefile Removed Files: app_striplsd.c app_substring.c Log Message: issue #5673 Index: Makefile === RCS file: /usr/cvsroot/asterisk/apps/Makefile,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- Makefile8 Nov 2005 23:37:53 - 1.119 +++ Makefile11 Nov 2005 00:32:45 - 1.120 @@ -15,8 +15,8 @@ app_system.so app_echo.so app_record.so app_image.so app_url.so app_disa.so \ app_adsiprog.so app_getcpeid.so app_milliwatt.so \ app_zapateller.so app_setcallerid.so app_festival.so \ - app_queue.so app_senddtmf.so app_parkandannounce.so app_striplsd.so \ - app_setcidname.so app_lookupcidname.so app_substring.so app_macro.so \ + app_queue.so app_senddtmf.so app_parkandannounce.so \ + app_setcidname.so app_lookupcidname.so app_macro.so \ app_authenticate.so app_softhangup.so app_lookupblacklist.so \ app_waitforring.so app_privacy.so app_db.so app_chanisavail.so \ app_enumlookup.so app_transfer.so app_setcidnum.so app_cdr.so \ --- app_striplsd.c DELETED --- --- app_substring.c DELETED --- ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.96,1.97 pbx.c,1.301,1.302
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv10630
Modified Files:
ChangeLog pbx.c
Log Message:
issue #5673
Index: ChangeLog
===
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- ChangeLog 11 Nov 2005 00:21:42 - 1.96
+++ ChangeLog 11 Nov 2005 00:32:45 - 1.97
@@ -1,5 +1,9 @@
2005-11-10 Kevin P. Fleming [EMAIL PROTECTED]
+ * pbx.c: remove apps that were deprecated before 1.0 was released
(issue #5673)
+
+ * apps/app_striplsd.c, apps/app_substring.c: remove apps that were
deprecated before 1.0 was released (issue #5673)
+
* include/asterisk/lock.h (PTHREAD_MUTEX_RECURSIVE_NP): work around
header problems on Cygwin (issue #5668)
* pbx/pbx_ael.c: handle switch default cases inside macros properly
(issue #5354)
Index: pbx.c
===
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- pbx.c 9 Nov 2005 21:48:59 - 1.301
+++ pbx.c 11 Nov 2005 00:32:45 - 1.302
@@ -187,9 +187,6 @@
int ast_pbx_outgoing_cdr_failed(void);
-static int pbx_builtin_prefix(struct ast_channel *, void *);
-static int pbx_builtin_suffix(struct ast_channel *, void *);
-static int pbx_builtin_stripmsd(struct ast_channel *, void *);
static int pbx_builtin_answer(struct ast_channel *, void *);
static int pbx_builtin_goto(struct ast_channel *, void *);
static int pbx_builtin_hangup(struct ast_channel *, void *);
@@ -355,15 +352,6 @@
variables or functions without having any effect.
},
- { Prefix, pbx_builtin_prefix,
- Prepend digits to the current extension,
- Prefix(digits): This application will insert the specified digits to
the\n
- beginning of the current extension. Call processing will then continue
at\n
- the next priority, but at the new extension.\n
- For example, if priority 3 of extension 1212 is Prefix(555), the
next step\n
- executed will be priority 4 of 5551212.\n
- },
-
{ Progress, pbx_builtin_progress,
Indicate progress,
Progress(): This application will request that in-band progress
information\n
@@ -485,26 +473,6 @@
Set for more information.\n
},
- { StripMSD, pbx_builtin_stripmsd,
- Strip leading digits,
- StripMSD(count): Strips the leading 'count' digits from the
channel's\n
- associated extension. For example, the number 5551212 when stripped
with a\n
- count of 3 would be changed to 1212. The channel will continue
dialplan\n
- execution at the next priority for the *new* extension.\n
- So, for example, if priority 3 of 5551212 is StripMSD 3, the next
step\n
- executed will be priority 4 of 1212.\n
- },
-
- { Suffix, pbx_builtin_suffix,
- Append trailing digits,
- Suffix(digits): Appends the digit string specified by digits to
the\n
- channel's associated extension. For example, the number 555 when
suffixed\n
- with '1212' will become 5551212. The channel will continune dialplan
execution\n
- at the next priority for the *new* extension.\n
- So, for example, if priority 3 of 555 is Suffix 1212, the next
step\n
- executed will be priority 4 of 5551212.\n
- },
-
{ Wait, pbx_builtin_wait,
Waits for some time,
Wait(seconds): This application waits for a specified number of
seconds.\n
@@ -5492,51 +5460,6 @@
return -1;
}
-static int pbx_builtin_stripmsd(struct ast_channel *chan, void *data)
-{
- char newexten[AST_MAX_EXTENSION] = ;
-
- if (!data || !atoi(data)) {
- ast_log(LOG_DEBUG, Ignoring, since number of digits to strip
is 0\n);
- return 0;
- }
- if (strlen(chan-exten) atoi(data)) {
- ast_copy_string(newexten, chan-exten + atoi(data),
sizeof(newexten));
- }
- ast_copy_string(chan-exten, newexten, sizeof(chan-exten));
- return 0;
-}
-
-static int pbx_builtin_prefix(struct ast_channel *chan, void *data)
-{
- char newexten[AST_MAX_EXTENSION];
-
- if (ast_strlen_zero(data)) {
- ast_log(LOG_DEBUG, Ignoring, since there is no prefix to
add\n);
- return 0;
- }
- snprintf(newexten, sizeof(newexten), %s%s, (char *)data, chan-exten);
- ast_copy_string(chan-exten, newexten, sizeof(chan-exten));
- if (option_verbose 2)
- ast_verbose(VERBOSE_PREFIX_3 Prepended prefix, new extension
is %s\n, chan-exten);
- return 0;
-}
-
-static int pbx_builtin_suffix(struct ast_channel *chan, void *data)
-{
- char newexten[AST_MAX_EXTENSION];
-
- if (ast_strlen_zero(data)) {
-
[Asterisk-cvs] asterisk ChangeLog,1.97,1.98
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv10658 Modified Files: ChangeLog Log Message: issue #5671 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- ChangeLog 11 Nov 2005 00:32:45 - 1.97 +++ ChangeLog 11 Nov 2005 00:35:20 - 1.98 @@ -1,5 +1,8 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_misdn.c: include stdio.h (issue #5671) + * channels/chan_misdn_config.c: fix prototype warning (issue #5671) + * pbx.c: remove apps that were deprecated before 1.0 was released (issue #5673) * apps/app_striplsd.c, apps/app_substring.c: remove apps that were deprecated before 1.0 was released (issue #5673) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.98,1.99
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv10716 Modified Files: ChangeLog Log Message: issue #5680 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- ChangeLog 11 Nov 2005 00:35:20 - 1.98 +++ ChangeLog 11 Nov 2005 00:45:02 - 1.99 @@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * apps/app_meetme.c (conf_run): don't restrict admin users from joining a locked conference (issue #5680) + * channels/chan_misdn.c: include stdio.h (issue #5671) * channels/chan_misdn_config.c: fix prototype warning (issue #5671) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_meetme.c,1.125,1.126
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv10716/apps
Modified Files:
app_meetme.c
Log Message:
issue #5680
Index: app_meetme.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- app_meetme.c8 Nov 2005 23:19:30 - 1.125
+++ app_meetme.c11 Nov 2005 00:45:02 - 1.126
@@ -848,7 +848,7 @@
time(user-jointime);
- if (conf-locked) {
+ if (conf-locked (!(confflags CONFFLAG_ADMIN))) {
/* Sorry, but this confernce is locked! */
if (!ast_streamfile(chan, conf-locked, chan-language))
ast_waitstream(chan, );
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.99,1.100
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv10776 Modified Files: ChangeLog Log Message: issue #5676 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- ChangeLog 11 Nov 2005 00:45:02 - 1.99 +++ ChangeLog 11 Nov 2005 00:53:19 - 1.100 @@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * apps/app_disa.c (disa_exec): correct password file parsing (issue #5676) + * apps/app_meetme.c (conf_run): don't restrict admin users from joining a locked conference (issue #5680) * channels/chan_misdn.c: include stdio.h (issue #5671) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_disa.c,1.44,1.45
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv10776/apps
Modified Files:
app_disa.c
Log Message:
issue #5676
Index: app_disa.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_disa.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- app_disa.c 7 Nov 2005 22:01:21 - 1.44
+++ app_disa.c 11 Nov 2005 00:53:19 - 1.45
@@ -119,6 +119,7 @@
int digittimeout = 1;
struct localuser *u;
char *tmp, arg2[256]=,exten[AST_MAX_EXTENSION],acctcode[20]=;
+ char pwline[256];
char *ourcontext,*ourcallerid,ourcidname[256],ourcidnum[256],*mailbox;
struct ast_frame *f;
struct timeval lastdigittime;
@@ -262,18 +263,18 @@
LOCAL_USER_REMOVE(u);
return -1;
}
- tmp[0] = 0;
- while(fgets(tmp,sizeof(tmp) -
1,fp))
+ pwline[0] = 0;
+
while(fgets(pwline,sizeof(pwline) - 1,fp))
{
char
*stringp=NULL,*stringp2;
- if (!tmp[0]) continue;
- if (tmp[strlen(tmp) -
1] == '\n')
- tmp[strlen(tmp)
- 1] = 0;
- if (!tmp[0]) continue;
+ if (!pwline[0])
continue;
+ if
(pwline[strlen(pwline) - 1] == '\n')
+
pwline[strlen(pwline) - 1] = 0;
+ if (!pwline[0])
continue;
/* skip comments */
- if (tmp[0] == '#')
continue;
- if (tmp[0] == ';')
continue;
- stringp=tmp;
+ if (pwline[0] == '#')
continue;
+ if (pwline[0] == ';')
continue;
+ stringp=pwline;
strsep(stringp, |);
stringp2=strsep(stringp, |);
if (stringp2) {
@@ -287,14 +288,14 @@
ast_log(LOG_DEBUG,
Mailbox: %s\n,mailbox);
/* password must be
in valid format (numeric) */
- if (sscanf(tmp,%d,j)
1) continue;
+ if
(sscanf(pwline,%d,j) 1) continue;
/* if we got it */
- if (!strcmp(exten,tmp))
break;
+ if
(!strcmp(exten,pwline)) break;
}
fclose(fp);
}
/* compare the two */
- if (strcmp(exten,tmp))
+ if (strcmp(exten,pwline))
{
ast_log(LOG_WARNING,DISA on
chan %s got bad password %s\n,chan-name,exten);
goto reorder;
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.100,1.101 app.c,1.84,1.85
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv10852
Modified Files:
ChangeLog app.c
Log Message:
ugh... another broken commit
Index: ChangeLog
===
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ChangeLog 11 Nov 2005 00:53:19 - 1.100
+++ ChangeLog 11 Nov 2005 01:01:19 - 1.101
@@ -1,5 +1,7 @@
2005-11-10 Kevin P. Fleming [EMAIL PROTECTED]
+ * app.c (ast_app_parse_options): ok, so we aren't all perfect... let's
make the while loop actually work properly here (issue #5684)
+
* apps/app_disa.c (disa_exec): correct password file parsing (issue
#5676)
* apps/app_meetme.c (conf_run): don't restrict admin users from joining
a locked conference (issue #5680)
Index: app.c
===
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- app.c 10 Nov 2005 23:18:03 - 1.84
+++ app.c 11 Nov 2005 01:01:19 - 1.85
@@ -1544,7 +1544,8 @@
if (*s == '(') {
/* Has argument */
arg = ++s;
- while (*s (*s++ != ')'));
+ while (*s (*s != ')'))
+ s++;
if (*s) {
if (argloc)
args[argloc - 1] = arg;
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/include/asterisk linkedlists.h,1.19,1.20
Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv11037/include/asterisk
Modified Files:
linkedlists.h
Log Message:
issue #5669
Index: linkedlists.h
===
RCS file: /usr/cvsroot/asterisk/include/asterisk/linkedlists.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- linkedlists.h 31 Oct 2005 15:34:11 - 1.19
+++ linkedlists.h 11 Nov 2005 01:30:34 - 1.20
@@ -138,7 +138,7 @@
*/
#define AST_LIST_HEAD_SET(head, entry) do {\
(head)-first = (entry);\
- (head)-last = NULL;\
+ (head)-last = (entry); \
ast_mutex_init((head)-lock); \
} while (0)
@@ -152,7 +152,7 @@
*/
#define AST_LIST_HEAD_SET_NOLOCK(head, entry) do { \
(head)-first = (entry);\
- (head)-last = NULL;\
+ (head)-last = (entry); \
} while (0)
/*!
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.101,1.102
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv11037 Modified Files: ChangeLog Log Message: issue #5669 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- ChangeLog 11 Nov 2005 01:01:19 - 1.101 +++ ChangeLog 11 Nov 2005 01:30:34 - 1.102 @@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * include/asterisk/linkedlists.h (AST_LIST_HEAD_SET_NOLOCK): properly initialize tail pointer when list head is directly set (issue #5669) + * app.c (ast_app_parse_options): ok, so we aren't all perfect... let's make the while loop actually work properly here (issue #5684) * apps/app_disa.c (disa_exec): correct password file parsing (issue #5676) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_chanspy.c, 1.35, 1.36 app_mixmonitor.c, 1.15, 1.16
Update of /usr/cvsroot/asterisk/apps In directory mongoose.digium.com:/tmp/cvs-serv11768/apps Modified Files: app_chanspy.c app_mixmonitor.c Log Message: issue #5590 Index: app_chanspy.c === RCS file: /usr/cvsroot/asterisk/apps/app_chanspy.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- app_chanspy.c 10 Nov 2005 21:39:01 - 1.35 +++ app_chanspy.c 11 Nov 2005 03:48:28 - 1.36 @@ -35,6 +35,7 @@ #include asterisk/file.h #include asterisk/logger.h #include asterisk/channel.h +#include asterisk/chanspy.h #include asterisk/features.h #include asterisk/options.h #include asterisk/app.h Index: app_mixmonitor.c === RCS file: /usr/cvsroot/asterisk/apps/app_mixmonitor.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- app_mixmonitor.c8 Nov 2005 04:48:00 - 1.15 +++ app_mixmonitor.c11 Nov 2005 03:48:28 - 1.16 @@ -38,6 +38,7 @@ #include asterisk/file.h #include asterisk/logger.h #include asterisk/channel.h +#include asterisk/chanspy.h #include asterisk/pbx.h #include asterisk/module.h #include asterisk/lock.h ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog, 1.102, 1.103 channel.c, 1.258, 1.259
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv11768 Modified Files: ChangeLog channel.c Log Message: issue #5590 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- ChangeLog 11 Nov 2005 01:30:34 - 1.102 +++ ChangeLog 11 Nov 2005 03:48:28 - 1.103 @@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * include/asterisk/chanspy.h: move spy-related stuff into separate header so chan_h323 can build (issue #5590) + * include/asterisk/linkedlists.h (AST_LIST_HEAD_SET_NOLOCK): properly initialize tail pointer when list head is directly set (issue #5669) * app.c (ast_app_parse_options): ok, so we aren't all perfect... let's make the while loop actually work properly here (issue #5684) Index: channel.c === RCS file: /usr/cvsroot/asterisk/channel.c,v retrieving revision 1.258 retrieving revision 1.259 diff -u -d -r1.258 -r1.259 --- channel.c 2 Nov 2005 17:20:35 - 1.258 +++ channel.c 11 Nov 2005 03:48:28 - 1.259 @@ -52,6 +52,7 @@ #include asterisk/sched.h #include asterisk/options.h #include asterisk/channel.h +#include asterisk/chanspy.h #include asterisk/musiconhold.h #include asterisk/logger.h #include asterisk/say.h ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.103,1.104
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv12060 Modified Files: ChangeLog Log Message: issue #5595 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- ChangeLog 11 Nov 2005 03:48:28 - 1.103 +++ ChangeLog 11 Nov 2005 04:12:54 - 1.104 @@ -1,5 +1,8 @@ 2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * rtp.c (ast_rtp_raw_write): use unsigned int for return value from calc_txstamp() (issue #5595) + (calc_txstamp): never return a value that was less than zero before being turned into 'unsigned int' (issue #5595) + * include/asterisk/chanspy.h: move spy-related stuff into separate header so chan_h323 can build (issue #5590) * include/asterisk/linkedlists.h (AST_LIST_HEAD_SET_NOLOCK): properly initialize tail pointer when list head is directly set (issue #5669) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.104,1.105
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv12167 Modified Files: ChangeLog Log Message: give marko credit for his fix :-) Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- ChangeLog 11 Nov 2005 04:12:54 - 1.104 +++ ChangeLog 11 Nov 2005 04:32:25 - 1.105 @@ -1,8 +1,10 @@ -2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] +2005-11-10 Mark Spencer [EMAIL PROTECTED] * rtp.c (ast_rtp_raw_write): use unsigned int for return value from calc_txstamp() (issue #5595) (calc_txstamp): never return a value that was less than zero before being turned into 'unsigned int' (issue #5595) +2005-11-10 Kevin P. Fleming [EMAIL PROTECTED] + * include/asterisk/chanspy.h: move spy-related stuff into separate header so chan_h323 can build (issue #5590) * include/asterisk/linkedlists.h (AST_LIST_HEAD_SET_NOLOCK): properly initialize tail pointer when list head is directly set (issue #5669) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_iax2.c,1.372,1.373
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv31757/channels
Modified Files:
chan_iax2.c
Log Message:
eliminate useless warnings generated by IAXy registrations
Index: chan_iax2.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -d -r1.372 -r1.373
--- chan_iax2.c 9 Nov 2005 00:48:38 - 1.372
+++ chan_iax2.c 9 Nov 2005 19:05:52 - 1.373
@@ -5660,6 +5660,9 @@
/* Setup the expiry */
if (p-expire -1)
ast_sched_del(sched, p-expire);
+ /* treat an unspecified refresh interval as the minimum */
+ if (!refresh)
+ refresh = min_reg_expire;
if (refresh max_reg_expire) {
ast_log(LOG_NOTICE, Restricting registration for peer '%s' to
%d seconds (requested %d)\n,
p-name, max_reg_expire, refresh);
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] zaptel wct1xxp.c,1.25,1.26 wcte11xp.c,1.15,1.16
Update of /usr/cvsroot/zaptel In directory mongoose.digium.com:/tmp/cvs-serv20537 Modified Files: wct1xxp.c wcte11xp.c Log Message: support DACS w/RBS on single-span cards Index: wct1xxp.c === RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- wct1xxp.c 4 Oct 2005 23:08:49 - 1.25 +++ wct1xxp.c 8 Nov 2005 15:59:06 - 1.26 @@ -791,7 +791,7 @@ sprintf(wc-chans[x].name, WCT1/%d/%d, wc-num, x + 1); wc-chans[x].sigcap = ZT_SIG_EM | ZT_SIG_CLEAR | ZT_SIG_EM_E1 | ZT_SIG_FXSLS | ZT_SIG_FXSGS | - ZT_SIG_FXSKS | ZT_SIG_FXOLS | + ZT_SIG_FXSKS | ZT_SIG_FXOLS | ZT_SIG_DACS_RBS | ZT_SIG_FXOGS | ZT_SIG_FXOKS | ZT_SIG_CAS | ZT_SIG_SF; wc-chans[x].pvt = wc; wc-chans[x].chanpos = x + 1; Index: wcte11xp.c === RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- wcte11xp.c 4 Oct 2005 23:08:49 - 1.15 +++ wcte11xp.c 8 Nov 2005 15:59:06 - 1.16 @@ -976,7 +976,7 @@ sprintf(wc-chans[x].name, WCT1/%d/%d, wc-num, x + 1); wc-chans[x].sigcap = ZT_SIG_EM | ZT_SIG_CLEAR | ZT_SIG_EM_E1 | ZT_SIG_FXSLS | ZT_SIG_FXSGS | - ZT_SIG_FXSKS | ZT_SIG_FXOLS | + ZT_SIG_FXSKS | ZT_SIG_FXOLS | ZT_SIG_DACS_RBS | ZT_SIG_FXOGS | ZT_SIG_FXOKS | ZT_SIG_CAS | ZT_SIG_SF; wc-chans[x].pvt = wc; wc-chans[x].chanpos = x + 1; ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] zaptel wct1xxp.c, 1.19.2.4, 1.19.2.5 wcte11xp.c, 1.1.2.10, 1.1.2.11
Update of /usr/cvsroot/zaptel In directory mongoose.digium.com:/tmp/cvs-serv20637 Modified Files: Tag: v1-0 wct1xxp.c wcte11xp.c Log Message: support DACS w/RBS on single-span cards Index: wct1xxp.c === RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v retrieving revision 1.19.2.4 retrieving revision 1.19.2.5 diff -u -d -r1.19.2.4 -r1.19.2.5 --- wct1xxp.c 25 Jul 2005 18:32:19 - 1.19.2.4 +++ wct1xxp.c 8 Nov 2005 16:00:44 - 1.19.2.5 @@ -791,7 +791,7 @@ sprintf(wc-chans[x].name, WCT1/%d/%d, wc-num, x + 1); wc-chans[x].sigcap = ZT_SIG_EM | ZT_SIG_CLEAR | ZT_SIG_EM_E1 | ZT_SIG_FXSLS | ZT_SIG_FXSGS | - ZT_SIG_FXSKS | ZT_SIG_FXOLS | + ZT_SIG_FXSKS | ZT_SIG_FXOLS | ZT_SIG_DACS_RBS | ZT_SIG_FXOGS | ZT_SIG_FXOKS | ZT_SIG_CAS | ZT_SIG_SF; wc-chans[x].pvt = wc; wc-chans[x].chanpos = x + 1; Index: wcte11xp.c === RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -u -d -r1.1.2.10 -r1.1.2.11 --- wcte11xp.c 4 Aug 2005 15:50:37 - 1.1.2.10 +++ wcte11xp.c 8 Nov 2005 16:00:44 - 1.1.2.11 @@ -965,7 +965,7 @@ sprintf(wc-chans[x].name, WCT1/%d/%d, wc-num, x + 1); wc-chans[x].sigcap = ZT_SIG_EM | ZT_SIG_CLEAR | ZT_SIG_EM_E1 | ZT_SIG_FXSLS | ZT_SIG_FXSGS | - ZT_SIG_FXSKS | ZT_SIG_FXOLS | + ZT_SIG_FXSKS | ZT_SIG_FXOLS | ZT_SIG_DACS_RBS | ZT_SIG_FXOGS | ZT_SIG_FXOKS | ZT_SIG_CAS | ZT_SIG_SF; wc-chans[x].pvt = wc; wc-chans[x].chanpos = x + 1; ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] zaptel ChangeLog,1.1.2.16,1.1.2.17
Update of /usr/cvsroot/zaptel In directory mongoose.digium.com:/tmp/cvs-serv20687 Modified Files: Tag: v1-0 ChangeLog Log Message: update ChangeLog Index: ChangeLog === RCS file: /usr/cvsroot/zaptel/ChangeLog,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -u -d -r1.1.2.16 -r1.1.2.17 --- ChangeLog 13 Sep 2005 22:06:57 - 1.1.2.16 +++ ChangeLog 8 Nov 2005 16:01:12 - 1.1.2.17 @@ -1,3 +1,4 @@ + -- support DACS w/RBS on single-span cards zaptel 1.0.9.2 -- fix build issues for Linux 2.6.13 -- fixed tor2 to work on 64-bit architectures ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.70,1.71
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv23748 Modified Files: ChangeLog Log Message: issue #5650 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- ChangeLog 8 Nov 2005 04:57:34 - 1.70 +++ ChangeLog 8 Nov 2005 19:47:56 - 1.71 @@ -1,3 +1,7 @@ +2005-11-08 Kevin P. Fleming [EMAIL PROTECTED] + + * many files: add explicit include of stdio.h (issue #5650) + 2005-11-07 Kevin P. Fleming [EMAIL PROTECTED] * UPGRADE.txt (Parking): add note about new parking behavior (issue #5532) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_curl.c, 1.17, 1.18 app_datetime.c, 1.9, 1.10 app_intercom.c, 1.28, 1.29 app_ivrdemo.c, 1.13, 1.14 app_osplookup.c, 1.16, 1.17 app_skel.c, 1.18, 1.19
Update of /usr/cvsroot/asterisk/apps In directory mongoose.digium.com:/tmp/cvs-serv23748/apps Modified Files: app_curl.c app_datetime.c app_intercom.c app_ivrdemo.c app_osplookup.c app_skel.c Log Message: issue #5650 Index: app_curl.c === RCS file: /usr/cvsroot/asterisk/apps/app_curl.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- app_curl.c 7 Nov 2005 22:01:21 - 1.17 +++ app_curl.c 8 Nov 2005 19:47:56 - 1.18 @@ -23,6 +23,7 @@ * \ingroup applications */ +#include stdio.h #include stdlib.h #include string.h #include curl/curl.h Index: app_datetime.c === RCS file: /usr/cvsroot/asterisk/apps/app_datetime.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- app_datetime.c 7 Nov 2005 22:01:21 - 1.9 +++ app_datetime.c 8 Nov 2005 19:47:56 - 1.10 @@ -22,6 +22,7 @@ * \ingroup applications */ +#include stdio.h #include stdlib.h #include unistd.h #include string.h Index: app_intercom.c === RCS file: /usr/cvsroot/asterisk/apps/app_intercom.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- app_intercom.c 7 Nov 2005 22:01:21 - 1.28 +++ app_intercom.c 8 Nov 2005 19:47:56 - 1.29 @@ -23,6 +23,7 @@ * \ingroup applications */ +#include stdio.h #include unistd.h #include errno.h #include sys/ioctl.h Index: app_ivrdemo.c === RCS file: /usr/cvsroot/asterisk/apps/app_ivrdemo.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- app_ivrdemo.c 6 Nov 2005 15:09:46 - 1.13 +++ app_ivrdemo.c 8 Nov 2005 19:47:56 - 1.14 @@ -23,6 +23,7 @@ * \ingroup applications */ +#include stdio.h #include stdlib.h #include unistd.h #include string.h Index: app_osplookup.c === RCS file: /usr/cvsroot/asterisk/apps/app_osplookup.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- app_osplookup.c 8 Nov 2005 00:06:09 - 1.16 +++ app_osplookup.c 8 Nov 2005 19:47:56 - 1.17 @@ -23,6 +23,7 @@ * \ingroup applications */ +#include stdio.h #include stdlib.h #include unistd.h #include string.h Index: app_skel.c === RCS file: /usr/cvsroot/asterisk/apps/app_skel.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- app_skel.c 6 Nov 2005 15:09:46 - 1.18 +++ app_skel.c 8 Nov 2005 19:47:56 - 1.19 @@ -24,6 +24,7 @@ * \ingroup applications */ +#include stdio.h #include stdlib.h #include unistd.h #include string.h ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk-addons app_saycountpl.c,1.1,1.2
Update of /usr/cvsroot/asterisk-addons In directory mongoose.digium.com:/tmp/cvs-serv23789 Modified Files: app_saycountpl.c Log Message: add explicit include of stdio.h (issue #5651) Index: app_saycountpl.c === RCS file: /usr/cvsroot/asterisk-addons/app_saycountpl.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- app_saycountpl.c2 Oct 2004 14:06:21 - 1.1 +++ app_saycountpl.c8 Nov 2005 19:49:37 - 1.2 @@ -7,6 +7,7 @@ * */ +#include stdio.h #include asterisk/file.h #include asterisk/logger.h #include asterisk/channel.h ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.71,1.72
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv24106 Modified Files: ChangeLog Log Message: issue #5604 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- ChangeLog 8 Nov 2005 19:47:56 - 1.71 +++ ChangeLog 8 Nov 2005 20:38:10 - 1.72 @@ -1,5 +1,7 @@ 2005-11-08 Kevin P. Fleming [EMAIL PROTECTED] + * channels/chan_local.c (local_call): move channel variables from incoming to outgoing instead of inheriting them (issue #5604) + * many files: add explicit include of stdio.h (issue #5650) 2005-11-07 Kevin P. Fleming [EMAIL PROTECTED] ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.72,1.73
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25094 Modified Files: ChangeLog Log Message: issues #3599 and #4252 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- ChangeLog 8 Nov 2005 20:38:10 - 1.72 +++ ChangeLog 8 Nov 2005 23:19:30 - 1.73 @@ -1,4 +1,7 @@ 2005-11-08 Kevin P. Fleming [EMAIL PROTECTED] + + * apps/app_meetme.c: fix two audio delay problems related to using non-Zap channels in conferences (issues #3599 and #4252) + * configs/meetme.conf.sample: add documentation of new 'audiobuffers' setting to control buffering on incoming audio from non-Zap channels * channels/chan_local.c (local_call): move channel variables from incoming to outgoing instead of inheriting them (issue #5604) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/apps app_meetme.c,1.124,1.125
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv25094/apps
Modified Files:
app_meetme.c
Log Message:
issues #3599 and #4252
Index: app_meetme.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- app_meetme.c8 Nov 2005 21:32:51 - 1.124
+++ app_meetme.c8 Nov 2005 23:19:30 - 1.125
@@ -55,17 +55,17 @@
#include asterisk/say.h
#include asterisk/utils.h
-static char *tdesc = MeetMe conference bridge;
+static const char *tdesc = MeetMe conference bridge;
-static char *app = MeetMe;
-static char *app2 = MeetMeCount;
-static char *app3 = MeetMeAdmin;
+static const char *app = MeetMe;
+static const char *app2 = MeetMeCount;
+static const char *app3 = MeetMeAdmin;
-static char *synopsis = MeetMe conference bridge;
-static char *synopsis2 = MeetMe participant count;
-static char *synopsis3 = MeetMe conference Administration;
+static const char *synopsis = MeetMe conference bridge;
+static const char *synopsis2 = MeetMe participant count;
+static const char *synopsis3 = MeetMe conference Administration;
-static char *descrip =
+static const char *descrip =
MeetMe([confno][,[options][,pin]]): Enters the user into a specified MeetMe
conference.\n
If the conference number is omitted, the user will be prompted to enter\n
one. \n
@@ -102,14 +102,14 @@
digit extension ${MEETME_EXIT_CONTEXT} or the current context\n
if that variable is not defined.\n;
-static char *descrip2 =
+static const char *descrip2 =
MeetMeCount(confno[|var]): Plays back the number of users in the
specified\n
MeetMe conference. If var is specified, playback will be skipped and the
value\n
will be returned in the variable. Upon app completion, MeetMeCount will
hangup the\n
channel, unless priority n+1 exists, in which case priority progress will
continue.\n
A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING FUNCTIONALITY.\n;
-static char *descrip3 =
+static const char *descrip3 =
MeetMeAdmin(confno,command[,user]): Run admin command for conference\n
'e' -- Eject last user that joined\n
'k' -- Kick one user out of conference\n
@@ -122,6 +122,8 @@
'N' -- Mute entire conference (except admin)\n
;
+#define CONFIG_FILE_NAME meetme.conf
+
STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
@@ -169,8 +171,14 @@
struct volume listen;
};
-#define ADMINFLAG_MUTED (1 1) /* User is muted */
-#define ADMINFLAG_KICKME (1 2) /* User is kicked */
+static int audio_buffers; /* The number of audio buffers
to be allocated on pseudo channels
+ when in a conference
+ */
+
+#define DEFAULT_AUDIO_BUFFERS 32 /* each buffer is 20ms, so this
is 640ms total */
+
+#define ADMINFLAG_MUTED (1 1) /* User is muted */
+#define ADMINFLAG_KICKME (1 2) /* User is kicked */
#define MEETME_DELAYDETECTTALK 300
#define MEETME_DELAYDETECTENDTALK 1000
@@ -706,16 +714,34 @@
Executes a command for the conference or on a conferee\n;
static struct ast_cli_entry cli_conf = {
- { meetme, NULL, NULL }, conf_cmd,
- Execute a command on a conference or conferee, conf_usage,
complete_confcmd };
+ {meetme, NULL, NULL }, conf_cmd,
+ Execute a command on a conference or conferee, conf_usage,
complete_confcmd};
-static void conf_flush(int fd)
+static void conf_flush(int fd, struct ast_channel *chan)
{
int x;
+ /* read any frames that may be waiting on the channel
+ and throw them away
+ */
+ if (chan) {
+ struct ast_frame *f;
+
+ /* when no frames are available, this will wait
+ for 1 millisecond maximum
+ */
+ while (ast_waitfor(chan, 1)) {
+ f = ast_read(chan);
+ if (f)
+ ast_frfree(f);
+ }
+ }
+
+ /* flush any data sitting in the pseudo channel */
x = ZT_FLUSH_ALL;
if (ioctl(fd, ZT_FLUSH, x))
ast_log(LOG_WARNING, Error flushing channel\n);
+
}
/* Remove the conference from the list and free it.
@@ -960,7 +986,7 @@
bi.bufsize = CONF_SIZE/2;
bi.txbufpolicy = ZT_POLICY_IMMEDIATE;
bi.rxbufpolicy = ZT_POLICY_IMMEDIATE;
- bi.numbufs = 4;
+ bi.numbufs = audio_buffers;
if (ioctl(fd, ZT_SET_BUFINFO, bi)) {
ast_log(LOG_WARNING, Unable to set buffering
information: %s\n, strerror(errno));
close(fd);
@@ -1042,7 +1068,7 @@
ast_mutex_unlock(conflock);
-
[Asterisk-cvs] asterisk ChangeLog,1.73,1.74 pbx.c,1.298,1.299
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv25225
Modified Files:
ChangeLog pbx.c
Log Message:
issue #2720
Index: ChangeLog
===
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- ChangeLog 8 Nov 2005 23:19:30 - 1.73
+++ ChangeLog 8 Nov 2005 23:37:53 - 1.74
@@ -1,5 +1,9 @@
2005-11-08 Kevin P. Fleming [EMAIL PROTECTED]
-
+
+ * pbx.c (pbx_builtin_pushvar_helper): add new API function for setting
variables that can exist multiple times (issue #2720)
+ * apps/Makefile (APPS): add app_stack (issue #2720)
+ * apps/app_stack.c: new applications (issue #2720)
+
* apps/app_meetme.c: fix two audio delay problems related to using
non-Zap channels in conferences (issues #3599 and #4252)
* configs/meetme.conf.sample: add documentation of new 'audiobuffers'
setting to control buffering on incoming audio from non-Zap channels
Index: pbx.c
===
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- pbx.c 8 Nov 2005 04:13:18 - 1.298
+++ pbx.c 8 Nov 2005 23:37:53 - 1.299
@@ -5897,6 +5897,26 @@
return NULL;
}
+void pbx_builtin_pushvar_helper(struct ast_channel *chan, const char *name,
const char *value)
+{
+ struct ast_var_t *newvariable;
+ struct varshead *headp;
+
+ if (name[strlen(name)-1] == ')') {
+ ast_log(LOG_WARNING, Cannot push a value onto a function\n);
+ return ast_func_write(chan, name, value);
+ }
+
+ headp = (chan) ? chan-varshead : globals;
+
+ if (value) {
+ if ((option_verbose 1) (headp == globals))
+ ast_verbose(VERBOSE_PREFIX_2 Setting global variable
'%s' to '%s'\n, name, value);
+ newvariable = ast_var_assign(name, value);
+ AST_LIST_INSERT_HEAD(headp, newvariable, entries);
+ }
+}
+
void pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name,
const char *value)
{
struct ast_var_t *newvariable;
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.74,1.75
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25436 Modified Files: ChangeLog Log Message: issue #5601 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- ChangeLog 8 Nov 2005 23:37:53 - 1.74 +++ ChangeLog 9 Nov 2005 00:16:08 - 1.75 @@ -1,5 +1,7 @@ 2005-11-08 Kevin P. Fleming [EMAIL PROTECTED] + * res/res_features.c (ast_bridge_call_thread_launch): set SCHED_RR separately from thread creation, so it won't fail when running as non-root (issue #5601, different fix) + * pbx.c (pbx_builtin_pushvar_helper): add new API function for setting variables that can exist multiple times (issue #2720) * apps/Makefile (APPS): add app_stack (issue #2720) * apps/app_stack.c: new applications (issue #2720) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/res res_features.c,1.80,1.81
Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv25436/res
Modified Files:
res_features.c
Log Message:
issue #5601
Index: res_features.c
===
RCS file: /usr/cvsroot/asterisk/res/res_features.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- res_features.c 8 Nov 2005 04:02:35 - 1.80
+++ res_features.c 9 Nov 2005 00:16:08 - 1.81
@@ -244,13 +244,14 @@
{
pthread_t thread;
pthread_attr_t attr;
- int result;
+ struct sched_param sched;
- result = pthread_attr_init(attr);
- pthread_attr_setschedpolicy(attr, SCHED_RR);
+ pthread_attr_init(attr);
pthread_attr_setdetachstate(attr, PTHREAD_CREATE_DETACHED);
- result = ast_pthread_create(thread, attr,ast_bridge_call_thread,
data);
- result = pthread_attr_destroy(attr);
+ ast_pthread_create(thread, attr,ast_bridge_call_thread, data);
+ pthread_attr_destroy(attr);
+ memset(sched, 0, sizeof(sched));
+ pthread_setschedparam(thread, SCHED_RR, sched);
}
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels chan_zap.c,1.541,1.542
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv25940/channels
Modified Files:
chan_zap.c
Log Message:
correct logic for group-match CONGESTION checking
Index: chan_zap.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -d -r1.541 -r1.542
--- chan_zap.c 9 Nov 2005 00:48:38 - 1.541
+++ chan_zap.c 9 Nov 2005 01:42:38 - 1.542
@@ -7240,6 +7240,7 @@
{
int res;
ZT_PARAMS par;
+
/* First, check group matching */
if (groupmatch) {
if ((p-group groupmatch) != groupmatch)
@@ -7247,7 +7248,7 @@
*groupmatched = 1;
}
/* Check to see if we have a channel match */
- if (channelmatch) {
+ if (channelmatch != -1) {
if (p-channel != channelmatch)
return 0;
*channelmatched = 1;
@@ -7336,7 +7337,7 @@
}
if ((p-owner-_state != AST_STATE_UP)
- ((p-owner-_state != AST_STATE_RINGING) || p-outgoing)) {
+ ((p-owner-_state != AST_STATE_RINGING) || p-outgoing)) {
/* If the current call is not up, then don't allow the call */
return 0;
}
@@ -7628,11 +7629,15 @@
}
ast_mutex_unlock(lock);
restart_monitor();
- if (channelmatched) {
- if (callwait || (!tmp busy))
- *cause = AST_CAUSE_BUSY;
- } else if (groupmatched) {
- *cause = AST_CAUSE_CONGESTION;
+ if (callwait)
+ *cause = AST_CAUSE_BUSY;
+ else if (!tmp) {
+ if (channelmatched) {
+ if (busy)
+ *cause = AST_CAUSE_BUSY;
+ } else if (groupmatched) {
+ *cause = AST_CAUSE_CONGESTION;
+ }
}
return tmp;
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.78,1.79
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv26129 Modified Files: ChangeLog Log Message: issue #5658, different fix Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- ChangeLog 9 Nov 2005 02:01:11 - 1.78 +++ ChangeLog 9 Nov 2005 02:04:27 - 1.79 @@ -1,5 +1,7 @@ 2005-11-08 Kevin P. Fleming [EMAIL PROTECTED] + * include/asterisk/file.h: add test to ensure that stdio.h is included before this file (issue #5658) + * res/res_odbc.c (odbc_prepare_and_execute): add new API call for use to properly handle prepared statements across server disconnects (issue #5563) * pbx.c (pbx_substitute_variables_helper_full): use already-substituted buffer for parsing variable name (issue #5664) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/include/asterisk file.h,1.29,1.30
Update of /usr/cvsroot/asterisk/include/asterisk In directory mongoose.digium.com:/tmp/cvs-serv26129/include/asterisk Modified Files: file.h Log Message: issue #5658, different fix Index: file.h === RCS file: /usr/cvsroot/asterisk/include/asterisk/file.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- file.h 26 Oct 2005 23:11:36 - 1.29 +++ file.h 9 Nov 2005 02:04:27 - 1.30 @@ -23,6 +23,10 @@ #ifndef _ASTERISK_FILE_H #define _ASTERISK_FILE_H +#ifndef stdin +#error You must include stdio.h before file.h! +#endif /* !stdin */ + #include asterisk/channel.h #include asterisk/frame.h #include fcntl.h ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.79,1.80
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv26280 Modified Files: ChangeLog Log Message: prepare for -rc1 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- ChangeLog 9 Nov 2005 02:04:27 - 1.79 +++ ChangeLog 9 Nov 2005 02:26:42 - 1.80 @@ -1,5 +1,7 @@ 2005-11-08 Kevin P. Fleming [EMAIL PROTECTED] + * Asterisk 1.2.0-rc1 released. + * include/asterisk/file.h: add test to ensure that stdio.h is included before this file (issue #5658) * res/res_odbc.c (odbc_prepare_and_execute): add new API call for use to properly handle prepared statements across server disconnects (issue #5563) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
