[Asterisk-cvs] asterisk .svnbranch,1.1.2.1,1.1.2.2
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv27836 Modified Files: Tag: v1-2 .svnbranch Log Message: correct branch name Index: .svnbranch === RCS file: /usr/cvsroot/asterisk/.svnbranch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- .svnbranch 28 Nov 2005 00:17:23 - 1.1.2.1 +++ .svnbranch 28 Nov 2005 03:03:51 - 1.1.2.2 @@ -1 +1 @@ -branches-1.2 +branch-1.2 ___ --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/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/as
[Asterisk-cvs] asterisk/apps app_adsiprog.c, 1.23, 1.24 app_alarmreceiver.c, 1.21, 1.22 app_authenticate.c, 1.23, 1.24 app_cdr.c, 1.12, 1.13 app_chanisavail.c, 1.32, 1.33 app_chanspy.c, 1.36, 1.37 app
Update of /usr/cvsroot/asterisk/apps In directory mongoose.digium.com:/tmp/cvs-serv26648/apps Modified Files: app_adsiprog.c app_alarmreceiver.c app_authenticate.c app_cdr.c app_chanisavail.c app_chanspy.c app_controlplayback.c app_curl.c app_cut.c app_datetime.c app_db.c app_dial.c app_dictate.c app_directed_pickup.c app_directory.c app_disa.c app_dumpchan.c app_echo.c app_enumlookup.c app_eval.c app_exec.c app_externalivr.c app_festival.c app_flash.c app_forkcdr.c app_getcpeid.c app_groupcount.c app_hasnewvoicemail.c app_ices.c app_image.c app_intercom.c app_ivrdemo.c app_lookupblacklist.c app_lookupcidname.c app_macro.c app_math.c app_md5.c app_meetme.c app_milliwatt.c app_mixmonitor.c app_mp3.c app_nbscat.c app_osplookup.c app_page.c app_parkandannounce.c app_playback.c app_privacy.c app_queue.c app_random.c app_read.c app_readfile.c app_realtime.c app_record.c app_rpt.c app_sayunixtime.c app_senddtmf.c app_sendtext.c app_setcallerid.c app_setcdruserfield.c app_setcidname.c app_setcidnum.c app_setrdnis.c app_settransfercapability.c app_skel.c app_sms.c app_softhangup.c app_sql_postgres.c app_system.c app_talkdetect.c app_test.c app_transfer.c app_txtcidname.c app_url.c app_userevent.c app_verbose.c app_voicemail.c app_waitforring.c app_waitforsilence.c app_while.c app_zapateller.c app_zapbarge.c app_zapras.c app_zapscan.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: app_adsiprog.c === RCS file: /usr/cvsroot/asterisk/apps/app_adsiprog.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- app_adsiprog.c 10 Nov 2005 21:39:01 - 1.23 +++ app_adsiprog.c 28 Nov 2005 02:13:33 - 1.24 @@ -34,7 +34,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.23 ") #include "asterisk/file.h" #include "asterisk/logger.h" Index: app_alarmreceiver.c === RCS file: /usr/cvsroot/asterisk/apps/app_alarmreceiver.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- app_alarmreceiver.c 10 Nov 2005 20:56:45 - 1.21 +++ app_alarmreceiver.c 28 Nov 2005 02:13:33 - 1.22 @@ -39,7 +39,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.21 ") #include "asterisk/lock.h" #include "asterisk/file.h" Index: app_authenticate.c === RCS file: /usr/cvsroot/asterisk/apps/app_authenticate.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- app_authenticate.c 10 Nov 2005 20:56:45 - 1.23 +++ app_authenticate.c 28 Nov 2005 02:13:33 - 1.24 @@ -30,7 +30,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.23 ") #include "asterisk/lock.h" #include "asterisk/file.h" Index: app_cdr.c === RCS file: /usr/cvsroot/asterisk/apps/app_cdr.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- app_cdr.c 10 Nov 2005 20:56:45 - 1.12 +++ app_cdr.c 28 Nov 2005 02:13:33 - 1.13 @@ -27,7 +27,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.12 ") #include "asterisk/channel.h" #include "asterisk/module.h" Index: app_chanisavail.c === RCS file: /usr/cvsroot/asterisk/apps/app_chanisavail.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- app_chanisavail.c 10 Nov 2005 21:39:01 - 1.32 +++ app_chanisavail.c 28 Nov 2005 02:13:33 - 1.33 @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.32 ") #include "asterisk/lock.h" #include "asterisk/file.h" Index: app_chanspy.c === RCS file: /usr/cvsroot/asterisk/apps/app_chanspy.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- app_chanspy.c 11 Nov 2005 03:48:28 - 1.36 +++ app_chanspy.c 28 Nov 2005 02:13:33 - 1.37 @@ -30,7 +30,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.36 ") #include "asterisk/file.h" #include "asterisk/logger.h" Index: app_controlplayback.c ===
[Asterisk-cvs] asterisk/res res_adsi.c, 1.18, 1.19 res_agi.c, 1.55, 1.56 res_config_odbc.c, 1.33, 1.34 res_crypto.c, 1.28, 1.29 res_features.c, 1.82, 1.83 res_indications.c, 1.18, 1.19 res_monitor.c,
Update of /usr/cvsroot/asterisk/res In directory mongoose.digium.com:/tmp/cvs-serv26648/res Modified Files: res_adsi.c res_agi.c res_config_odbc.c res_crypto.c res_features.c res_indications.c res_monitor.c res_musiconhold.c res_odbc.c res_osp.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: res_adsi.c === RCS file: /usr/cvsroot/asterisk/res/res_adsi.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- res_adsi.c 24 Oct 2005 20:12:06 - 1.18 +++ res_adsi.c 28 Nov 2005 02:13:35 - 1.19 @@ -34,7 +34,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.18 ") #include "asterisk/ulaw.h" #include "asterisk/alaw.h" Index: res_agi.c === RCS file: /usr/cvsroot/asterisk/res/res_agi.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- res_agi.c 28 Nov 2005 00:16:37 - 1.55 +++ res_agi.c 28 Nov 2005 02:13:35 - 1.56 @@ -41,7 +41,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.55 ") #include "asterisk/file.h" #include "asterisk/logger.h" Index: res_config_odbc.c === RCS file: /usr/cvsroot/asterisk/res/res_config_odbc.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- res_config_odbc.c 8 Nov 2005 19:47:56 - 1.33 +++ res_config_odbc.c 28 Nov 2005 02:13:35 - 1.34 @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.33 ") #include "asterisk/file.h" #include "asterisk/logger.h" Index: res_crypto.c === RCS file: /usr/cvsroot/asterisk/res/res_crypto.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- res_crypto.c24 Oct 2005 20:12:06 - 1.28 +++ res_crypto.c28 Nov 2005 02:13:35 - 1.29 @@ -34,7 +34,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.28 ") #include "asterisk/file.h" #include "asterisk/channel.h" Index: res_features.c === RCS file: /usr/cvsroot/asterisk/res/res_features.c,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- res_features.c 10 Nov 2005 23:26:40 - 1.82 +++ res_features.c 28 Nov 2005 02:13:35 - 1.83 @@ -35,7 +35,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.82 ") #include "asterisk/lock.h" #include "asterisk/file.h" Index: res_indications.c === RCS file: /usr/cvsroot/asterisk/res/res_indications.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- res_indications.c 23 Nov 2005 05:03:42 - 1.18 +++ res_indications.c 28 Nov 2005 02:13:35 - 1.19 @@ -35,7 +35,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.18 ") #include "asterisk/lock.h" #include "asterisk/file.h" Index: res_monitor.c === RCS file: /usr/cvsroot/asterisk/res/res_monitor.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- res_monitor.c 8 Nov 2005 01:55:31 - 1.40 +++ res_monitor.c 28 Nov 2005 02:13:35 - 1.41 @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.40 ") #include "asterisk/lock.h" #include "asterisk/channel.h" Index: res_musiconhold.c === RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- res_musiconhold.c 20 Nov 2005 05:01:07 - 1.76 +++ res_musiconhold.c 28 Nov 2005 02:13:35 - 1.77 @@ -48,7 +48,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.76 ") #include "asterisk/lock.h" #include "asterisk/file.h" Index: res_odbc.c === RCS file: /usr/cvsroot/asterisk/res/res_odbc.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- res_odbc.c 9 Nov 2005 02:01:12 - 1.25 +++ res_odbc.c 28 Nov 2005 02:13:35 - 1.26 @@ -35,7 +3
[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 -
[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/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 r
[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 +++ cod
[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
[Asterisk-cvs] asterisk/cdr cdr_csv.c, 1.22, 1.23 cdr_custom.c, 1.16, 1.17 cdr_manager.c, 1.11, 1.12 cdr_odbc.c, 1.36, 1.37 cdr_pgsql.c, 1.25, 1.26 cdr_sqlite.c, 1.12, 1.13 cdr_tds.c, 1.17, 1.18
Update of /usr/cvsroot/asterisk/cdr In directory mongoose.digium.com:/tmp/cvs-serv26648/cdr Modified Files: cdr_csv.c cdr_custom.c cdr_manager.c cdr_odbc.c cdr_pgsql.c cdr_sqlite.c cdr_tds.c Log Message: disable CVS keyword expansion so SVN revision numbers will 'stick' Index: cdr_csv.c === RCS file: /usr/cvsroot/asterisk/cdr/cdr_csv.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- cdr_csv.c 10 Nov 2005 23:42:45 - 1.22 +++ cdr_csv.c 28 Nov 2005 02:13:34 - 1.23 @@ -37,7 +37,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.22 ") #include "asterisk/channel.h" #include "asterisk/cdr.h" Index: cdr_custom.c === RCS file: /usr/cvsroot/asterisk/cdr/cdr_custom.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- cdr_custom.c10 Nov 2005 23:42:45 - 1.16 +++ cdr_custom.c28 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/channel.h" #include "asterisk/cdr.h" Index: cdr_manager.c === RCS file: /usr/cvsroot/asterisk/cdr/cdr_manager.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- cdr_manager.c 28 Nov 2005 00:16:36 - 1.11 +++ cdr_manager.c 28 Nov 2005 02:13:34 - 1.12 @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.11 ") #include "asterisk/channel.h" #include "asterisk/cdr.h" Index: cdr_odbc.c === RCS file: /usr/cvsroot/asterisk/cdr/cdr_odbc.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- cdr_odbc.c 28 Nov 2005 00:16:36 - 1.36 +++ cdr_odbc.c 28 Nov 2005 02:13:34 - 1.37 @@ -49,7 +49,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.36 ") #include "asterisk/config.h" #include "asterisk/options.h" Index: cdr_pgsql.c === RCS file: /usr/cvsroot/asterisk/cdr/cdr_pgsql.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- cdr_pgsql.c 28 Nov 2005 00:16:36 - 1.25 +++ cdr_pgsql.c 28 Nov 2005 02:13:34 - 1.26 @@ -44,7 +44,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.25 ") #include "asterisk/config.h" #include "asterisk/options.h" Index: cdr_sqlite.c === RCS file: /usr/cvsroot/asterisk/cdr/cdr_sqlite.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- cdr_sqlite.c28 Nov 2005 00:16:36 - 1.12 +++ cdr_sqlite.c28 Nov 2005 02:13:34 - 1.13 @@ -40,7 +40,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.12 ") #include "asterisk/channel.h" #include "asterisk/module.h" Index: cdr_tds.c === RCS file: /usr/cvsroot/asterisk/cdr/cdr_tds.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- cdr_tds.c 28 Nov 2005 00:16:36 - 1.17 +++ cdr_tds.c 28 Nov 2005 02:13:34 - 1.18 @@ -69,7 +69,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_FILE_VERSION(__FILE__, "Revision: 1.17 ") #include "asterisk/config.h" #include "asterisk/options.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] 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;xwriten[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;xwriten[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;xsig) {
-#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;xspan->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] 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;xwriten[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;xwriten[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;xsig) {
-#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;xspan->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) { /
[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 ChangeLog,1.146.2.22,1.146.2.23
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25767 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.22 retrieving revision 1.146.2.23 diff -u -d -r1.146.2.22 -r1.146.2.23 --- ChangeLog 21 Nov 2005 19:31:26 - 1.146.2.22 +++ ChangeLog 21 Nov 2005 19:34:09 - 1.146.2.23 @@ -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 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/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.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.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.20,1.146.2.21
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv25630 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.20 retrieving revision 1.146.2.21 diff -u -d -r1.146.2.20 -r1.146.2.21 --- ChangeLog 21 Nov 2005 15:57:51 - 1.146.2.20 +++ ChangeLog 21 Nov 2005 19:29:51 - 1.146.2.21 @@ -1,3 +1,9 @@ +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 + + * channels/chan_iax2.c (build_peer and build_user): ensure that case changes made to peer/user names are not ignored during reload operations + 2005-11-21 Russell Bryant <[EMAIL PROTECTED]> * Makefile: Revert previous change for Darwin. ___ 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 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 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/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.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 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/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/configs modules.conf.sample,1.8,1.9
Update of /usr/cvsroot/asterisk/configs In directory mongoose.digium.com:/tmp/cvs-serv14613/configs Modified Files: modules.conf.sample Log Message: backport chan_modem fixes from v1-2 Index: modules.conf.sample === RCS file: /usr/cvsroot/asterisk/configs/modules.conf.sample,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- modules.conf.sample 16 Nov 2005 22:40:43 - 1.8 +++ modules.conf.sample 17 Nov 2005 16:57:25 - 1.9 @@ -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] 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] 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 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.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.143,1.144
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv7923 Modified Files: ChangeLog Log Message: don't build chan_modem by default Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.143 retrieving revision 1.144 diff -u -d -r1.143 -r1.144 --- ChangeLog 16 Nov 2005 20:49:44 - 1.143 +++ ChangeLog 16 Nov 2005 20:54:15 - 1.144 @@ -4,6 +4,8 @@ 2005-11-16 Kevin P. Fleming <[EMAIL PROTECTED]> + * channels/Makefile: don't build chan_modem and sub-modules by default + * 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 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/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 2>&1 | grep -q .59r 2>&1 >/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 2>&1 | grep -q .59r 2>&1 >/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.140,1.141
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv7098 Modified Files: ChangeLog Log Message: correct ChangeLog details Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.140 retrieving revision 1.141 diff -u -d -r1.140 -r1.141 --- ChangeLog 16 Nov 2005 18:21:10 - 1.140 +++ ChangeLog 16 Nov 2005 18:59:51 - 1.141 @@ -1,4 +1,4 @@ -2005-11-16 Kevin P. Fleming <[EMAIL PROTECTED]> +2005-11-16 Kevin P. Fleming <[EMAIL PROTECTED]> * 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) @@ -10,8 +10,6 @@ * pbx/pbx_ael.c (match_assignment): properly parse equal signs surrounded by whitespace (issue #5761) -2005-11-16 Kevin P. Fleming <[EMAIL PROTECTED]> - * doc/README.realtime: document the limitations of using FreeTDS with Realtime (issue #5767) 2005-11-15 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/apps app_forkcdr.c,1.18,1.19
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv6860/apps
Modified Files:
app_forkcdr.c
Log Message:
issue #5763
Index: app_forkcdr.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_forkcdr.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- app_forkcdr.c 8 Nov 2005 04:48:00 - 1.18
+++ app_forkcdr.c 16 Nov 2005 18:21:10 - 1.19
@@ -59,8 +59,7 @@
struct ast_cdr *newcdr;
struct ast_flags flags = { AST_CDR_FLAG_KEEP_VARS };
- if (!chan || !(cdr = chan->cdr))
- return;
+ cdr = chan->cdr;
while (cdr->next)
cdr = cdr->next;
@@ -79,11 +78,18 @@
static int forkcdr_exec(struct ast_channel *chan, void *data)
{
- int res=0;
+ int res = 0;
struct localuser *u;
+
+ if (!chan->cdr) {
+ ast_log(LOG_WARNING, "Channel does not have a CDR\n");
+ return 0;
+ }
+
LOCAL_USER_ADD(u);
+
if (!ast_strlen_zero(data))
- ast_set2_flag(chan->cdr, strchr((char *)data, 'v'),
AST_CDR_FLAG_KEEP_VARS);
+ ast_set2_flag(chan->cdr, strchr(data, 'v'),
AST_CDR_FLAG_KEEP_VARS);
ast_cdr_fork(chan);
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.139,1.140
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv6860 Modified Files: ChangeLog Log Message: issue #5763 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- ChangeLog 16 Nov 2005 18:11:28 - 1.139 +++ ChangeLog 16 Nov 2005 18:21:10 - 1.140 @@ -1,5 +1,7 @@ 2005-11-16 Kevin P. Fleming <[EMAIL PROTECTED]> + * 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) * res/res_musiconhold.c: don't spit out incorrect log messages (and leak memory) during reload (issue #5766) ___ 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 res_musiconhold.c,1.74,1.75
Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv6525/res
Modified Files:
res_musiconhold.c
Log Message:
issue #5766
Index: res_musiconhold.c
===
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- res_musiconhold.c 8 Nov 2005 01:55:31 - 1.74
+++ res_musiconhold.c 16 Nov 2005 17:48:18 - 1.75
@@ -785,14 +785,18 @@
return class->total_files;
}
-static int moh_register(struct mohclass *moh)
+static int moh_register(struct mohclass *moh, int reload)
{
#ifdef ZAPATA_MOH
int x;
#endif
ast_mutex_lock(&moh_lock);
if (get_mohbyname(moh->name)) {
- ast_log(LOG_WARNING, "Music on Hold class '%s' already
exists\n", moh->name);
+ if (reload) {
+ ast_log(LOG_DEBUG, "Music on Hold class '%s' left alone
from initial load.\n", moh->name);
+ } else {
+ ast_log(LOG_WARNING, "Music on Hold class '%s' already
exists\n", moh->name);
+ }
free(moh);
ast_mutex_unlock(&moh_lock);
return -1;
@@ -914,7 +918,7 @@
return class;
}
-static int load_moh_classes(void)
+static int load_moh_classes(int reload)
{
struct ast_config *cfg;
struct ast_variable *var;
@@ -979,7 +983,9 @@
continue;
}
- moh_register(class);
+ /* Don't leak a class when it's already registered */
+ moh_register(class, reload);
+
numclasses++;
}
}
@@ -1011,7 +1017,7 @@
if (args)
ast_copy_string(class->args, args,
sizeof(class->args));
- moh_register(class);
+ moh_register(class, reload);
numclasses++;
}
}
@@ -1039,7 +1045,7 @@
if (args)
ast_copy_string(class->args, args,
sizeof(class->args));
- moh_register(class);
+ moh_register(class, reload);
numclasses++;
}
var = var->next;
@@ -1103,7 +1109,7 @@
moh_on_off(0);
ast_moh_destroy();
- x = load_moh_classes();
+ x = load_moh_classes(1);
moh_on_off(1);
ast_cli(fd, "\n%d class%s reloaded.\n", x, x == 1 ? "" : "es");
return 0;
@@ -1152,11 +1158,11 @@
static struct ast_cli_entry cli_moh_files_show = { { "moh", "files", "show"},
cli_files_show, "List MOH file-based classes", "Lists all loaded file-based MOH
classes and their files", NULL};
-static int init_classes(void)
+static int init_classes(int reload)
{
struct mohclass *moh;
- if (!load_moh_classes())/* Load classes from config */
+ if (!load_moh_classes(reload)) /* Load classes from config */
return 0; /* Return if nothing is found */
moh = mohclasses;
while (moh) {
@@ -1185,7 +1191,7 @@
if (!res)
res = ast_register_application(app4, moh4_exec, synopsis4,
descrip4);
- if (!init_classes()) { /* No music classes configured, so skip it */
+ if (!init_classes(0)) { /* No music classes configured, so skip
it */
ast_log(LOG_WARNING, "No music on hold classes configured,
disabling music on hold.");
} else {
ast_install_music_functions(local_ast_moh_start,
local_ast_moh_stop, local_ast_moh_cleanup);
@@ -1196,7 +1202,7 @@
int reload(void)
{
- if (init_classes())
+ if (init_classes(1))
ast_install_music_functions(local_ast_moh_start,
local_ast_moh_stop, local_ast_moh_cleanup);
return 0;
___
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/channels chan_sip.c,1.912,1.913
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv6496/channels
Modified Files:
chan_sip.c
Log Message:
fix previous commit to actually do it properly...
Index: chan_sip.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.912
retrieving revision 1.913
diff -u -d -r1.912 -r1.913
--- chan_sip.c 16 Nov 2005 17:26:11 - 1.912
+++ chan_sip.c 16 Nov 2005 17:46:59 - 1.913
@@ -3461,7 +3461,7 @@
return -1;
}
if (debug)
- ast_verbose("Found video format %s\n",
codec);
+ ast_verbose("Found RTP video format
%d\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/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.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/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.135,1.136
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv6326 Modified Files: ChangeLog Log Message: issue #5761 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.135 retrieving revision 1.136 diff -u -d -r1.135 -r1.136 --- ChangeLog 16 Nov 2005 17:12:35 - 1.135 +++ ChangeLog 16 Nov 2005 17:16:23 - 1.136 @@ -1,3 +1,7 @@ +2005-11-16 Kevin P. Fleming <[EMAIL PROTECTED]> + + * pbx/pbx_ael.c (match_assignment): properly parse equal signs surrounded by whitespace (issue #5761) + 2005-11-16 Kevin P. Fleming <[EMAIL PROTECTED]> * doc/README.realtime: document the limitations of using FreeTDS with Realtime (issue #5767) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/doc README.realtime,1.3,1.4
Update of /usr/cvsroot/asterisk/doc In directory mongoose.digium.com:/tmp/cvs-serv6284/doc Modified Files: README.realtime Log Message: issue #5767 Index: README.realtime === RCS file: /usr/cvsroot/asterisk/doc/README.realtime,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README.realtime 13 Oct 2005 23:19:37 - 1.3 +++ README.realtime 16 Nov 2005 17:12:36 - 1.4 @@ -105,3 +105,7 @@ README.odbcstorage documentation file. +* FreeTDS not supported +--- +Due to architectural constraints in the FreeTDS libraries, FreeTDS is not +supported for use with realtime at this time. ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.134,1.135
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv6284 Modified Files: ChangeLog Log Message: issue #5767 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- ChangeLog 16 Nov 2005 04:11:48 - 1.134 +++ ChangeLog 16 Nov 2005 17:12:35 - 1.135 @@ -1,4 +1,8 @@ -2005-11-15 Kevin P. Fleming <[EMAIL PROTECTED]> +2005-11-16 Kevin P. Fleming <[EMAIL PROTECTED]> + + * doc/README.realtime: document the limitations of using FreeTDS with Realtime (issue #5767) + +2005-11-15 Kevin P. Fleming <[EMAIL PROTECTED]> * Makefile: use -g3 for compiler to include macro information for debugger ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.133,1.134 Makefile,1.224,1.225
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv31302 Modified Files: ChangeLog Makefile Log Message: small debugging information change Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.133 retrieving revision 1.134 diff -u -d -r1.133 -r1.134 --- ChangeLog 16 Nov 2005 02:20:16 - 1.133 +++ ChangeLog 16 Nov 2005 04:11:48 - 1.134 @@ -1,5 +1,7 @@ 2005-11-15 Kevin P. Fleming <[EMAIL PROTECTED]> + * Makefile: use -g3 for compiler to include macro information for debugger + * astmm.c (__ast_vasprintf): don't re-use the ap list without copying it; that's not safe on some platforms (issue #5035) * doc/README.backtrace: add note about properly building Asterisk to be able to produce backtraces; wrap text and remove DOS line endings Index: Makefile === RCS file: /usr/cvsroot/asterisk/Makefile,v retrieving revision 1.224 retrieving revision 1.225 diff -u -d -r1.224 -r1.225 --- Makefile14 Nov 2005 19:00:37 - 1.224 +++ Makefile16 Nov 2005 04:11:48 - 1.225 @@ -50,8 +50,8 @@ #Overwite config files on "make samples" OVERWRITE=y -#Include debug symbols in the executables (-g) and profiling info (-pg) -DEBUG=-g #-pg +#Include debug and macro symbols in the executables (-g) and profiling info (-pg) +DEBUG=-g3 #-pg #Set NOCRYPTO to yes if you do not want to have crypto support or #dependencies ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.132,1.133 astmm.c,1.23,1.24
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv30684
Modified Files:
ChangeLog astmm.c
Log Message:
issue #5035
Index: ChangeLog
===
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- ChangeLog 16 Nov 2005 00:56:10 - 1.132
+++ ChangeLog 16 Nov 2005 02:20:16 - 1.133
@@ -1,5 +1,7 @@
2005-11-15 Kevin P. Fleming <[EMAIL PROTECTED]>
+ * astmm.c (__ast_vasprintf): don't re-use the ap list without copying
it; that's not safe on some platforms (issue #5035)
+
* doc/README.backtrace: add note about properly building Asterisk to be
able to produce backtraces; wrap text and remove DOS line endings
* channels/chan_sip.c (add_codec_to_sdp): add 'annexb=no' to G.729A SDP
(issue #5539)
Index: astmm.c
===
RCS file: /usr/cvsroot/asterisk/astmm.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- astmm.c 24 Oct 2005 20:12:04 - 1.23
+++ astmm.c 16 Nov 2005 02:20:16 - 1.24
@@ -254,21 +254,20 @@
int __ast_vasprintf(char **strp, const char *fmt, va_list ap, const char
*file, int lineno, const char *func)
{
- int n, size = strlen(fmt) + 1;
- if ((*strp = __ast_alloc_region(size, FUNC_VASPRINTF, file, lineno,
func)) == NULL)
- return -1;
- for (;;) {
- n = vsnprintf(*strp, size, fmt, ap);
- if (n > -1 && n < size)
- return n;
- if (n > -1) { /* glibc 2.1 */
- size = n+1;
- } else {/* glibc 2.0 */
- size *= 2;
- }
- if ((*strp = __ast_realloc(*strp, size, file, lineno, func)) ==
NULL)
- return -1;
- }
+ int size;
+ va_list ap2;
+ char s;
+
+ *strp = NULL;
+ va_copy(ap2, ap);
+ size = vsnprintf(&s, 1, fmt, ap2);
+ va_end(ap2);
+ *strp = __ast_alloc_region(size + 1, FUNC_VASPRINTF, file, lineno,
func);
+ if (!*strp)
+ return -1;
+ vsnprintf(*strp, size + 1, fmt, ap);
+
+ return size;
}
static int handle_show_memory(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/doc README.backtrace,1.1,1.2
Update of /usr/cvsroot/asterisk/doc In directory mongoose.digium.com:/tmp/cvs-serv30156/doc Modified Files: README.backtrace Log Message: minor improvements to backtrace generation notes Index: README.backtrace === RCS file: /usr/cvsroot/asterisk/doc/README.backtrace,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README.backtrace31 Aug 2005 03:28:40 - 1.1 +++ README.backtrace16 Nov 2005 00:56:10 - 1.2 @@ -1,170 +1,187 @@ - - -This document is to provide information on how to obtain the backtraces required on the asterisk bug tracker, available at http://bugs.digium.com. -The information is required by developers to help fix problem with bugs of any kind. -Backtraces provide information about what was wrong when a program crashed; in our case, Asterisk. -There are two kind of backtraces (aka 'bt'), which are useful: bt and bt full. - -First of all, when you start Asterisk, you MUST start it with option -g (this tells Asterisk to produce a core file if it crashes). -If you start Asterisk with the safe_asterisk script, it automatically starts using the option -g. - -If you're not sure if Asterisk is running with the -g option, type the following command in your shell: - -debian:/tmp# ps aux | grep asterisk -root 17832 0.0 1.2 2348 788 pts/1SAug12 0:00 /bin/sh /usr/sbin/safe_asterisk -root 26686 0.0 2.8 15544 1744 pts/1SAug13 0:02 asterisk -vvvg -c -[...] - -The interesting information is located in the last column. - - -After Asterisk crashes, a core file will be "dumped" in your /tmp/ directory -To make sure it's really there, you can just type the following command in your shell: - -debian:/tmp# ls -l /tmp/core.* --rw--- 1 root root 10592256 Aug 12 19:40 /tmp/core.26252 --rw--- 1 root root 9924608 Aug 12 20:12 /tmp/core.26340 --rw--- 1 root root 10862592 Aug 12 20:14 /tmp/core.26374 --rw--- 1 root root 9105408 Aug 12 20:19 /tmp/core.26426 --rw--- 1 root root 9441280 Aug 12 20:20 /tmp/core.26462 --rw--- 1 root root 8331264 Aug 13 00:32 /tmp/core.26647 -debian:/tmp# - -Now that we've verified the core file has been written to disk, the final part is to extract 'bt' from the core file. -Core files are pretty big, don't be scared, it's normal. - -*** NOTE: Don't attach core files on the bug tracker, we only need the bt and bt full. *** - -For extraction, we use a really nice tool, called gdb. To verify that you have gdb installed on your system: - -debian:/tmp# gdb -v -GNU gdb 6.3-debian -Copyright 2004 Free Software Foundation, Inc. -GDB is free software, covered by the GNU General Public License, and you are -welcome to change it and/or distribute copies of it under certain conditions. -Type "show copying" to see the conditions. -There is absolutely no warranty for GDB. Type "show warranty" for details. -This GDB was configured as "i386-linux". -debian:/tmp# - -Which is great, we can continue. If you don't have gdb installed, go install gdb. - -Now load the core file in gdb, as follows: - -debian:/tmp# gdb -se "asterisk" -c /tmp/core.26252 -[...] -(You would see a lot of output here.) -[...] -Reading symbols from /usr/lib/asterisk/modules/app_externalivr.so...done. -Loaded symbols for /usr/lib/asterisk/modules/app_externalivr.so -#0 0x29b45d7e in ?? () -(gdb) - -Now at the gdb prompt, type: bt -You would see output similar to: -(gdb) bt -#0 0x29b45d7e in ?? () -#1 0x08180bf8 in ?? () -#2 0xbcdffa58 in ?? () -#3 0x08180bf8 in ?? () -#4 0xbcdffa60 in ?? () -#5 0x08180bf8 in ?? () -#6 0x180bf894 in ?? () -#7 0x0bf80008 in ?? () -#8 0x180b0818 in ?? () -#9 0x08068008 in ast_stopstream (tmp=0x40758d38) at file.c:180 -#10 0x00a0 in ?? () -#11 0x00a0 in ?? () -#12 0x in ?? () -#13 0x407513c3 in confcall_careful_stream (conf=0x8180bf8, filename=0x8181de8 "Zap/pseudo-1324221520") at app_meetme.c:262 -#14 0x40751332 in streamconfthread (args=0x8180bf8) at app_meetme.c:1965 -#15 0xbcdffbe0 in ?? () -#16 0x40028e51 in pthread_start_thread () from /lib/libpthread.so.0 -#17 0x401ec92a in clone () from /lib/libc.so.6 -(gdb) - - -The bt's output is the informations that we need on the bug tracker. - -Now do a bt full as follows: -(gdb) bt full -#0 0x29b45d7e in ?? () -No symbol table info available. -#1 0x08180bf8 in ?? () -No symbol table info available. -#2 0xbcdffa58 in ?? () -No symbol table info available. -#3 0x08180bf8 in ?? () -No symbol table info available. -#4 0xbcdffa60 in ?? () -No symbol table info available. -#5 0x08180bf8 in ?? () -No symbol table info available. -#6 0x180bf894 in ?? () -No symbol table info available. -#7 0x0bf80008 in ?? () -No symbol table info available. -#8 0x180b0818 in ?? () -No symbol table info available. -#9 0x08068008 in ast_stopstream (tmp=0x40758d38) at file.c:180 -No locals. -#10 0x00a0 in ?? () -No symbol table info availa
[Asterisk-cvs] asterisk ChangeLog,1.131,1.132
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv30156 Modified Files: ChangeLog Log Message: minor improvements to backtrace generation notes Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- ChangeLog 15 Nov 2005 22:50:42 - 1.131 +++ ChangeLog 16 Nov 2005 00:56:10 - 1.132 @@ -1,5 +1,7 @@ 2005-11-15 Kevin P. Fleming <[EMAIL PROTECTED]> + * doc/README.backtrace: add note about properly building Asterisk to be able to produce backtraces; wrap text and remove DOS line endings + * 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) ___ 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.910,1.911
Update of /usr/cvsroot/asterisk/channels In directory mongoose.digium.com:/tmp/cvs-serv29501/channels Modified Files: chan_sip.c Log Message: issue #5539 Index: chan_sip.c === RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v retrieving revision 1.910 retrieving revision 1.911 diff -u -d -r1.910 -r1.911 --- chan_sip.c 15 Nov 2005 19:52:25 - 1.910 +++ chan_sip.c 15 Nov 2005 22:50:43 - 1.911 @@ -4265,6 +4265,9 @@ ast_build_string(a_buf, a_size, "a=rtpmap:%d %s/%d\r\n", rtp_code, ast_rtp_lookup_mime_subtype(1, codec), sample_rate); + if (codec == AST_FORMAT_G729A) + /* Indicate that we don't support VAD (G.729 annex B) */ + ast_build_string(a_buf, a_size, "a=fmtp:%d annexb=no", rtp_code); } static void add_noncodec_to_sdp(const struct sip_pvt *p, int format, int sample_rate, ___ 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/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.129,1.130
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv28606 Modified Files: ChangeLog Log Message: issue #5672 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- ChangeLog 15 Nov 2005 20:20:45 - 1.129 +++ ChangeLog 15 Nov 2005 20:56:19 - 1.130 @@ -1,5 +1,7 @@ 2005-11-15 Kevin P. Fleming <[EMAIL PROTECTED]> + * channels/chan_alsa.c (alsa_hangup): handle autohangup properly (issue #5672) + * 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) ___ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk/channels/misdn isdn_lib.c, 1.4, 1.5 isdn_lib.h, 1.2, 1.3 isdn_msg_parser.c, 1.2, 1.3
Update of /usr/cvsroot/asterisk/channels/misdn
In directory mongoose.digium.com:/tmp/cvs-serv28401/channels/misdn
Modified Files:
isdn_lib.c isdn_lib.h isdn_msg_parser.c
Log Message:
issue #5739 (plus ast_copy_string() usage conversion)
Index: isdn_lib.c
===
RCS file: /usr/cvsroot/asterisk/channels/misdn/isdn_lib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- isdn_lib.c 8 Nov 2005 00:02:53 - 1.4
+++ isdn_lib.c 15 Nov 2005 20:20:45 - 1.5
@@ -50,7 +50,8 @@
struct misdn_stack* get_stack_by_bc(struct misdn_bchannel *bc)
{
struct misdn_stack *stack=get_misdn_stack();
-
+
+ if (!bc) return NULL;
for ( ; stack; stack=stack->next) {
int i;
@@ -333,7 +334,8 @@
int misdn_cap_is_speech(int cap)
/** Poor mans version **/
{
- if (cap != INFO_CAPABILITY_DIGITAL_UNRESTRICTED) return 1;
+ if ( (cap != INFO_CAPABILITY_DIGITAL_UNRESTRICTED) &&
+(cap != INFO_CAPABILITY_DIGITAL_RESTRICTED) ) return 1;
return 0;
}
@@ -342,6 +344,7 @@
switch (bc->progress_indicator) {
case INFO_PI_INBAND_AVAILABLE:
case INFO_PI_CALL_NOT_E2E_ISDN:
+ case INFO_PI_CALLED_NOT_ISDN:
return 1;
default:
return 0;
@@ -400,6 +403,8 @@
void empty_bc(struct misdn_bchannel *bc)
{
+ bc->state=STATE_NOTHING;
+
bc->channel = 0;
bc->in_use = 0;
@@ -674,6 +679,11 @@
}
+void misdn_lib_setup_bc(struct misdn_bchannel *bc)
+{
+ setup_bc(bc);
+}
+
int setup_bc(struct misdn_bchannel *bc)
{
@@ -687,15 +697,18 @@
int midev=stack->midev;
int channel=bc->channel-1-(bc->channel>16);
int b_stid=stack->b_stids[channel>=0?channel:0];
+
- if (bc->upset) {
- cb_log(5, stack->port, "$$$ bc already upsetted stid :%x\n",
b_stid);
- return -1;
- }
-
+ if (bc->nodsp )
+ clean_up_bc(bc);
- if (bc->nodsp) {
+ if ( !misdn_cap_is_speech(bc->capability))
clean_up_bc(bc);
+
+
+ if (bc->upset) {
+ cb_log(4, stack->port, "$$$ bc already upsetted stid :%x\n",
b_stid);
+ return -1;
}
cb_log(5, stack->port, "$$$ Setting up bc with stid :%x\n", b_stid);
@@ -704,7 +717,7 @@
cb_log(0, stack->port," -- Stid <=0 at the moment on port:%d
channel:%d\n",stack->port,channel);
return 1;
}
-
+
bc->b_stid = b_stid;
@@ -756,11 +769,12 @@
if (bc->async == 1 || bc->nodsp) {
- cb_log(4, stack->port," --> TRANSPARENT Mode (no DSP)\n");
+ cb_log(4, stack->port," --> TRANSPARENT Mode (no DSP, no
HDLC)\n");
pid.protocol[1] = ISDN_PID_L1_B_64TRANS;
pid.protocol[2] = ISDN_PID_L2_B_TRANS;
pid.protocol[3] = ISDN_PID_L3_B_USER;
pid.layermask = ISDN_LAYER((1)) | ISDN_LAYER((2)) |
ISDN_LAYER((3));
+
} else if ( misdn_cap_is_speech(bc->capability)) {
cb_log(4, stack->port," --> TRANSPARENT Mode\n");
pid.protocol[1] = ISDN_PID_L1_B_64TRANS;
@@ -1201,7 +1215,12 @@
struct misdn_stack *stack=get_stack_by_bc(bc);
if (stack->mode == TE_MODE) {
switch (event) {
+
+ case EVENT_CONNECT_ACKNOWLEDGE:
+ manager_bchannel_activate(bc);
+ break;
case EVENT_CONNECT:
+
if ( *bc->crypt_key ) {
cb_log(4, stack->port, "ENABLING BLOWFISH
port:%d channel:%d oad%d:%s dad%d:%s\n", stack->port, bc->channel,
bc->onumplan,bc->oad, bc->dnumplan,bc->dad);
@@ -1326,6 +1345,11 @@
void misdn_lib_release(struct misdn_bchannel *bc)
{
struct misdn_stack *stack=get_stack_by_bc(bc);
+
+ if (!stack) {
+ cb_log(1,0,"misdn_release: No Stack found\n");
+ return;
+ }
if (bc->channel>=0) {
empty_chan_in_stack(stack,bc->channel);
@@ -1489,13 +1513,14 @@
}
break;
-
+
+ case CC_CONNECT|INDICATION:
case CC_ALERTING|INDICATION:
case CC_PROCEEDING|INDICATION:
- case CC_CONNECT|INDICATION:
+
{
struct misdn_bchannel *bc=find_bc_by_l3id(stack,
hh->dinfo);
-
+
if (!bc) {
msg_t *dmsg;
cb_log(0, stack->port," We didn't found our
bc, dinfo:%x port:%d\n",hh->dinfo, stack->port);
@@ -1507,6 +1532,7 @@
return 0;
[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
[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_sip.c,1.909,1.910
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv28151/channels
Modified Files:
chan_sip.c
Log Message:
issue #5751
Index: chan_sip.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -d -r1.909 -r1.910
--- chan_sip.c 12 Nov 2005 02:57:43 - 1.909
+++ chan_sip.c 15 Nov 2005 19:52:25 - 1.910
@@ -8575,8 +8575,6 @@
{
char buf[1024];
unsigned int event;
- char resp = 0;
- struct ast_frame f;
char *c;
/* Need to check the media/type */
@@ -8592,42 +8590,46 @@
ast_copy_string(buf, c, sizeof(buf));
}
- if (p->owner) { /* PBX call */
- if (!ast_strlen_zero(buf)) {
- if (sipdebug)
- ast_verbose("* DTMF received: '%c'\n",
buf[0]);
- if (buf[0] == '*')
- event = 10;
- else if (buf[0] == '#')
- event = 11;
- else if ((buf[0] >= 'A') && (buf[0] <= 'D'))
- event = 12 + buf[0] - 'A';
- else
- event = atoi(buf);
- if (event < 10) {
- resp = '0' + event;
- } else if (event < 11) {
- resp = '*';
- } else if (event < 12) {
- resp = '#';
- } else if (event < 16) {
- resp = 'A' + (event - 12);
- }
- /* Build DTMF frame and deliver to PBX for
transmission to other call leg*/
- memset(&f, 0, sizeof(f));
- f.frametype = AST_FRAME_DTMF;
- f.subclass = resp;
- f.offset = 0;
- f.data = NULL;
- f.datalen = 0;
- ast_queue_frame(p->owner, &f);
- }
+ if (!p->owner) {/* not a PBX call */
+ transmit_response(p, "481 Call leg/transaction does not
exist", req);
+ ast_set_flag(p, SIP_NEEDDESTROY);
+ return;
+ }
+
+ if (ast_strlen_zero(buf)) {
transmit_response(p, "200 OK", req);
return;
+ }
+
+ if (sipdebug)
+ ast_verbose("* DTMF-relay event received: '%c'\n",
buf[0]);
+ if (buf[0] == '*')
+ event = 10;
+ else if (buf[0] == '#')
+ event = 11;
+ else if ((buf[0] >= 'A') && (buf[0] <= 'D'))
+ event = 12 + buf[0] - 'A';
+ else
+ event = atoi(buf);
+ if (event == 16) {
+ /* send a FLASH event */
+ struct ast_frame f = { AST_FRAME_CONTROL,
AST_CONTROL_FLASH, };
+ ast_queue_frame(p->owner, &f);
} else {
- transmit_response(p, "481 Call leg/transaction does not
exist", req);
- ast_set_flag(p, SIP_NEEDDESTROY);
+ /* send a DTMF event */
+ struct ast_frame f = { AST_FRAME_DTMF, };
+ if (event < 10) {
+ f.subclass = '0' + event;
+ } else if (event < 11) {
+ f.subclass = '*';
+ } else if (event < 12) {
+ f.subclass = '#';
+ } else if (event < 16) {
+ f.subclass = 'A' + (event - 12);
+ }
+ ast_queue_frame(p->owner, &f);
}
+ transmit_response(p, "200 OK", req);
return;
} else if (!strcasecmp(get_header(req, "Content-Type"),
"application/media_control+xml")) {
/* Eh, we'll just assume it's a fast picture update for now */
___
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/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.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_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.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_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 */
[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/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] 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 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/channels chan_sip.c,1.908,1.909
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv19977/channels
Modified Files:
chan_sip.c
Log Message:
issue #5712
Index: chan_sip.c
===
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -d -r1.908 -r1.909
--- chan_sip.c 11 Nov 2005 21:41:54 - 1.908
+++ chan_sip.c 12 Nov 2005 02:57:43 - 1.909
@@ -384,6 +384,7 @@
static int usecnt =0;
AST_MUTEX_DEFINE_STATIC(usecnt_lock);
+AST_MUTEX_DEFINE_STATIC(rand_lock);
/*! \brief Protect the interface list (of sip_pvt's) */
AST_MUTEX_DEFINE_STATIC(iflock);
@@ -943,6 +944,24 @@
.send_text = sip_sendtext,
};
+/*!
+ \brief Thread-safe random number generator
+ \return a random number
+
+ This function uses a mutex lock to guarantee that no
+ two threads will receive the same random number.
+ */
+static force_inline int thread_safe_rand(void)
+{
+ int val;
+
+ ast_mutex_lock(&rand_lock);
+ val = rand();
+ ast_mutex_unlock(&rand_lock);
+
+ return val;
+}
+
/*! \brief find_sip_method: Find SIP method from header
* Strictly speaking, SIP methods are case SENSITIVE, but we don't check
* following Jon Postel's rule: Be gentle in what you accept, strict with what
you send */
@@ -2721,7 +2740,7 @@
fmt = ast_best_codec(tmp->nativeformats);
if (title)
- snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%04x", title,
rand() & 0x);
+ snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%04x", title,
thread_safe_rand() & 0x);
else if (strchr(i->fromdomain,':'))
snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x",
strchr(i->fromdomain,':')+1, (int)(long)(i));
else
@@ -2974,7 +2993,7 @@
int x;
char iabuf[INET_ADDRSTRLEN];
for (x=0; x<4; x++) {
- val = rand();
+ val = thread_safe_rand();
res = snprintf(callid, len, "%08x", val);
len -= res;
callid += res;
@@ -2988,7 +3007,7 @@
static void make_our_tag(char *tagbuf, size_t len)
{
- snprintf(tagbuf, len, "as%08x", rand());
+ snprintf(tagbuf, len, "as%08x", thread_safe_rand());
}
/*! \brief sip_alloc: Allocate SIP_PVT structure and set defaults ---*/
@@ -3021,7 +3040,7 @@
memcpy(&p->ourip, &__ourip, sizeof(p->ourip));
}
- p->branch = rand();
+ p->branch = thread_safe_rand();
make_our_tag(p->tag, sizeof(p->tag));
/* Start with 101 instead of 1 */
p->ocseq = 101;
@@ -4009,7 +4028,7 @@
}
if (newbranch) {
- p->branch ^= rand();
+ p->branch ^= thread_safe_rand();
build_via(p, p->via, sizeof(p->via));
}
@@ -4826,7 +4845,7 @@
req.method = sipmethod;
if (init) {
/* Bump branch even on initial requests */
- p->branch ^= rand();
+ p->branch ^= thread_safe_rand();
build_via(p, p->via, sizeof(p->via));
if (init > 1)
initreqprep(&req, p, sipmethod);
@@ -5400,7 +5419,7 @@
snprintf(addr, sizeof(addr), "sip:%s", r->hostname);
ast_copy_string(p->uri, addr, sizeof(p->uri));
- p->branch ^= rand();
+ p->branch ^= thread_safe_rand();
memset(&req, 0, sizeof(req));
init_req(&req, sipmethod, addr);
@@ -5670,7 +5689,7 @@
/* SIP isn't up yet, so schedule a poke only, pretty soon */
if (peer->pokeexpire > -1)
ast_sched_del(sched, peer->pokeexpire);
- peer->pokeexpire = ast_sched_add(sched, rand() % 5000 + 1,
sip_poke_peer_s, peer);
+ peer->pokeexpire = ast_sched_add(sched, thread_safe_rand() %
5000 + 1, sip_poke_peer_s, peer);
} else
sip_poke_peer(peer);
if (peer->expire > -1)
@@ -6131,7 +6150,7 @@
res = 1;
}
} else if (ast_strlen_zero(randdata) || ast_strlen_zero(authtoken)) {
- snprintf(randdata, randlen, "%08x", rand());
+ snprintf(randdata, randlen, "%08x", thread_safe_rand());
transmit_response_with_auth(p, response, req, randdata,
reliable, respheader, 0);
/* Schedule auto destroy in 15 seconds */
sip_scheddestroy(p, 15000);
@@ -6247,7 +6266,7 @@
if (wrongnonce) {
- snprintf(randdata, randlen, "%08x", rand());
+ snprintf(randdata, randlen, "%08x", thread_safe_rand());
if (ua_hash && !strncasecmp(ua_hash, resp_hash,
strlen(resp_hash))) {
if (sipdebug)
ast_log(LOG_NOTICE, "stale nonce
receive
[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/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.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.269,1.270
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv19780/apps
Modified Files:
app_voicemail.c
Log Message:
issue #5718
Index: app_voicemail.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- app_voicemail.c 12 Nov 2005 00:52:08 - 1.269
+++ app_voicemail.c 12 Nov 2005 02:34:01 - 1.270
@@ -3479,10 +3479,16 @@
ast_log(LOG_DEBUG, "%s", sys);
ast_safe_system(sys);
- if ( (res = count_messages(receiver, todir)) )
+ res = count_messages(receiver, todir);
+
+ if ( (res == ERROR_LOCK_PATH) || (res < 0) ) {
+ if (res == ERROR_LOCK_PATH)
+ ast_log(LOG_WARNING, "Unable to
lock the directory %s to forward the requested vmail msg!\n", todir);
+ else
+ ast_log(LOG_WARNING, "Unable to
determine how many msgs are in the destination folder!\n");
break;
- else
- todircount = res;
+ }
+ todircount = res;
ast_copy_string(tmp, fmt, sizeof(tmp));
stringp = tmp;
while ((s = strsep(&stringp, "|"))) {
@@ -3547,8 +3553,7 @@
res = ast_play_and_wait(chan,
"vm-messages");
if (!res)
res = ast_play_and_wait(chan,
"vm-saved"); */
- if (!res)
- res = ast_play_and_wait(chan,
"vm-msgsaved");
+ res = ast_play_and_wait(chan, "vm-msgsaved");
}
}
}
___
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
[Asterisk-cvs] asterisk ChangeLog,1.114,1.115
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv19780 Modified Files: ChangeLog Log Message: issue #5718 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- ChangeLog 12 Nov 2005 01:33:10 - 1.114 +++ ChangeLog 12 Nov 2005 02:34:01 - 1.115 @@ -1,5 +1,7 @@ 2005-11-11 Kevin P. Fleming <[EMAIL PROTECTED]> + * apps/app_voicemail.c (forward_message): correct bugs in message forwarding (issue #5718) + * apps/app_dial.c (wait_for_answer): correct flag copying for automon feature (issue #5720) * channels/chan_iax2.c: correct comment ___ 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/apps app_dial.c,1.186,1.187
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv19489/apps
Modified Files:
app_dial.c
Log Message:
issue #5720
Index: app_dial.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- app_dial.c 11 Nov 2005 15:52:55 - 1.186
+++ app_dial.c 12 Nov 2005 01:33:10 - 1.187
@@ -435,7 +435,11 @@
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3
"%s answered %s\n", o->chan->name, in->name);
peer = o->chan;
- ast_copy_flags(peerflags, o,
OPT_CALLEE_TRANSFER|OPT_CALLER_TRANSFER|OPT_CALLEE_HANGUP|OPT_CALLER_HANGUP|DIAL_NOFORWARDHTML);
+ ast_copy_flags(peerflags, o,
+ OPT_CALLEE_TRANSFER |
OPT_CALLER_TRANSFER |
+ OPT_CALLEE_HANGUP |
OPT_CALLER_HANGUP |
+ OPT_CALLEE_MONITOR |
OPT_CALLER_MONITOR |
+ DIAL_NOFORWARDHTML);
}
} else if (o->chan && (o->chan == winner)) {
if (!ast_strlen_zero(o->chan->call_forward)) {
@@ -547,7 +551,11 @@
if
(option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "%s answered %s\n", o->chan->name, in->name);
peer = o->chan;
-
ast_copy_flags(peerflags, o,
OPT_CALLEE_TRANSFER|OPT_CALLER_TRANSFER|OPT_CALLEE_HANGUP|OPT_CALLER_HANGUP|DIAL_NOFORWARDHTML);
+
ast_copy_flags(peerflags, o,
+
OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
+
OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
+
OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
+
DIAL_NOFORWARDHTML);
}
/* If call has been
answered, then the eventual hangup is likely to be normal hangup */
in->hangupcause =
AST_CAUSE_NORMAL_CLEARING;
@@ -955,9 +963,7 @@
/* If a channel group has been specified, get it for use when we create
peer channels */
outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
- ast_copy_flags(peerflags, &opts,
- OPT_DTMF_EXIT | OPT_GO_ON | OPT_ORIGINAL_CLID |
- OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP);
+ ast_copy_flags(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON |
OPT_ORIGINAL_CLID);
cur = args.peers;
do {
/* Remember where to start next time */
___
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.112,1.113
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv19180 Modified Files: ChangeLog Log Message: fix typo Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- ChangeLog 12 Nov 2005 00:52:08 - 1.112 +++ ChangeLog 12 Nov 2005 00:53:47 - 1.113 @@ -1,5 +1,7 @@ 2005-11-11 Kevin P. Fleming <[EMAIL PROTECTED]> + * channels/chan_iax2.c: correct comment + * apps/app_voicemail.c (close_mailbox): correct previous commit (issue #5663) (vm_change_password): fix password change writing (issue #5721) ___ 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.268,1.269
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv19150/apps
Modified Files:
app_voicemail.c
Log Message:
issue #5721
Index: app_voicemail.c
===
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -d -r1.268 -r1.269
--- app_voicemail.c 12 Nov 2005 00:09:43 - 1.268
+++ app_voicemail.c 12 Nov 2005 00:52:08 - 1.269
@@ -660,95 +660,76 @@
fgets(inbuf, sizeof(inbuf), configin);
linenum++;
if (!feof(configin)) {
- char *user = NULL, *pass = NULL, *rest = NULL, *trim =
NULL,
+ char *user = NULL, *pass = NULL, *rest = NULL,
*comment = NULL, *tmpctx = NULL, *tmpctxend =
NULL;
+ if (ast_strlen_zero(inbuf)) {
+ fprintf(configout, "\n");
+ continue;
+ }
+
/* Make a backup of it */
ast_copy_string(orig, inbuf, sizeof(orig));
/*
- Read the file line by line, split each line
into a comment and command section
- only parse the command portion of the line
+ Read the file line by line, split each line into a
comment and command section
+ only parse the command portion of the line
*/
if (inbuf[strlen(inbuf) - 1] == '\n')
inbuf[strlen(inbuf) - 1] = '\0';
- comment = strchr(inbuf, ';');
- if (comment) {
- *comment = '\0'; /* Now inbuf is terminated
just before the comment */
- comment++;
+
+ if ((comment = strchr(inbuf, ';')))
+ *comment++ = '\0'; /* Now inbuf is terminated
just before the comment */
+
+ if (ast_strlen_zero(inbuf)) {
+ fprintf(configout, "%s", orig);
+ continue;
}
- if (inbuf[0] != '\0') { /* skip over parsing for lines
starting with a comment character and empty lines */
- /* Check for a context, first '[' to first ']'
*/
- tmpctx = strchr(inbuf, '[');
- if (tmpctx) {
- tmpctxend = strchr(inbuf, ']');
- if (tmpctxend && (tmpctxend > tmpctx)) {
- /* Valid context */
- ast_copy_string(currcontext,
tmpctx + 1, tmpctxend - tmpctx - 1);
- currcontext[tmpctxend - tmpctx
- 1] = '\0';
- } else {
- tmpctx = NULL;
- }
+ /* Check for a context, first '[' to first ']' */
+ if ((tmpctx = strchr(inbuf, '['))) {
+ tmpctxend = strchr(tmpctx, ']');
+ if (tmpctxend) {
+ /* Valid context */
+ ast_copy_string(currcontext, tmpctx +
1, tmpctxend - tmpctx);
+ fprintf(configout, "%s", orig);
+ continue;
}
+ }
- if (!tmpctx) {
- /* This isn't a context line, check for
MBX => PSWD... */
- user = inbuf;
- pass = strchr(user, '=');
- if(pass > user) {
- /* We have a line in the form
of a=aa */
- *pass = '\0';
- pass++;
-
- /* Trim whitespace from user */
- trim = pass - 2;
- while (*trim && *trim < 33) {
- *trim = '\0';
- trim--;
- }
-
-
[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/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.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/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.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/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.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 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.106,1.107
Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv16150 Modified Files: ChangeLog Log Message: issue #5713 Index: ChangeLog === RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- ChangeLog 11 Nov 2005 13:34:38 - 1.106 +++ ChangeLog 11 Nov 2005 16:02:56 - 1.107 @@ -1,3 +1,7 @@ +2005-11-11 Kevin P. Fleming <[EMAIL PROTECTED]> + + * channels/chan_iax2.c: ensure that system headers that provide basic types are included first (issue #5713) + 2005-11-11 Russell Bryant <[EMAIL PROTECTED]> * many files in apps/: Clean up application descriptions. Clarify some wording and make sure they wrap at 80 characters. ___ 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.375,1.376
Update of /usr/cvsroot/asterisk/channels In directory mongoose.digium.com:/tmp/cvs-serv16150/channels Modified Files: chan_iax2.c Log Message: issue #5713 Index: chan_iax2.c === RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v retrieving revision 1.375 retrieving revision 1.376 diff -u -d -r1.375 -r1.376 --- chan_iax2.c 10 Nov 2005 23:42:45 - 1.375 +++ chan_iax2.c 11 Nov 2005 16:02:56 - 1.376 @@ -26,6 +26,9 @@ * \ingroup channel_drivers */ +#include +#include +#include #include #include #include @@ -36,14 +39,11 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include #include #ifdef IAX_TRUNKING ___ 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 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/include/asterisk chanspy.h, NONE, 1.1 channel.h, 1.115, 1.116
Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv11768/include/asterisk
Modified Files:
channel.h
Added Files:
chanspy.h
Log Message:
issue #5590
--- NEW FILE: chanspy.h ---
/*
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 1999 - 2005, Digium, Inc.
*
* Mark Spencer <[EMAIL PROTECTED]>
*
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
*
* This program is free software, distributed under the terms of
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
*/
/*! \file
* \brief Asterisk PBX channel spy definitions
*/
#ifndef _ASTERISK_CHANSPY_H
#define _ASTERISK_CHANSPY_H
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
#include "asterisk/linkedlists.h"
enum chanspy_states {
CHANSPY_NEW = 0,
CHANSPY_RUNNING = 1,
CHANSPY_DONE = 2,
};
enum chanspy_flags {
CHANSPY_MIXAUDIO = (1 << 0),
CHANSPY_READ_VOLADJUST = (1 << 1),
CHANSPY_WRITE_VOLADJUST = (1 << 2),
CHANSPY_FORMAT_AUDIO = (1 << 3),
CHANSPY_TRIGGER_MODE = (3 << 4),
CHANSPY_TRIGGER_READ = (1 << 4),
CHANSPY_TRIGGER_WRITE = (2 << 4),
CHANSPY_TRIGGER_NONE = (3 << 4),
CHANSPY_TRIGGER_FLUSH = (1 << 6),
};
struct ast_channel_spy_queue {
struct ast_frame *head;
unsigned int samples;
unsigned int format;
};
struct ast_channel_spy {
AST_LIST_ENTRY(ast_channel_spy) list;
ast_mutex_t lock;
ast_cond_t trigger;
struct ast_channel_spy_queue read_queue;
struct ast_channel_spy_queue write_queue;
unsigned int flags;
enum chanspy_states status;
const char *type;
/* The volume adjustment values are very straightforward:
positive values cause the samples to be multiplied by that amount
negative values cause the samples to be divided by the absolute
value of that amount
*/
int read_vol_adjustment;
int write_vol_adjustment;
};
/*!
\brief Adds a spy to a channel, to begin receiving copies of the channel's
audio frames.
\param chan The channel to add the spy to.
\param spy A pointer to ast_channel_spy structure describing how the spy is
to be used.
\return 0 for success, non-zero for failure
Note: This function performs no locking; you must hold the channel's lock
before
calling this function.
*/
int ast_channel_spy_add(struct ast_channel *chan, struct ast_channel_spy *spy);
/*!
\brief Remove a spy from a channel.
\param chan The channel to remove the spy from
\param spy The spy to be removed
\return nothing
Note: This function performs no locking; you must hold the channel's lock
before
calling this function.
*/
void ast_channel_spy_remove(struct ast_channel *chan, struct ast_channel_spy
*spy);
/*!
\brief Find all spies of a particular type on a channel and stop them.
\param chan The channel to operate on
\param type A character string identifying the type of spies to be stopped
\return nothing
Note: This function performs no locking; you must hold the channel's lock
before
calling this function.
*/
void ast_channel_spy_stop_by_type(struct ast_channel *chan, const char *type);
/*!
\brief Read one (or more) frames of audio from a channel being spied upon.
\param spy The spy to operate on
\param samples The number of audio samples to read
\return NULL for failure, one ast_frame pointer, or a chain of ast_frame
pointers
This function can return multiple frames if the spy structure needs to be
'flushed'
due to mismatched queue lengths, or if the spy structure is configured to
return
unmixed audio (in which case each call to this function will return a frame
of audio
from each side of channel).
Note: This function performs no locking; you must hold the spy's lock before
calling
this function. You must not hold the channel's lock at the same time.
*/
struct ast_frame *ast_channel_spy_read_frame(struct ast_channel_spy *spy,
unsigned int samples);
/*!
\brief Efficiently wait until audio is available for a spy, or an exception
occurs.
\param spy The spy to wait on
\return nothing
Note: The locking rules for this function are non-obvious... first, you must
not
hold the channel's lock when calling this function. Second, you must hold the
spy's lock
before making the function call; while the function runs the lock will be
released, and
when the trigger event occurs, the lock will be re-obtained. This means that
when control
returns to your code, you will again hold the spy's lock.
*/
void ast_channel_spy_trigger_wait(struct ast_channel_spy *spy);
#if defined(__cplusplus) || defined(c_p
[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/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.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/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.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/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
