[asterisk-commits] murf: branch murf/bug6683 r69942 - in /team/murf/bug6683: ./ apps/ build_tool...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jun 19 09:56:27 CDT 2007
Author: murf
Date: Tue Jun 19 09:56:25 2007
New Revision: 69942
URL: http://svn.digium.com/view/asterisk?view=rev&rev=69942
Log:
Merged revisions 69327,69348,69350,69360,69394,69405,69435-69436,69471,69519,69559,69583,69626,69662-69663,69672,69691,69703,69705,69709,69745-69746,69779,69795,69797,69806-69809,69850,69896 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r69327 | russell | 2007-06-14 13:39:12 -0600 (Thu, 14 Jun 2007) | 3 lines
Add a massive set of changes for converting to use the ast_debug() macro.
(issue #9957, patches from mvanbaak, caio1982, critch, and dimas)
................
r69348 | russell | 2007-06-14 15:02:19 -0600 (Thu, 14 Jun 2007) | 3 lines
Add support for the tw language in voicemail
(issue #9964, ljmid)
................
r69350 | russell | 2007-06-14 15:03:01 -0600 (Thu, 14 Jun 2007) | 1 line
update CHANGES for tw support in voicemail
................
r69360 | russell | 2007-06-14 15:09:22 -0600 (Thu, 14 Jun 2007) | 11 lines
Merged revisions 69358 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69358 | russell | 2007-06-14 16:08:23 -0500 (Thu, 14 Jun 2007) | 3 lines
Fix some problems with saying dates and times for the "tw" langauge
(issue #9964, ljmid)
........
................
r69394 | kpfleming | 2007-06-14 15:58:12 -0600 (Thu, 14 Jun 2007) | 2 lines
oops... somebody patched this module without compile-testing it... bad :-)
................
r69405 | kpfleming | 2007-06-14 16:09:20 -0600 (Thu, 14 Jun 2007) | 10 lines
Merged revisions 69392 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69392 | kpfleming | 2007-06-14 16:50:40 -0500 (Thu, 14 Jun 2007) | 2 lines
use ast_localtime() in every place localtime_r() was being used
........
................
r69435 | qwell | 2007-06-14 16:56:40 -0600 (Thu, 14 Jun 2007) | 9 lines
Merged revisions 69434 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69434 | qwell | 2007-06-14 17:56:09 -0500 (Thu, 14 Jun 2007) | 1 line
Update to latest versions of sound files.
........
................
r69436 | russell | 2007-06-14 17:01:01 -0600 (Thu, 14 Jun 2007) | 3 lines
Convert uses of strdup() to ast_strdup()
(issue #9983, eliel)
................
r69471 | qwell | 2007-06-14 17:23:35 -0600 (Thu, 14 Jun 2007) | 20 lines
Merged revisions 69470 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69470 | qwell | 2007-06-14 18:22:51 -0500 (Thu, 14 Jun 2007) | 12 lines
Merged revisions 69469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69469 | qwell | 2007-06-14 18:21:45 -0500 (Thu, 14 Jun 2007) | 4 lines
Fix an issue where the line number in an unterminated comment block error message would show the wrong line number.
"Reported" to me on #asterisk (somebody posted an error message, and I happened to catch it)
........
................
................
r69519 | russell | 2007-06-15 09:36:45 -0600 (Fri, 15 Jun 2007) | 13 lines
Merged revisions 69518 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69518 | russell | 2007-06-15 10:27:34 -0500 (Fri, 15 Jun 2007) | 5 lines
The SLATRUNK_STATUS variable indicated "SUCCESS" for both an answer of the
incoming call on the trunk, or if the trunk reached its ring timeout.
This patch changes the variable to say "RINGTIMEOUT" in that case.
(issue #9973, reported by n00dle, patch by me)
........
................
r69559 | file | 2007-06-15 13:25:11 -0600 (Fri, 15 Jun 2007) | 8 lines
Merged revisions 69558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69558 | file | 2007-06-15 15:23:45 -0400 (Fri, 15 Jun 2007) | 2 lines
Add support for setting the maximum length of acceptable DTMF in SpeechBackground.
................
r69583 | russell | 2007-06-15 14:21:41 -0600 (Fri, 15 Jun 2007) | 17 lines
This was only an issue in 1.4. This issue was fixed in trunk as a part of
bbryant's patch to support named dynamic feature groups.
Merged revisions 69579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69579 | russell | 2007-06-15 15:18:58 -0500 (Fri, 15 Jun 2007) | 5 lines
Fix a silly deadlock in res_features that I found while debugging on one of
blitzrage's test machines. It was one of the situations where he was seeing
hung channels, and may be the cause of some of the reports from other people.
(related to issue #9235)
........
................
r69626 | file | 2007-06-18 07:57:33 -0600 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69625 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69625 | file | 2007-06-18 09:55:00 -0400 (Mon, 18 Jun 2007) | 2 lines
Fix issue where it would be possible for the negotiated codecs to get set back to nothing. (issue #9992 reported by yehavi)
........
................
r69662 | russell | 2007-06-18 09:46:49 -0600 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69660 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69660 | russell | 2007-06-18 10:46:14 -0500 (Mon, 18 Jun 2007) | 2 lines
Tweak paths for BSD systems (issue #10001, stuarth)
........
................
r69663 | file | 2007-06-18 09:48:05 -0600 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69661 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69661 | file | 2007-06-18 11:46:32 -0400 (Mon, 18 Jun 2007) | 2 lines
Few minor transfer tweaks. We can't unlock something we never locked, and better handle a specific scenario with doing an attended transfer between two non-bridged calls.
........
................
r69672 | file | 2007-06-18 10:06:17 -0600 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69668 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69668 | file | 2007-06-18 12:04:55 -0400 (Mon, 18 Jun 2007) | 2 lines
Don't defer the BYE till later on a transfer when the transfer itself goes kaboom and has no hope of working.
........
................
r69691 | russell | 2007-06-18 10:15:44 -0600 (Mon, 18 Jun 2007) | 13 lines
Merged revisions 69689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69689 | russell | 2007-06-18 11:15:12 -0500 (Mon, 18 Jun 2007) | 5 lines
Change the use of "echo -e" to "printf". On systems where /bin/sh is not bash,
most of the lines in menuselect-tree were getting a "-e" at the beginning of
every line. I'm surprised nobody noticed this, but I think the XML parser was
being very nice and ignoring them.
........
................
r69703 | russell | 2007-06-18 10:35:51 -0600 (Mon, 18 Jun 2007) | 14 lines
Merged revisions 69702 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69702 | russell | 2007-06-18 11:35:02 -0500 (Mon, 18 Jun 2007) | 6 lines
To prevent 92138749238754 more reports of "I have unixodbc installed, but
still can't build *_odbc.so!", check for ltdl directly, instead of just listing
it as another library to include in the unixodbc check in the configure script.
This also makes ltdl show up as a dependency in menuselect so people know what
to go install. (related to issue #9989, patch by me)
........
................
r69705 | file | 2007-06-18 10:37:14 -0600 (Mon, 18 Jun 2007) | 2 lines
Few more rwlist conversions... why not.
................
r69709 | file | 2007-06-18 10:56:06 -0600 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69708 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69708 | file | 2007-06-18 12:51:36 -0400 (Mon, 18 Jun 2007) | 2 lines
Remember the DNS lookup done when dnsmgr is called for the first time so that it does not needlessly spit out changed messages when the host really didn't change.
........
................
r69745 | tilghman | 2007-06-18 11:48:56 -0600 (Mon, 18 Jun 2007) | 2 lines
Janitor for ast_localtime
................
r69746 | tilghman | 2007-06-18 11:50:01 -0600 (Mon, 18 Jun 2007) | 18 lines
Merged revisions 69744 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69744 | tilghman | 2007-06-18 12:46:40 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69743 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69743 | tilghman | 2007-06-18 12:45:15 -0500 (Mon, 18 Jun 2007) | 2 lines
Issue 9998 - Remove SIG prefix, since it's not supported by ksh
........
................
................
r69779 | file | 2007-06-18 12:19:54 -0600 (Mon, 18 Jun 2007) | 18 lines
Merged revisions 69775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69775 | file | 2007-06-18 14:18:12 -0400 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69765 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69765 | file | 2007-06-18 14:13:03 -0400 (Mon, 18 Jun 2007) | 2 lines
Set the peer name on the dialog to the one configured in sip.conf and NOT the username to be used for authentication attempts. (issue #9967 reported by achauvin)
........
................
................
r69795 | file | 2007-06-18 13:02:45 -0600 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69794 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69794 | file | 2007-06-18 15:00:50 -0400 (Mon, 18 Jun 2007) | 2 lines
Don't count RTP timeout when involved in a T38 fax session. (issue #9222 reported by ivoc)
........
................
r69797 | tilghman | 2007-06-18 13:52:56 -0600 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69796 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69796 | tilghman | 2007-06-18 14:48:17 -0500 (Mon, 18 Jun 2007) | 2 lines
Issue 10005 - Segfault with missing arguments, plus fix a missing define for SIP INFO channels
........
................
r69806 | file | 2007-06-18 15:58:37 -0600 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69805 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69805 | file | 2007-06-18 17:57:10 -0400 (Mon, 18 Jun 2007) | 2 lines
Fix for building on PowerPC under Linux.
........
................
r69807 | bbryant | 2007-06-18 16:23:51 -0600 (Mon, 18 Jun 2007) | 2 lines
Fixed issue where 'stop gracfeully' was hanging ...
................
r69808 | mmichelson | 2007-06-18 17:26:08 -0600 (Mon, 18 Jun 2007) | 4 lines
Cleaned up a section where there were two consecutive identical if statements.
Combined the bodies of the two into one if. I blame svn merging for this.
................
r69809 | mmichelson | 2007-06-18 17:28:10 -0600 (Mon, 18 Jun 2007) | 3 lines
Undoing my last commit. I misread the code before.
................
r69850 | file | 2007-06-19 07:04:24 -0600 (Tue, 19 Jun 2007) | 18 lines
Merged revisions 69847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69847 | file | 2007-06-19 09:00:57 -0400 (Tue, 19 Jun 2007) | 10 lines
Merged revisions 69846 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69846 | file | 2007-06-19 08:57:55 -0400 (Tue, 19 Jun 2007) | 2 lines
Add parked call extension AFTER the parking slot has been announced, otherwise two threads will try to handle the same channel and it will go kaboom. (issue #9191 reported by japple)
........
................
................
r69896 | file | 2007-06-19 07:56:37 -0600 (Tue, 19 Jun 2007) | 18 lines
Merged revisions 69895 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69895 | file | 2007-06-19 09:55:25 -0400 (Tue, 19 Jun 2007) | 10 lines
Merged revisions 69894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69894 | file | 2007-06-19 09:54:03 -0400 (Tue, 19 Jun 2007) | 2 lines
Perform an extra hangup check just in case. (issue #9589 reported by bcnit)
........
................
................
Modified:
team/murf/bug6683/ (props changed)
team/murf/bug6683/CHANGES
team/murf/bug6683/Makefile
team/murf/bug6683/apps/app_alarmreceiver.c
team/murf/bug6683/apps/app_amd.c
team/murf/bug6683/apps/app_channelredirect.c
team/murf/bug6683/apps/app_chanspy.c
team/murf/bug6683/apps/app_db.c
team/murf/bug6683/apps/app_dial.c
team/murf/bug6683/apps/app_directed_pickup.c
team/murf/bug6683/apps/app_directory.c
team/murf/bug6683/apps/app_disa.c
team/murf/bug6683/apps/app_festival.c
team/murf/bug6683/apps/app_followme.c
team/murf/bug6683/apps/app_ices.c
team/murf/bug6683/apps/app_macro.c
team/murf/bug6683/apps/app_meetme.c
team/murf/bug6683/apps/app_minivm.c
team/murf/bug6683/apps/app_mp3.c
team/murf/bug6683/apps/app_nbscat.c
team/murf/bug6683/apps/app_osplookup.c
team/murf/bug6683/apps/app_queue.c
team/murf/bug6683/apps/app_record.c
team/murf/bug6683/apps/app_rpt.c
team/murf/bug6683/apps/app_speech_utils.c
team/murf/bug6683/apps/app_stack.c
team/murf/bug6683/apps/app_talkdetect.c
team/murf/bug6683/apps/app_test.c
team/murf/bug6683/apps/app_voicemail.c
team/murf/bug6683/apps/app_waitforsilence.c
team/murf/bug6683/apps/app_zapbarge.c
team/murf/bug6683/apps/app_zapras.c
team/murf/bug6683/apps/app_zapscan.c
team/murf/bug6683/build_tools/menuselect-deps.in
team/murf/bug6683/build_tools/prep_moduledeps
team/murf/bug6683/cdr/cdr_csv.c
team/murf/bug6683/cdr/cdr_manager.c
team/murf/bug6683/cdr/cdr_odbc.c
team/murf/bug6683/cdr/cdr_pgsql.c
team/murf/bug6683/cdr/cdr_radius.c
team/murf/bug6683/cdr/cdr_sqlite.c
team/murf/bug6683/cdr/cdr_tds.c
team/murf/bug6683/channels/chan_agent.c
team/murf/bug6683/channels/chan_alsa.c
team/murf/bug6683/channels/chan_features.c
team/murf/bug6683/channels/chan_gtalk.c
team/murf/bug6683/channels/chan_h323.c
team/murf/bug6683/channels/chan_iax2.c
team/murf/bug6683/channels/chan_jingle.c
team/murf/bug6683/channels/chan_local.c
team/murf/bug6683/channels/chan_mgcp.c
team/murf/bug6683/channels/chan_misdn.c
team/murf/bug6683/channels/chan_nbs.c
team/murf/bug6683/channels/chan_phone.c
team/murf/bug6683/channels/chan_sip.c
team/murf/bug6683/channels/chan_skinny.c
team/murf/bug6683/channels/chan_vpb.cc
team/murf/bug6683/channels/chan_zap.c
team/murf/bug6683/channels/iax2-provision.c
team/murf/bug6683/codecs/codec_zap.c
team/murf/bug6683/configure
team/murf/bug6683/configure.ac
team/murf/bug6683/contrib/scripts/safe_asterisk
team/murf/bug6683/formats/format_g726.c
team/murf/bug6683/formats/format_ogg_vorbis.c
team/murf/bug6683/formats/format_wav.c
team/murf/bug6683/funcs/func_db.c
team/murf/bug6683/funcs/func_iconv.c
team/murf/bug6683/funcs/func_odbc.c
team/murf/bug6683/funcs/func_rand.c
team/murf/bug6683/funcs/func_strings.c
team/murf/bug6683/funcs/func_version.c
team/murf/bug6683/include/asterisk/autoconfig.h.in
team/murf/bug6683/include/asterisk/utils.h
team/murf/bug6683/main/acl.c
team/murf/bug6683/main/adsistub.c
team/murf/bug6683/main/app.c
team/murf/bug6683/main/asterisk.c
team/murf/bug6683/main/callerid.c
team/murf/bug6683/main/cdr.c
team/murf/bug6683/main/channel.c
team/murf/bug6683/main/cli.c
team/murf/bug6683/main/config.c
team/murf/bug6683/main/db.c
team/murf/bug6683/main/devicestate.c
team/murf/bug6683/main/dial.c
team/murf/bug6683/main/dns.c
team/murf/bug6683/main/dnsmgr.c
team/murf/bug6683/main/dsp.c
team/murf/bug6683/main/enum.c
team/murf/bug6683/main/file.c
team/murf/bug6683/main/frame.c
team/murf/bug6683/main/http.c
team/murf/bug6683/main/loader.c
team/murf/bug6683/main/logger.c
team/murf/bug6683/main/manager.c
team/murf/bug6683/main/pbx.c
team/murf/bug6683/main/say.c
team/murf/bug6683/main/stdtime/localtime.c
team/murf/bug6683/res/res_adsi.c
team/murf/bug6683/res/res_agi.c
team/murf/bug6683/res/res_config_odbc.c
team/murf/bug6683/res/res_config_pgsql.c
team/murf/bug6683/res/res_config_sqlite.c
team/murf/bug6683/res/res_crypto.c
team/murf/bug6683/res/res_features.c
team/murf/bug6683/res/res_indications.c
team/murf/bug6683/res/res_jabber.c
team/murf/bug6683/res/res_monitor.c
team/murf/bug6683/res/res_musiconhold.c
team/murf/bug6683/res/res_odbc.c
team/murf/bug6683/res/res_smdi.c
team/murf/bug6683/sounds/Makefile
Propchange: team/murf/bug6683/
------------------------------------------------------------------------------
automerge = yes
Propchange: team/murf/bug6683/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/murf/bug6683/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 19 09:56:25 2007
@@ -1,1 +1,1 @@
-/trunk:1-69316
+/trunk:1-69941
Modified: team/murf/bug6683/CHANGES
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/CHANGES?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/CHANGES (original)
+++ team/murf/bug6683/CHANGES Tue Jun 19 09:56:25 2007
@@ -104,6 +104,7 @@
IMAP storage. So, two new options have been added to voicemail.conf
to account for this: "pollmailboxes" and "pollfreq". See the sample
configuration file for details.
+ * Added "tw" language support
Queue changes
-------------
Modified: team/murf/bug6683/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/Makefile?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/Makefile (original)
+++ team/murf/bug6683/Makefile Tue Jun 19 09:56:25 2007
@@ -118,8 +118,9 @@
ASTLOGDIR=$(localstatedir)/log/asterisk
ASTVARRUNDIR=$(localstatedir)/run
ASTMANDIR=$(mandir)
-ifeq ($(OSARCH),FreeBSD)
+ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk
+ ASTVARRUNDIR=$(localstatedir)/run/asterisk
else
ASTVARLIBDIR=$(localstatedir)/lib/asterisk
endif
Modified: team/murf/bug6683/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_alarmreceiver.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_alarmreceiver.c (original)
+++ team/murf/bug6683/apps/app_alarmreceiver.c Tue Jun 19 09:56:25 2007
@@ -251,16 +251,14 @@
if(option_verbose >= 4)
ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: DTMF Digit Timeout on %s\n", chan->name);
- if (option_debug)
- ast_log(LOG_DEBUG,"AlarmReceiver: DTMF timeout on chan %s\n",chan->name);
+ ast_debug(1,"AlarmReceiver: DTMF timeout on chan %s\n",chan->name);
res = 1;
break;
}
if ((r = ast_waitfor(chan, -1) < 0)) {
- if (option_debug)
- ast_log(LOG_DEBUG, "Waitfor returned %d\n", r);
+ ast_debug(1, "Waitfor returned %d\n", r);
continue;
}
@@ -355,8 +353,7 @@
if (option_verbose >= 3 )
ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: can't write metadata\n");
- if (option_debug)
- ast_log(LOG_DEBUG,"AlarmReceiver: can't write metadata\n");
+ ast_debug(1,"AlarmReceiver: can't write metadata\n");
}
else
res = 0;
@@ -407,8 +404,7 @@
if(fd == -1) {
if (option_verbose >= 3)
ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: can't make temporary file\n");
- if (option_debug)
- ast_log(LOG_DEBUG,"AlarmReceiver: can't make temporary file\n");
+ ast_debug(1,"AlarmReceiver: can't make temporary file\n");
res = -1;
}
@@ -529,8 +525,7 @@
if (option_verbose >= 2)
ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Received Event %s\n", event);
- if (option_debug)
- ast_log(LOG_DEBUG, "AlarmReceiver: Received event: %s\n", event);
+ ast_debug(1, "AlarmReceiver: Received event: %s\n", event);
/* Calculate checksum */
@@ -560,8 +555,7 @@
database_increment("checksum-errors");
if (option_verbose >= 2)
ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Nonzero checksum\n");
- if (option_debug)
- ast_log(LOG_DEBUG, "AlarmReceiver: Nonzero checksum\n");
+ ast_debug(1, "AlarmReceiver: Nonzero checksum\n");
continue;
}
@@ -572,8 +566,7 @@
database_increment("format-errors");
if(option_verbose >= 2)
ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Wrong message type\n");
- if (option_debug)
- ast_log(LOG_DEBUG, "AlarmReceiver: Wrong message type\n");
+ ast_debug(1, "AlarmReceiver: Wrong message type\n");
continue;
}
}
@@ -715,8 +708,7 @@
*/
if((!res) && (!ast_strlen_zero(event_app)) && (event_head)){
- if (option_debug)
- ast_log(LOG_DEBUG,"Alarmreceiver: executing: %s\n", event_app);
+ ast_debug(1,"Alarmreceiver: executing: %s\n", event_app);
ast_safe_system(event_app);
}
Modified: team/murf/bug6683/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_amd.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_amd.c (original)
+++ team/murf/bug6683/apps/app_amd.c Tue Jun 19 09:56:25 2007
@@ -159,8 +159,9 @@
maximumNumberOfWords = atoi(args.argMaximumNumberOfWords);
if (!ast_strlen_zero(args.argSilenceThreshold))
silenceThreshold = atoi(args.argSilenceThreshold);
- } else if (option_debug)
- ast_log(LOG_DEBUG, "AMD using the default parameters.\n");
+ } else {
+ ast_debug(1, "AMD using the default parameters.\n");
+ }
/* Now we're ready to roll! */
if (option_verbose > 2)
@@ -195,8 +196,7 @@
if (!(f = ast_read(chan))) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
- if (option_debug)
- ast_log(LOG_DEBUG, "Got hangup\n");
+ ast_debug(1, "Got hangup\n");
strcpy(amdStatus, "HANGUP");
break;
}
Modified: team/murf/bug6683/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_channelredirect.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_channelredirect.c (original)
+++ team/murf/bug6683/apps/app_channelredirect.c Tue Jun 19 09:56:25 2007
@@ -105,8 +105,7 @@
goto chanquit;
}
- if (option_debug > 1)
- ast_log(LOG_DEBUG, "Attempting async goto (%s) to %s|%s|%d\n", args.channel, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio);
+ ast_debug(2, "Attempting async goto (%s) to %s|%s|%d\n", args.channel, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio);
if (ast_async_goto_if_exists(chan2, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio))
ast_log(LOG_WARNING, "%s failed for %s\n", app, args.channel);
Modified: team/murf/bug6683/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_chanspy.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_chanspy.c (original)
+++ team/murf/bug6683/apps/app_chanspy.c Tue Jun 19 09:56:25 2007
@@ -378,12 +378,12 @@
tmp[0] = res;
tmp[1] = '\0';
if (!ast_goto_if_exists(chan, exitcontext, tmp, 1)) {
- ast_log(LOG_DEBUG, "Got DTMF %c, goto context %s\n", tmp[0], exitcontext);
+ ast_debug(1, "Got DTMF %c, goto context %s\n", tmp[0], exitcontext);
pbx_builtin_setvar_helper(chan, "SPY_CHANNEL", name);
running = -2;
break;
- } else if (option_debug > 1) {
- ast_log(LOG_DEBUG, "Exit by single digit did not work in chanspy. Extension %s does not exist in context %s\n", tmp, exitcontext);
+ } else {
+ ast_debug(2, "Exit by single digit did not work in chanspy. Extension %s does not exist in context %s\n", tmp, exitcontext);
}
} else if (res >= '0' && res <= '9') {
inp[x++] = res;
@@ -508,8 +508,8 @@
tmp[1] = '\0';
if (!ast_goto_if_exists(chan, exitcontext, tmp, 1))
goto exit;
- else if (option_debug > 1)
- ast_log(LOG_DEBUG, "Exit by single digit did not work in chanspy. Extension %s does not exist in context %s\n", tmp, exitcontext);
+ else
+ ast_debug(2, "Exit by single digit did not work in chanspy. Extension %s does not exist in context %s\n", tmp, exitcontext);
}
}
@@ -524,8 +524,8 @@
tmp[1] = '\0';
if (!ast_goto_if_exists(chan, exitcontext, tmp, 1))
goto exit;
- else if (option_debug > 1)
- ast_log(LOG_DEBUG, "Exit by single digit did not work in chanspy. Extension %s does not exist in context %s\n", tmp, exitcontext);
+ else
+ ast_debug(2, "Exit by single digit did not work in chanspy. Extension %s does not exist in context %s\n", tmp, exitcontext);
}
/* reset for the next loop around, unless overridden later */
Modified: team/murf/bug6683/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_db.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_db.c (original)
+++ team/murf/bug6683/apps/app_db.c Tue Jun 19 09:56:25 2007
@@ -78,8 +78,7 @@
family = strsep(&argv, "/");
keytree = strsep(&argv, "\0");
if (!family || !keytree) {
- if (option_debug)
- ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+ ast_debug(1, "Ignoring; Syntax error in argument\n");
ast_module_user_remove(u);
return 0;
}
@@ -126,8 +125,7 @@
family = strsep(&argv, "/");
key = strsep(&argv, "\0");
if (!family || !key) {
- if (option_debug)
- ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+ ast_debug(1, "Ignoring; Syntax error in argument\n");
ast_module_user_remove(u);
return 0;
}
@@ -138,8 +136,7 @@
ast_verbose(VERBOSE_PREFIX_3 "DBdel: Error deleting key from database.\n");
}
} else {
- if (option_debug)
- ast_log(LOG_DEBUG, "Ignoring, no parameters\n");
+ ast_debug(1, "Ignoring, no parameters\n");
}
ast_module_user_remove(u);
Modified: team/murf/bug6683/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_dial.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_dial.c (original)
+++ team/murf/bug6683/apps/app_dial.c Tue Jun 19 09:56:25 2007
@@ -711,8 +711,7 @@
}
break;
default:
- if (option_debug)
- ast_log(LOG_DEBUG, "Dunno what to do with control type %d\n", f->subclass);
+ ast_debug(1, "Dunno what to do with control type %d\n", f->subclass);
}
} else if (single) {
/* XXX are we sure the logic is correct ? or we should just switch on f->frametype ? */
@@ -1417,8 +1416,7 @@
/* check the results of ast_call */
if (res) {
/* Again, keep going even if there's an error */
- if (option_debug)
- ast_log(LOG_DEBUG, "ast call on peer returned %d\n", res);
+ ast_debug(1, "ast call on peer returned %d\n", res);
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", numsubst);
ast_hangup(tc);
@@ -1510,8 +1508,7 @@
number = numsubst;
pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", number);
if (!ast_strlen_zero(args.url) && ast_channel_supports_html(peer) ) {
- if (option_debug)
- ast_log(LOG_DEBUG, "app_dial: sendurl=%s.\n", args.url);
+ ast_debug(1, "app_dial: sendurl=%s.\n", args.url);
ast_channel_sendurl( peer, args.url );
}
if ( (ast_test_flag(&opts, OPT_PRIVACY) || ast_test_flag(&opts, OPT_SCREENING)) && pa.privdb_val == AST_PRIVACY_UNKNOWN) {
@@ -1569,8 +1566,7 @@
if (theapp && !res) { /* XXX why check res here ? */
replace_macro_delimiter(opt_args[OPT_ARG_CALLEE_MACRO]);
res = pbx_exec(peer, theapp, opt_args[OPT_ARG_CALLEE_MACRO]);
- if (option_debug)
- ast_log(LOG_DEBUG, "Macro exited with status %d\n", res);
+ ast_debug(1, "Macro exited with status %d\n", res);
res = 0;
} else {
ast_log(LOG_ERROR, "Could not find application Macro\n");
@@ -1706,8 +1702,7 @@
hanguptree(outgoing, NULL);
pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status);
senddialendevent(chan, pa.status);
- if (option_debug)
- ast_log(LOG_DEBUG, "Exiting with DIALSTATUS=%s.\n", pa.status);
+ ast_debug(1, "Exiting with DIALSTATUS=%s.\n", pa.status);
if ((ast_test_flag(peerflags, OPT_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE)) {
if (calldurationlimit)
Modified: team/murf/bug6683/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_directed_pickup.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_directed_pickup.c (original)
+++ team/murf/bug6683/apps/app_directed_pickup.c Tue Jun 19 09:56:25 2007
@@ -59,8 +59,7 @@
{
int res = 0;
- if (option_debug)
- ast_log(LOG_DEBUG, "Call pickup on '%s' by '%s'\n", target->name, chan->name);
+ ast_debug(1, "Call pickup on '%s' by '%s'\n", target->name, chan->name);
if ((res = ast_answer(chan))) {
ast_log(LOG_WARNING, "Unable to answer '%s'\n", chan->name);
Modified: team/murf/bug6683/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_directory.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_directory.c (original)
+++ team/murf/bug6683/apps/app_directory.c Tue Jun 19 09:56:25 2007
@@ -444,7 +444,7 @@
/* Find all candidate extensions */
while(v) {
/* Find a candidate extension */
- start = strdup(v->value);
+ start = ast_strdup(v->value);
if (start && !strcasestr(start, "hidefromdir=yes")) {
stringp=start;
strsep(&stringp, ",");
Modified: team/murf/bug6683/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_disa.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_disa.c (original)
+++ team/murf/bug6683/apps/app_disa.c Tue Jun 19 09:56:25 2007
@@ -164,10 +164,8 @@
return -1;
}
- if (option_debug) {
- ast_log(LOG_DEBUG, "Digittimeout: %d\n", digittimeout);
- ast_log(LOG_DEBUG, "Responsetimeout: %d\n", firstdigittimeout);
- }
+ ast_debug(1, "Digittimeout: %d\n", digittimeout);
+ ast_debug(1, "Responsetimeout: %d\n", firstdigittimeout);
tmp = ast_strdupa(data);
@@ -180,8 +178,7 @@
if (!ast_strlen_zero(args.options))
ast_app_parse_options(app_opts, &flags, NULL, args.options);
- if (option_debug)
- ast_log(LOG_DEBUG, "Mailbox: %s\n",args.mailbox);
+ ast_debug(1, "Mailbox: %s\n",args.mailbox);
special_noanswer = 0;
if (ast_test_flag(&flags, NOANSWER_FLAG)) {
@@ -196,13 +193,11 @@
acctcode[0] = 0;
/* can we access DISA without password? */
- if (option_debug)
- ast_log(LOG_DEBUG, "Context: %s\n",args.context);
+ ast_debug(1, "Context: %s\n",args.context);
if (!strcasecmp(args.passcode, "no-password")) {
k |= 1; /* We have the password */
- if (option_debug)
- ast_log(LOG_DEBUG, "DISA no-password login success\n");
+ ast_debug(1, "DISA no-password login success\n");
}
lastdigittime = ast_tvnow();
@@ -212,14 +207,12 @@
/* if outa time, give em reorder */
if (ast_tvdiff_ms(ast_tvnow(), lastdigittime) >
((k&2) ? digittimeout : firstdigittimeout)) {
- if (option_debug)
- ast_log(LOG_DEBUG,"DISA %s entry timeout on chan %s\n",
- ((k&1) ? "extension" : "password"),chan->name);
+ ast_debug(1,"DISA %s entry timeout on chan %s\n",
+ ((k&1) ? "extension" : "password"),chan->name);
break;
}
if ((res = ast_waitfor(chan, -1) < 0)) {
- if (option_debug)
- ast_log(LOG_DEBUG, "Waitfor returned %d\n", res);
+ ast_debug(1, "Waitfor returned %d\n", res);
continue;
}
@@ -280,8 +273,7 @@
AST_STANDARD_APP_ARGS(args, pwline);
- if (option_debug)
- ast_log(LOG_DEBUG, "Mailbox: %s\n",args.mailbox);
+ ast_debug(1, "Mailbox: %s\n",args.mailbox);
/* password must be in valid format (numeric) */
if (sscanf(args.passcode,"%d", &j) < 1)
@@ -304,8 +296,7 @@
}
/* password good, set to dial state */
- if (option_debug)
- ast_log(LOG_DEBUG,"DISA on chan %s password is good\n",chan->name);
+ ast_debug(1,"DISA on chan %s password is good\n",chan->name);
play_dialtone(chan, args.mailbox);
k|=1; /* In number mode */
@@ -313,8 +304,7 @@
exten[sizeof(acctcode)] = 0;
ast_copy_string(acctcode, exten, sizeof(acctcode));
exten[0] = 0;
- if (option_debug)
- ast_log(LOG_DEBUG,"Successful DISA log-in on chan %s\n", chan->name);
+ ast_debug(1,"Successful DISA log-in on chan %s\n", chan->name);
continue;
}
}
Modified: team/murf/bug6683/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_festival.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_festival.c (original)
+++ team/murf/bug6683/apps/app_festival.c Tue Jun 19 09:56:25 2007
@@ -221,8 +221,7 @@
break;
}
if (f->frametype == AST_FRAME_DTMF) {
- if (option_debug)
- ast_log(LOG_DEBUG, "User pressed a key\n");
+ ast_debug(1, "User pressed a key\n");
if (intkeys && strchr(intkeys, f->subclass)) {
res = f->subclass;
ast_frfree(f);
@@ -252,15 +251,13 @@
break;
}
if (res < needed) { /* last frame */
- if (option_debug)
- ast_log(LOG_DEBUG, "Last frame\n");
+ ast_debug(1, "Last frame\n");
res=0;
ast_frfree(f);
break;
}
} else {
- if (option_debug)
- ast_log(LOG_DEBUG, "No more waveform\n");
+ ast_debug(1, "No more waveform\n");
res = 0;
}
}
@@ -380,8 +377,7 @@
intstr = AST_DIGIT_ANY;
}
- if (option_debug)
- ast_log(LOG_DEBUG, "Text passed to festival server : %s\n",(char *)data);
+ ast_debug(1, "Text passed to festival server : %s\n",(char *)data);
/* Connect to local festival server */
fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -440,21 +436,17 @@
if (fdesc!=-1) {
writecache=1;
strln=strlen((char *)data);
- if (option_debug)
- ast_log(LOG_DEBUG,"line length : %d\n",strln);
+ ast_debug(1,"line length : %d\n",strln);
write(fdesc,&strln,sizeof(int));
write(fdesc,data,strln);
seekpos=lseek(fdesc,0,SEEK_CUR);
- if (option_debug)
- ast_log(LOG_DEBUG,"Seek position : %d\n",seekpos);
+ ast_debug(1,"Seek position : %d\n",seekpos);
}
} else {
read(fdesc,&strln,sizeof(int));
- if (option_debug)
- ast_log(LOG_DEBUG,"Cache file exists, strln=%d, strlen=%d\n",strln,(int)strlen((char *)data));
+ ast_debug(1,"Cache file exists, strln=%d, strlen=%d\n",strln,(int)strlen((char *)data));
if (strlen((char *)data)==strln) {
- if (option_debug)
- ast_log(LOG_DEBUG,"Size OK\n");
+ ast_debug(1,"Size OK\n");
read(fdesc,&bigstring,strln);
bigstring[strln] = 0;
if (strcmp(bigstring,data)==0) {
@@ -471,11 +463,9 @@
if (readcache==1) {
close(fd);
fd=fdesc;
- if (option_debug)
- ast_log(LOG_DEBUG,"Reading from cache...\n");
+ ast_debug(1,"Reading from cache...\n");
} else {
- if (option_debug)
- ast_log(LOG_DEBUG,"Passing text to festival...\n");
+ ast_debug(1,"Passing text to festival...\n");
fs=fdopen(dup(fd),"wb");
fprintf(fs,festivalcommand,(char *)data);
fflush(fs);
@@ -484,8 +474,7 @@
/* Write to cache and then pass it down */
if (writecache==1) {
- if (option_debug)
- ast_log(LOG_DEBUG,"Writing result to cache...\n");
+ ast_debug(1,"Writing result to cache...\n");
while ((strln=read(fd,buffer,16384))!=0) {
write(fdesc,buffer,strln);
}
@@ -495,8 +484,7 @@
lseek(fd,seekpos,SEEK_SET);
}
- if (option_debug)
- ast_log(LOG_DEBUG,"Passing data to channel...\n");
+ ast_debug(1,"Passing data to channel...\n");
/* Read back info from server */
/* This assumes only one waveform will come back, also LP is unlikely */
@@ -521,16 +509,14 @@
}
ack[3] = '\0';
if (strcmp(ack,"WV\n") == 0) { /* receive a waveform */
- if (option_debug)
- ast_log(LOG_DEBUG,"Festival WV command\n");
+ ast_debug(1,"Festival WV command\n");
waveform = socket_receive_file_to_buff(fd,&filesize);
res = send_waveform_to_channel(chan,waveform,filesize, intstr);
ast_free(waveform);
break;
}
else if (strcmp(ack,"LP\n") == 0) { /* receive an s-expr */
- if (option_debug)
- ast_log(LOG_DEBUG,"Festival LP command\n");
+ ast_debug(1,"Festival LP command\n");
waveform = socket_receive_file_to_buff(fd,&filesize);
waveform[filesize]='\0';
ast_log(LOG_WARNING,"Festival returned LP : %s\n",waveform);
Modified: team/murf/bug6683/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/apps/app_followme.c?view=diff&rev=69942&r1=69941&r2=69942
==============================================================================
--- team/murf/bug6683/apps/app_followme.c (original)
+++ team/murf/bug6683/apps/app_followme.c Tue Jun 19 09:56:25 2007
@@ -269,8 +269,7 @@
*tmp = '\0';
ast_copy_string(cur->number, number, sizeof(cur->number));
cur->order = numorder;
- if (option_debug)
- ast_log(LOG_DEBUG, "Created a number, %s, order of , %d, with a timeout of %ld.\n", cur->number, cur->order, cur->timeout);
+ ast_debug(1, "Created a number, %s, order of , %d, with a timeout of %ld.\n", cur->number, cur->order, cur->timeout);
return cur;
}
@@ -356,8 +355,7 @@
if (!strcasecmp(f->name, cat))
break;
}
- if (option_debug)
- ast_log(LOG_DEBUG, "New profile %s.\n", cat);
+ ast_debug(1, "New profile %s.\n", cat);
if (!f) {
/* Make one then */
f = alloc_profile(cat);
@@ -406,8 +404,7 @@
AST_LIST_INSERT_TAIL(&f->numbers, cur, entry);
} else {
profile_set_param(f, var->name, var->value, var->lineno, 1);
- if (option_debug > 1)
- ast_log(LOG_DEBUG, "Logging parameter %s with value %s from lineno %d\n", var->name, var->value, var->lineno);
+ ast_debug(2, "Logging parameter %s with value %s from lineno %d\n", var->name, var->value, var->lineno);
}
var = var->next;
} /* End while(var) loop */
@@ -688,8 +685,7 @@
ast_verbose( VERBOSE_PREFIX_3 "%s stopped sounds\n", winner->name);
break;
default:
- if (option_debug)
- ast_log(LOG_DEBUG, "Dunno what to do with control type %d\n", f->subclass);
+ ast_debug(1, "Dunno what to do with control type %d\n", f->subclass);
break;
}
}
@@ -697,24 +693,19 @@
if (winner->stream)
ast_stopstream(winner);
tmpuser->digts = 0;
- if (option_debug)
- ast_log(LOG_DEBUG, "DTMF received: %c\n",(char) f->subclass);
+ ast_debug(1, "DTMF received: %c\n",(char) f->subclass);
tmpuser->yn[tmpuser->ynidx] = (char) f->subclass;
tmpuser->ynidx++;
- if (option_debug)
- ast_log(LOG_DEBUG, "DTMF string: %s\n", tmpuser->yn);
+ ast_debug(1, "DTMF string: %s\n", tmpuser->yn);
if (tmpuser->ynidx >= ynlongest) {
- if (option_debug)
- ast_log(LOG_DEBUG, "reached longest possible match - doing evals\n");
[... 16193 lines stripped ...]
More information about the asterisk-commits
mailing list