[asterisk-commits] may: branch may/ooh323_ipv6 r306957 - in /team/may/ooh323_ipv6: ./ cel/ codec...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Feb 8 12:38:39 CST 2011
Author: may
Date: Tue Feb 8 12:38:33 2011
New Revision: 306957
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306957
Log:
up to trunk again
Modified:
team/may/ooh323_ipv6/ (props changed)
team/may/ooh323_ipv6/cel/cel_odbc.c (props changed)
team/may/ooh323_ipv6/codecs/codec_ilbc.c
team/may/ooh323_ipv6/codecs/ex_ilbc.h
team/may/ooh323_ipv6/configs/cel_odbc.conf.sample (props changed)
team/may/ooh323_ipv6/configs/chan_dahdi.conf.sample
team/may/ooh323_ipv6/doc/asterisk.sgml
team/may/ooh323_ipv6/include/asterisk/autoconfig.h.in
team/may/ooh323_ipv6/include/asterisk/channel.h
team/may/ooh323_ipv6/include/asterisk/sched.h
team/may/ooh323_ipv6/main/app.c
team/may/ooh323_ipv6/main/audiohook.c
team/may/ooh323_ipv6/main/channel.c
team/may/ooh323_ipv6/main/features.c
team/may/ooh323_ipv6/main/http.c
team/may/ooh323_ipv6/main/logger.c
team/may/ooh323_ipv6/main/manager.c
team/may/ooh323_ipv6/main/pbx.c
team/may/ooh323_ipv6/main/say.c
team/may/ooh323_ipv6/main/taskprocessor.c
team/may/ooh323_ipv6/main/xmldoc.c
team/may/ooh323_ipv6/res/ais/evt.c
team/may/ooh323_ipv6/res/res_agi.c
team/may/ooh323_ipv6/res/res_config_ldap.c
team/may/ooh323_ipv6/res/res_http_post.c
team/may/ooh323_ipv6/res/res_jabber.c
team/may/ooh323_ipv6/res/res_musiconhold.c
team/may/ooh323_ipv6/res/res_odbc.c
team/may/ooh323_ipv6/res/res_rtp_asterisk.c
team/may/ooh323_ipv6/res/res_smdi.c
team/may/ooh323_ipv6/sounds/Makefile (props changed)
Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
svn:mergeinfo = /trunk:290061-306867
Propchange: team/may/ooh323_ipv6/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 12:38:33 2011
@@ -1,1 +1,2 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
+/trunk/cel/cel_odbc.c:290061-306867
Modified: team/may/ooh323_ipv6/codecs/codec_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/codecs/codec_ilbc.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/codecs/codec_ilbc.c (original)
+++ team/may/ooh323_ipv6/codecs/codec_ilbc.c Tue Feb 8 12:38:33 2011
@@ -89,7 +89,7 @@
float tmpf[ILBC_SAMPLES];
if (!f->data.ptr && f->datalen) {
- ast_log(LOG_DEBUG, "issue 16070, ILIB ERROR. data = NULL datalen = %d src = %s\n", f->datalen, f->src ? f->src : "no src set");
+ ast_debug(1, "issue 16070, ILIB ERROR. data = NULL datalen = %d src = %s\n", f->datalen, f->src ? f->src : "no src set");
f->datalen = 0;
}
@@ -104,12 +104,12 @@
ast_log(LOG_WARNING, "Huh? An ilbc frame that isn't a multiple of 50 bytes long from %s (%d)?\n", f->src, f->datalen);
return -1;
}
-
+
for (x=0; x < f->datalen ; x += ILBC_FRAME_LEN) {
- if (pvt->samples + ILBC_SAMPLES > BUFFER_SAMPLES) {
+ if (pvt->samples + ILBC_SAMPLES > BUFFER_SAMPLES) {
ast_log(LOG_WARNING, "Out of buffer space\n");
return -1;
- }
+ }
iLBC_decode(tmpf, plc_mode ? f->data.ptr + x : NULL, &tmp->dec, plc_mode);
for ( i=0; i < ILBC_SAMPLES; i++)
dst[pvt->samples + i] = tmpf[i];
@@ -198,8 +198,8 @@
{
int res;
- ast_format_set(&ilibctolin.src_format, AST_FORMAT_ILBC, 0);
- ast_format_set(&ilibctolin.dst_format, AST_FORMAT_SLINEAR, 0);
+ ast_format_set(&ilbctolin.src_format, AST_FORMAT_ILBC, 0);
+ ast_format_set(&ilbctolin.dst_format, AST_FORMAT_SLINEAR, 0);
ast_format_set(&lintoilbc.src_format, AST_FORMAT_SLINEAR, 0);
ast_format_set(&lintoilbc.dst_format, AST_FORMAT_ILBC, 0);
Modified: team/may/ooh323_ipv6/codecs/ex_ilbc.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/codecs/ex_ilbc.h?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/codecs/ex_ilbc.h (original)
+++ team/may/ooh323_ipv6/codecs/ex_ilbc.h Tue Feb 8 12:38:33 2011
@@ -19,7 +19,6 @@
{
static struct ast_frame f = {
.frametype = AST_FRAME_VOICE,
- .subclass.codec = AST_FORMAT_ILBC,
.datalen = sizeof(ex_ilbc),
/* All frames are 30 ms long */
.samples = ILBC_SAMPLES,
@@ -29,5 +28,6 @@
.data.ptr = ex_ilbc,
};
+ ast_format_set(&f.subclass.format, AST_FORMAT_ILBC, 0);
return &f;
}
Propchange: team/may/ooh323_ipv6/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 12:38:33 2011
@@ -1,1 +1,2 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
+/trunk/configs/cel_odbc.conf.sample:290061-306867
Modified: team/may/ooh323_ipv6/configs/chan_dahdi.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/configs/chan_dahdi.conf.sample?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/configs/chan_dahdi.conf.sample (original)
+++ team/may/ooh323_ipv6/configs/chan_dahdi.conf.sample Tue Feb 8 12:38:33 2011
@@ -205,8 +205,33 @@
; yes or both: both directions
;
;overlapdial=yes
-;
-; Allow sending an ISDN MCID request on this span.
+
+; Send/receive ISDN display IE options. The display options are a comma separated
+; list of the following options:
+;
+; block: Do not pass display text data.
+; Q.SIG: Default for send/receive.
+; ETSI CPE: Default for send.
+; name_initial: Use display text in SETUP/CONNECT messages as the party name.
+; Default for all other modes.
+; name_update: Use display text in other messages (NOTIFY/FACILITY) for COLP name
+; update.
+; name: Combined name_initial and name_update options.
+; text: Pass any unused display text data as an arbitrary display message
+; during a call. Sent text goes out in an INFORMATION message.
+;
+; * Default is an empty string for legacy behavior.
+; * The name options are not recommended for Q.SIG since Q.SIG already
+; supports names.
+; * The send block is the only recommended setting for CPE mode since Q.931 uses
+; the display IE only in the network to user direction.
+;
+; display_send and display_receive cannot be changed on reload.
+;
+;display_send=
+;display_receive=
+
+; Allow sending an ISDN Malicious Caller ID (MCID) request on this span.
; Default disabled
;
;mcid_send=yes
Modified: team/may/ooh323_ipv6/doc/asterisk.sgml
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/doc/asterisk.sgml?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/doc/asterisk.sgml (original)
+++ team/may/ooh323_ipv6/doc/asterisk.sgml Tue Feb 8 12:38:33 2011
@@ -1,13 +1,13 @@
<refentry>
<refentryinfo>
- <date>2010-08-03</date>
+ <date>2011-02-08</date>
</refentryinfo>
<refmeta>
<refentrytitle>
<application>asterisk</application>
</refentrytitle>
<manvolnum>8</manvolnum>
- <refmiscinfo>asterisk 1.6</refmiscinfo>
+ <refmiscinfo>asterisk Trunk</refmiscinfo>
</refmeta>
<refnamediv>
<refname>
@@ -39,7 +39,7 @@
</refsynopsisdiv>
<refsect1>
<refsect1info>
- <date>2010-08-03</date>
+ <date>2011-02-08</date>
</refsect1info>
<title>DESCRIPTION</title>
<para>
@@ -412,7 +412,7 @@
http://www.asteriskdocs.org - The Asterisk Documentation Project
</para>
<para>
- http://www.voip-info.org/wiki-Asterisk - The Asterisk Wiki
+ http://wiki.asterisk.org - The Asterisk Wiki
</para>
<para>
http://www.digium.com/ - Asterisk sponsor and hardware supplier
Modified: team/may/ooh323_ipv6/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/include/asterisk/autoconfig.h.in?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/include/asterisk/autoconfig.h.in (original)
+++ team/may/ooh323_ipv6/include/asterisk/autoconfig.h.in Tue Feb 8 12:38:33 2011
@@ -576,6 +576,10 @@
library. */
#undef HAVE_PRI_CCSS
+/* Define to 1 if you have the ISDN PRI user display text IE contents during
+ call library. */
+#undef HAVE_PRI_DISPLAY_TEXT
+
/* Define to 1 if you have the ISDN PRI hangup fix library. */
#undef HAVE_PRI_HANGUP_FIX
@@ -819,16 +823,16 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_CR_UID
-/* Define to 1 if `uid' is a member of `struct ucred'. */
+/* Define to 1 if `uid' is member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_UID
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1105,9 +1109,6 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
Modified: team/may/ooh323_ipv6/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/include/asterisk/channel.h?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/include/asterisk/channel.h (original)
+++ team/may/ooh323_ipv6/include/asterisk/channel.h Tue Feb 8 12:38:33 2011
@@ -2389,8 +2389,7 @@
#define CHECK_BLOCKING(c) do { \
if (ast_test_flag(c, AST_FLAG_BLOCKING)) {\
- if (option_debug) \
- ast_log(LOG_DEBUG, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \
+ ast_debug(1, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \
} else { \
(c)->blocker = pthread_self(); \
(c)->blockproc = __PRETTY_FUNCTION__; \
Modified: team/may/ooh323_ipv6/include/asterisk/sched.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/include/asterisk/sched.h?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/include/asterisk/sched.h (original)
+++ team/may/ooh323_ipv6/include/asterisk/sched.h Tue Feb 8 12:38:33 2011
@@ -49,8 +49,8 @@
int _sched_res = -1; \
while (id > -1 && (_sched_res = ast_sched_del(sched, id)) && ++_count < 10) \
usleep(1); \
- if (_count == 10 && option_debug > 2) { \
- ast_log(LOG_DEBUG, "Unable to cancel schedule ID %d.\n", id); \
+ if (_count == 10) { \
+ ast_debug(3, "Unable to cancel schedule ID %d.\n", id); \
} \
id = -1; \
(_sched_res); \
@@ -87,8 +87,8 @@
usleep(1); \
ast_mutex_lock(lock); \
} \
- if (_count == 10 && option_debug > 2) { \
- ast_log(LOG_DEBUG, "Unable to cancel schedule ID %d.\n", id); \
+ if (_count == 10) { \
+ ast_debug(3, "Unable to cancel schedule ID %d.\n", id); \
} \
id = -1; \
(_sched_res); \
Modified: team/may/ooh323_ipv6/main/app.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/app.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/app.c (original)
+++ team/may/ooh323_ipv6/main/app.c Tue Feb 8 12:38:33 2011
@@ -1481,9 +1481,9 @@
snprintf(s, strlen(path) + 19, "%s/lock", path);
unlink(s);
path_lock_destroy(p);
- ast_log(LOG_DEBUG, "Unlocked path '%s'\n", path);
+ ast_debug(1, "Unlocked path '%s'\n", path);
} else {
- ast_log(LOG_DEBUG, "Failed to unlock path '%s': "
+ ast_debug(1, "Failed to unlock path '%s': "
"lock not found\n", path);
}
Modified: team/may/ooh323_ipv6/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/audiohook.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/audiohook.c (original)
+++ team/may/ooh323_ipv6/main/audiohook.c Tue Feb 8 12:38:33 2011
@@ -138,16 +138,13 @@
other_factory_ms = other_factory_samples / 8;
if (ast_test_flag(audiohook, AST_AUDIOHOOK_TRIGGER_SYNC) && other_factory_samples && (our_factory_ms - other_factory_ms > AST_AUDIOHOOK_SYNC_TOLERANCE)) {
- if (option_debug)
- ast_log(LOG_DEBUG, "Flushing audiohook %p so it remains in sync\n", audiohook);
+ ast_debug(1, "Flushing audiohook %p so it remains in sync\n", audiohook);
ast_slinfactory_flush(factory);
ast_slinfactory_flush(other_factory);
}
if (ast_test_flag(audiohook, AST_AUDIOHOOK_SMALL_QUEUE) && (our_factory_samples > 640 || other_factory_samples > 640)) {
- if (option_debug) {
- ast_log(LOG_DEBUG, "Audiohook %p has stale audio in its factories. Flushing them both\n", audiohook);
- }
+ ast_debug(1, "Audiohook %p has stale audio in its factories. Flushing them both\n", audiohook);
ast_slinfactory_flush(factory);
ast_slinfactory_flush(other_factory);
}
@@ -256,8 +253,8 @@
}
}
}
- } else if (option_debug)
- ast_log(LOG_DEBUG, "Failed to get %d samples from read factory %p\n", (int)samples, &audiohook->read_factory);
+ }
+ ast_debug(1, "Failed to get %d samples from read factory %p\n", (int)samples, &audiohook->read_factory);
/* Move on to the write factory... if there are enough samples, read them in */
if (usable_write) {
@@ -275,8 +272,8 @@
}
}
}
- } else if (option_debug)
- ast_log(LOG_DEBUG, "Failed to get %d samples from write factory %p\n", (int)samples, &audiohook->write_factory);
+ }
+ ast_debug(1, "Failed to get %d samples from write factory %p\n", (int)samples, &audiohook->write_factory);
/* Basically we figure out which buffer to use... and if mixing can be done here */
if (!read_buf && !write_buf)
@@ -818,7 +815,7 @@
AST_LIST_TRAVERSE_SAFE_END;
break;
default:
- ast_log(LOG_DEBUG, "Invalid audiohook type supplied, (%d)\n", type);
+ ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type);
return -1;
}
@@ -856,7 +853,7 @@
AST_LIST_TRAVERSE_SAFE_END;
break;
default:
- ast_log(LOG_DEBUG, "Invalid audiohook type supplied, (%d)\n", type);
+ ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type);
return -1;
}
return count;
Modified: team/may/ooh323_ipv6/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/channel.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/channel.c (original)
+++ team/may/ooh323_ipv6/main/channel.c Tue Feb 8 12:38:33 2011
@@ -675,16 +675,16 @@
return 0;
/* If the last saved context does not match the current one
OR we have not saved any context so far, then save the current context */
- if ((!AST_LIST_EMPTY(&traced->trace) && strcasecmp(AST_LIST_FIRST(&traced->trace)->context, chan->context)) ||
+ if ((!AST_LIST_EMPTY(&traced->trace) && strcasecmp(AST_LIST_FIRST(&traced->trace)->context, chan->context)) ||
(AST_LIST_EMPTY(&traced->trace))) {
/* Just do some debug logging */
if (AST_LIST_EMPTY(&traced->trace))
- ast_log(LOG_DEBUG, "Setting initial trace context to %s\n", chan->context);
+ ast_debug(1, "Setting initial trace context to %s\n", chan->context);
else
- ast_log(LOG_DEBUG, "Changing trace context from %s to %s\n", AST_LIST_FIRST(&traced->trace)->context, chan->context);
+ ast_debug(1, "Changing trace context from %s to %s\n", AST_LIST_FIRST(&traced->trace)->context, chan->context);
/* alloc or bail out */
trace = ast_malloc(sizeof(*trace));
- if (!trace)
+ if (!trace)
return -1;
/* save the current location and store it in the trace list */
ast_copy_string(trace->context, chan->context, sizeof(trace->context));
@@ -745,7 +745,7 @@
return 1;
if (ast_tvzero(chan->whentohangup)) /* no if no hangup scheduled */
return 0;
- if (ast_tvdiff_ms(chan->whentohangup, ast_tvnow()) > 0) /* no if hangup time has not come yet. */
+ if (ast_tvdiff_ms(chan->whentohangup, ast_tvnow()) > 0) /* no if hangup time has not come yet. */
return 0;
ast_debug(4, "Hangup time has come: %" PRIi64 "\n", ast_tvdiff_ms(chan->whentohangup, ast_tvnow()));
chan->_softhangup |= AST_SOFTHANGUP_TIMEOUT; /* record event */
@@ -847,7 +847,7 @@
return -1;
}
}
-
+
if (!(chan = ast_calloc(1, sizeof(*chan)))) {
AST_RWLIST_UNLOCK(&backends);
return -1;
@@ -2775,7 +2775,7 @@
} else {
ast_debug(1, "Hanging up zombie '%s'\n", chan->name);
}
-
+
ast_channel_unlock(chan);
ast_cc_offer(chan);
ast_manager_event(chan, EVENT_FLAG_CALL, "Hangup",
@@ -3568,7 +3568,7 @@
} else {
samples = f->samples;
}
-
+
/* This unlock is here based on two assumptions that hold true at this point in the
* code. 1) this function is only called from within __ast_read() and 2) all generators
* call ast_write() in their generate callback.
@@ -4550,7 +4550,7 @@
if (res && chan->generator)
ast_playtones_stop(chan);
-
+
return 0;
}
@@ -4560,7 +4560,7 @@
ast_senddigit_begin(chan, digit);
ast_safe_sleep(chan, (duration >= AST_DEFAULT_EMULATE_DTMF_DURATION ? duration : AST_DEFAULT_EMULATE_DTMF_DURATION));
}
-
+
return ast_senddigit_end(chan, digit, (duration >= AST_DEFAULT_EMULATE_DTMF_DURATION ? duration : AST_DEFAULT_EMULATE_DTMF_DURATION));
}
@@ -6224,32 +6224,32 @@
struct ast_channel *chan2)
{
if (!ast_strlen_zero(chan1->accountcode) && ast_strlen_zero(chan2->peeraccount)) {
- ast_log(LOG_DEBUG, "setting peeraccount to %s for %s from data on channel %s\n",
+ ast_debug(1, "setting peeraccount to %s for %s from data on channel %s\n",
chan1->accountcode, chan2->name, chan1->name);
ast_string_field_set(chan2, peeraccount, chan1->accountcode);
}
if (!ast_strlen_zero(chan2->accountcode) && ast_strlen_zero(chan1->peeraccount)) {
- ast_log(LOG_DEBUG, "setting peeraccount to %s for %s from data on channel %s\n",
+ ast_debug(1, "setting peeraccount to %s for %s from data on channel %s\n",
chan2->accountcode, chan1->name, chan2->name);
ast_string_field_set(chan1, peeraccount, chan2->accountcode);
}
if (!ast_strlen_zero(chan1->peeraccount) && ast_strlen_zero(chan2->accountcode)) {
- ast_log(LOG_DEBUG, "setting accountcode to %s for %s from data on channel %s\n",
+ ast_debug(1, "setting accountcode to %s for %s from data on channel %s\n",
chan1->peeraccount, chan2->name, chan1->name);
ast_string_field_set(chan2, accountcode, chan1->peeraccount);
}
if (!ast_strlen_zero(chan2->peeraccount) && ast_strlen_zero(chan1->accountcode)) {
- ast_log(LOG_DEBUG, "setting accountcode to %s for %s from data on channel %s\n",
+ ast_debug(1, "setting accountcode to %s for %s from data on channel %s\n",
chan2->peeraccount, chan1->name, chan2->name);
ast_string_field_set(chan1, accountcode, chan2->peeraccount);
}
if (0 != strcmp(chan1->accountcode, chan2->peeraccount)) {
- ast_log(LOG_DEBUG, "changing peeraccount from %s to %s on %s to match channel %s\n",
+ ast_debug(1, "changing peeraccount from %s to %s on %s to match channel %s\n",
chan2->peeraccount, chan1->peeraccount, chan2->name, chan1->name);
ast_string_field_set(chan2, peeraccount, chan1->accountcode);
}
if (0 != strcmp(chan2->accountcode, chan1->peeraccount)) {
- ast_log(LOG_DEBUG, "changing peeraccount from %s to %s on %s to match channel %s\n",
+ ast_debug(1, "changing peeraccount from %s to %s on %s to match channel %s\n",
chan1->peeraccount, chan2->peeraccount, chan1->name, chan2->name);
ast_string_field_set(chan1, peeraccount, chan2->accountcode);
}
@@ -7001,7 +7001,7 @@
if (!f) {
*fo = NULL;
*rc = who;
- ast_debug(1, "Didn't get a frame from channel: %s\n",who->name);
+ ast_debug(1, "Didn't get a frame from channel: %s\n", who->name);
break;
}
@@ -7065,7 +7065,7 @@
f->frametype == AST_FRAME_DTMF_BEGIN)) {
*fo = f;
*rc = who;
- ast_debug(1, "Got DTMF %s on channel (%s)\n",
+ ast_debug(1, "Got DTMF %s on channel (%s)\n",
f->frametype == AST_FRAME_DTMF_END ? "end" : "begin",
who->name);
@@ -8689,7 +8689,7 @@
break;
/* Connected line party unknown element */
default:
- ast_log(LOG_DEBUG, "Unknown connected line element: %u (%u)\n",
+ ast_debug(1, "Unknown connected line element: %u (%u)\n",
(unsigned) ie_id, (unsigned) ie_len);
break;
}
@@ -8717,7 +8717,7 @@
* The other end is newer than we are.
* We need to assume that they are compatible with us.
*/
- ast_log(LOG_DEBUG, "Connected line frame has newer version: %u\n",
+ ast_debug(1, "Connected line frame has newer version: %u\n",
(unsigned) frame_version);
break;
}
@@ -9188,7 +9188,7 @@
break;
/* Redirecting unknown element */
default:
- ast_log(LOG_DEBUG, "Unknown redirecting element: %u (%u)\n",
+ ast_debug(1, "Unknown redirecting element: %u (%u)\n",
(unsigned) ie_id, (unsigned) ie_len);
break;
}
@@ -9224,7 +9224,7 @@
* The other end is newer than we are.
* We need to assume that they are compatible with us.
*/
- ast_log(LOG_DEBUG, "Redirecting frame has newer version: %u\n",
+ ast_debug(1, "Redirecting frame has newer version: %u\n",
(unsigned) frame_version);
break;
}
Modified: team/may/ooh323_ipv6/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/features.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/features.c (original)
+++ team/may/ooh323_ipv6/main/features.c Tue Feb 8 12:38:33 2011
@@ -854,7 +854,7 @@
/*! \brief Notify metermaids that we've changed an extension */
static void notify_metermaids(const char *exten, char *context, enum ast_device_state state)
{
- ast_debug(4, "Notification of state change to metermaids %s@%s\n to state '%s'",
+ ast_debug(4, "Notification of state change to metermaids %s@%s\n to state '%s'",
exten, context, ast_devstate2str(state));
ast_devstate_changed(state, "park:%s@%s", exten, context);
@@ -871,7 +871,7 @@
exten = strsep(&context, "@");
if (!context)
return AST_DEVICE_INVALID;
-
+
ast_debug(4, "Checking state of exten %s in context %s\n", exten, context);
if (!ast_exists_extension(NULL, context, exten, 1, NULL))
@@ -1923,12 +1923,12 @@
}
if (transferer->cdr) {
struct ast_cdr *swap = transferer->cdr;
- ast_log(LOG_DEBUG,"transferer=%s; transferee=%s; lastapp=%s; lastdata=%s; chan=%s; dstchan=%s\n",
+ ast_debug(1, "transferer=%s; transferee=%s; lastapp=%s; lastdata=%s; chan=%s; dstchan=%s\n",
transferer->name, transferee->name, transferer->cdr->lastapp, transferer->cdr->lastdata,
transferer->cdr->channel, transferer->cdr->dstchannel);
- ast_log(LOG_DEBUG,"TRANSFEREE; lastapp=%s; lastdata=%s, chan=%s; dstchan=%s\n",
+ ast_debug(1, "TRANSFEREE; lastapp=%s; lastdata=%s, chan=%s; dstchan=%s\n",
transferee->cdr->lastapp, transferee->cdr->lastdata, transferee->cdr->channel, transferee->cdr->dstchannel);
- ast_log(LOG_DEBUG,"transferer_real_context=%s; xferto=%s\n", transferer_real_context, xferto);
+ ast_debug(1, "transferer_real_context=%s; xferto=%s\n", transferer_real_context, xferto);
/* swap cdrs-- it will save us some time & work */
transferer->cdr = transferee->cdr;
transferee->cdr = swap;
@@ -1942,7 +1942,7 @@
} else {
/* Set the channel's new extension, since it exists, using transferer context */
ast_set_flag(transferee, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */
- ast_log(LOG_DEBUG,"ABOUT TO AST_ASYNC_GOTO, have a pbx... set HANGUP_DONT on chan=%s\n", transferee->name);
+ ast_debug(1, "ABOUT TO AST_ASYNC_GOTO, have a pbx... set HANGUP_DONT on chan=%s\n", transferee->name);
if (ast_channel_connected_line_macro(transferee, transferer, &transferer->connected, 1, 0)) {
ast_channel_update_connected_line(transferer, &transferer->connected, NULL);
}
@@ -3534,7 +3534,7 @@
ast_cdr_start(bridge_cdr);
}
}
- ast_debug(4,"bridge answer set, chan answer set\n");
+ ast_debug(4, "bridge answer set, chan answer set\n");
/* peer_cdr->answer will be set when a macro runs on the peer;
in that case, the bridge answer will be delayed while the
macro plays on the peer channel. The peer answered the call
@@ -4666,7 +4666,7 @@
} else if (!strcasecmp(confvar->name, "findslot")) {
parkinglot->parkfindnext = (!strcasecmp(confvar->value, "next"));
} else if (!strcasecmp(confvar->name, "parkedcalltransfers")) {
- ast_log(LOG_DEBUG, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+ ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
if (!strcasecmp(confvar->value, "both")) {
parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(confvar->value, "caller")) {
@@ -4675,7 +4675,7 @@
parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE;
}
} else if (!strcasecmp(confvar->name, "parkedcallreparking")) {
- ast_log(LOG_DEBUG, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+ ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
if (!strcasecmp(confvar->value, "both")) {
parkinglot->parkedcallreparking = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(confvar->value, "caller")) {
@@ -4684,16 +4684,16 @@
parkinglot->parkedcallreparking = AST_FEATURE_FLAG_BYCALLEE;
}
} else if (!strcasecmp(confvar->name, "parkedcallhangup")) {
- ast_log(LOG_DEBUG, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+ ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
if (!strcasecmp(confvar->value, "both")) {
parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(confvar->value, "caller")) {
- parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYCALLER;
+ parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYCALLER;
} else if (!strcasecmp(confvar->value, "callee")) {
parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYCALLEE;
}
} else if (!strcasecmp(confvar->name, "parkedcallrecording")) {
- ast_log(LOG_DEBUG, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+ ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
if (!strcasecmp(confvar->value, "both")) {
parkinglot->parkedcallrecording = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(confvar->value, "caller")) {
@@ -4763,7 +4763,7 @@
return parkinglot;
}
-static int load_config(void)
+static int load_config(void)
{
int start = 0, end = 0;
int res;
@@ -4794,7 +4794,7 @@
default_parkinglot->parkingtime = DEFAULT_PARK_TIME;
ao2_unlock(default_parkinglot);
}
-
+
if (default_parkinglot) {
ast_debug(1, "Configuration of default parkinglot done.\n");
} else {
@@ -5054,7 +5054,7 @@
ast_log(LOG_ERROR, "Could not build parking lot %s. Configuration error.\n", ctg);
else
ast_debug(1, "Configured parking context %s\n", ctg);
- continue;
+ continue;
}
/* No, check if it's a group */
for (i = 0; i < ARRAY_LEN(categories); i++) {
@@ -5062,7 +5062,7 @@
break;
}
- if (i < ARRAY_LEN(categories))
+ if (i < ARRAY_LEN(categories))
continue;
if (!(fg = register_group(ctg)))
@@ -5939,7 +5939,7 @@
ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT);
if (ast_test_flag(&opts, OPT_CALLEE_MONITOR))
ast_set_flag(&(bconfig.features_callee), AST_FEATURE_AUTOMON);
- if (ast_test_flag(&opts, OPT_CALLER_MONITOR))
+ if (ast_test_flag(&opts, OPT_CALLER_MONITOR))
ast_set_flag(&(bconfig.features_caller), AST_FEATURE_AUTOMON);
if (ast_test_flag(&opts, OPT_CALLEE_PARK))
ast_set_flag(&(bconfig.features_callee), AST_FEATURE_PARKCALL);
@@ -5951,8 +5951,8 @@
/* the bridge has ended, set BRIDGERESULT to SUCCESS. If the other channel has not been hung up, return it to the PBX */
pbx_builtin_setvar_helper(chan, "BRIDGERESULT", "SUCCESS");
if (!ast_check_hangup(final_dest_chan) && !ast_test_flag(&opts, OPT_CALLEE_KILL)) {
- ast_debug(1, "starting new PBX in %s,%s,%d for chan %s\n",
- final_dest_chan->context, final_dest_chan->exten,
+ ast_debug(1, "starting new PBX in %s,%s,%d for chan %s\n",
+ final_dest_chan->context, final_dest_chan->exten,
final_dest_chan->priority, final_dest_chan->name);
if (ast_pbx_start(final_dest_chan) != AST_PBX_SUCCESS) {
Modified: team/may/ooh323_ipv6/main/http.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/http.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/http.c (original)
+++ team/may/ooh323_ipv6/main/http.c Tue Feb 8 12:38:33 2011
@@ -787,7 +787,7 @@
}
if (option_debug) {
- ast_log(LOG_DEBUG, "mmm ... cookie! Name: '%s' Value: '%s'\n", name, val);
+ ast_debug(1, "mmm ... cookie! Name: '%s' Value: '%s'\n", name, val);
}
var = ast_variable_new(name, val, __FILE__);
Modified: team/may/ooh323_ipv6/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/logger.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/logger.c (original)
+++ team/may/ooh323_ipv6/main/logger.c Tue Feb 8 12:38:33 2011
@@ -1258,7 +1258,7 @@
char asteriskpath[256];
if (!(dli.dli_fname = ast_utils_which("asterisk", asteriskpath, sizeof(asteriskpath)))) {
/* This will fail to find symbols */
- ast_log(LOG_DEBUG, "Failed to find asterisk binary for debug symbols.\n");
+ ast_debug(1, "Failed to find asterisk binary for debug symbols.\n");
dli.dli_fname = "asterisk";
}
}
@@ -1378,7 +1378,7 @@
if ((strings = ast_bt_get_symbols(bt->addresses, bt->num_frames))) {
ast_debug(1, "Got %d backtrace record%c\n", bt->num_frames, bt->num_frames != 1 ? 's' : ' ');
for (i = 3; i < bt->num_frames - 2; i++) {
- ast_log(LOG_DEBUG, "#%d: [%p] %s\n", i - 3, bt->addresses[i], strings[i]);
+ ast_debug(1, "#%d: [%p] %s\n", i - 3, bt->addresses[i], strings[i]);
}
/* MALLOC_DEBUG will erroneously report an error here, unless we undef the macro. */
Modified: team/may/ooh323_ipv6/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/manager.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/manager.c (original)
+++ team/may/ooh323_ipv6/main/manager.c Tue Feb 8 12:38:33 2011
@@ -1214,7 +1214,7 @@
{
int refcount = ao2_ref(s, -1);
if (manager_debug) {
- ast_log(LOG_DEBUG, "Mansession: %p refcount now %d\n", s, refcount - 1);
+ ast_debug(1, "Mansession: %p refcount now %d\n", s, refcount - 1);
}
return s;
}
@@ -4069,11 +4069,12 @@
const char *eventdata = arg;
int *result = data;
- if (regexec(regex_filter, eventdata, 0, NULL, 0)) {
- *result = 1;
+ if (!regexec(regex_filter, eventdata, 0, NULL, 0)) {
+ *result = 0;
return (CMP_MATCH | CMP_STOP);
}
+ *result = 1;
return 0;
}
@@ -4344,14 +4345,14 @@
cut = filename + strlen(filename);
}
snprintf(cut, (sizeof(filename) - strlen(filename)) - 1, ".so");
- ast_log(LOG_DEBUG, "**** ModuleCheck .so file %s\n", filename);
+ ast_debug(1, "**** ModuleCheck .so file %s\n", filename);
res = ast_module_check(filename);
if (!res) {
astman_send_error(s, m, "Module not loaded");
return 0;
}
snprintf(cut, (sizeof(filename) - strlen(filename)) - 1, ".c");
- ast_log(LOG_DEBUG, "**** ModuleCheck .c file %s\n", filename);
+ ast_debug(1, "**** ModuleCheck .c file %s\n", filename);
#if !defined(LOW_MEMORY)
version = ast_file_version_find(filename);
#endif
Modified: team/may/ooh323_ipv6/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/pbx.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/pbx.c (original)
+++ team/may/ooh323_ipv6/main/pbx.c Tue Feb 8 12:38:33 2011
@@ -1811,10 +1811,10 @@
} \
} \
}
-
+
#define NEW_MATCHER_RECURSE \
if (p->next_char && (*(str + 1) || (p->next_char->x[0] == '/' && p->next_char->x[1] == 0) \
- || p->next_char->x[0] == '!')) { \
+ || p->next_char->x[0] == '!')) { \
if (*(str + 1) || p->next_char->x[0] == '!') { \
new_find_extension(str + 1, score, p->next_char, length + 1, spec + p->specificity, callerid, label, action); \
if (score->exten) { \
@@ -1825,7 +1825,7 @@
new_find_extension("/", score, p->next_char, length + 1, spec + p->specificity, callerid, label, action); \
if (score->exten || ((action == E_CANMATCH || action == E_MATCHMORE) && score->canmatch)) { \
ast_debug(4,"returning a (can/more) match--- %s\n", score->exten ? score->exten->exten : \
- "NULL"); \
+ "NULL"); \
return; /* the first match is all we need */ \
} \
} \
@@ -1837,7 +1837,7 @@
return; \
} \
}
-
+
NEW_MATCHER_CHK_MATCH;
NEW_MATCHER_RECURSE;
}
@@ -1846,7 +1846,7 @@
NEW_MATCHER_CHK_MATCH;
NEW_MATCHER_RECURSE;
}
- } else if (p->x[0] == 'X') {
+ } else if (p->x[0] == 'X') {
if (p->x[1] == 0 && *str >= '0' && *str <= '9' ) {
NEW_MATCHER_CHK_MATCH;
NEW_MATCHER_RECURSE;
@@ -2054,7 +2054,7 @@
return 0;
}
#ifdef NEED_DEBUG
- ast_log(LOG_DEBUG, "Adding exten %s%c%s to tree\n", s1, e1->matchcid ? '/' : ' ', e1->matchcid ? e1->cidmatch : "");
+ ast_debug(1, "Adding exten %s%c%s to tree\n", s1, e1->matchcid ? '/' : ' ', e1->matchcid ? e1->cidmatch : "");
#endif
m1 = con->pattern_tree; /* each pattern starts over at the root of the pattern tree */
m0 = &con->pattern_tree;
@@ -2180,9 +2180,9 @@
#ifdef NEED_DEBUG
int biggest_bucket, resizes, numobjs, numbucks;
- ast_log(LOG_DEBUG,"Creating Extension Trie for context %s(%p)\n", con->name, con);
+ ast_debug(1, "Creating Extension Trie for context %s(%p)\n", con->name, con);
ast_hashtab_get_stats(con->root_table, &biggest_bucket, &resizes, &numobjs, &numbucks);
- ast_log(LOG_DEBUG,"This tree has %d objects in %d bucket lists, longest list=%d objects, and has resized %d times\n",
+ ast_debug(1, "This tree has %d objects in %d bucket lists, longest list=%d objects, and has resized %d times\n",
numobjs, numbucks, biggest_bucket, resizes);
#endif
t1 = ast_hashtab_start_traversal(con->root_table);
@@ -2701,7 +2701,7 @@
if (!tmp->pattern_tree && tmp->root_table) {
create_match_char_tree(tmp);
#ifdef NEED_DEBUG
- ast_log(LOG_DEBUG, "Tree Created in context %s:\n", context);
+ ast_debug(1, "Tree Created in context %s:\n", context);
log_match_char_tree(tmp->pattern_tree," ");
#endif
}
@@ -6623,7 +6623,7 @@
if (!dpc->total_items++)
manager_dpsendack(s, m);
astman_append(s, "Event: ListDialplan\r\n%s", actionidtext);
- astman_append(s, "Context: %s\r\nSwitch: %s/%s\r\nRegistrar: %s\r\n", ast_get_context_name(c), ast_get_switch_name(sw), ast_get_switch_data(sw), ast_get_switch_registrar(sw));
+ astman_append(s, "Context: %s\r\nSwitch: %s/%s\r\nRegistrar: %s\r\n", ast_get_context_name(c), ast_get_switch_name(sw), ast_get_switch_data(sw), ast_get_switch_registrar(sw));
astman_append(s, "\r\n");
ast_debug(3, "manager_show_dialplan: Found Switch : %s \n", ast_get_switch_name(sw));
}
Modified: team/may/ooh323_ipv6/main/say.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/main/say.c?view=diff&rev=306957&r1=306956&r2=306957
==============================================================================
--- team/may/ooh323_ipv6/main/say.c (original)
+++ team/may/ooh323_ipv6/main/say.c Tue Feb 8 12:38:33 2011
@@ -794,9 +794,9 @@
}
if (!res) {
if (!ast_streamfile(chan, fn, language)) {
- if ((audiofd > -1) && (ctrlfd > -1))
+ if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
- else
+ else
res = ast_waitstream(chan, ints);
}
ast_stopstream(chan);
@@ -925,9 +925,9 @@
}
if (!res) {
if (!ast_streamfile(chan, fn, language)) {
- if ((audiofd > -1) && (ctrlfd > -1))
+ if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
- else
+ else
res = ast_waitstream(chan, ints);
}
ast_stopstream(chan);
@@ -987,7 +987,7 @@
num -= 100 * hundreds;
if (num)
playa++;
- } else if (num < 1000000) {
+ } else if (num < 1000000) {
res = ast_say_number_full_en_GB(chan, num / 1000, ints, language, audiofd, ctrlfd);
if (res)
return res;
@@ -995,7 +995,7 @@
num %= 1000;
if (num && num < 100)
playa++;
- } else if (num < 1000000000) {
+ } else if (num < 1000000000) {
int millions = num / 1000000;
res = ast_say_number_full_en_GB(chan, millions, ints, language, audiofd, ctrlfd);
if (res)
@@ -1008,12 +1008,12 @@
ast_debug(1, "Number '%d' is too big for me\n", num);
res = -1;
}
-
+
if (!res) {
if (!ast_streamfile(chan, fn, language)) {
- if ((audiofd > -1) && (ctrlfd > -1))
+ if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
- else
+ else
res = ast_waitstream(chan, ints);
}
ast_stopstream(chan);
@@ -1124,7 +1124,7 @@
ast_stopstream(chan);
}
-
+
}
return res;
}
@@ -1774,7 +1774,7 @@
num -= 100 * hundreds;
if (num)
playa++;
- } else if (num < 1000000) {
+ } else if (num < 1000000) {
[... 896 lines stripped ...]
More information about the asterisk-commits
mailing list