[asterisk-commits] pabelanger: branch pabelanger/issue18556 r300211 - in /team/pabelanger/issue1...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jan 4 14:21:45 UTC 2011
Author: pabelanger
Date: Tue Jan 4 08:21:26 2011
New Revision: 300211
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=300211
Log:
find . -type f | grep -v svn | xargs sed -i
's/ast_log(LOG_DEBUG,/ast_debug(1,/g'
Modified:
team/pabelanger/issue18556/addons/chan_ooh323.c
team/pabelanger/issue18556/apps/app_fax.c
team/pabelanger/issue18556/apps/app_meetme.c
team/pabelanger/issue18556/apps/app_rpt.c
team/pabelanger/issue18556/apps/app_voicemail.c
team/pabelanger/issue18556/cel/cel_radius.c
team/pabelanger/issue18556/channels/chan_dahdi.c
team/pabelanger/issue18556/channels/chan_gtalk.c
team/pabelanger/issue18556/channels/chan_iax2.c
team/pabelanger/issue18556/channels/chan_misdn.c
team/pabelanger/issue18556/channels/chan_sip.c
team/pabelanger/issue18556/channels/chan_skinny.c
team/pabelanger/issue18556/channels/sig_pri.c
team/pabelanger/issue18556/codecs/codec_ilbc.c
team/pabelanger/issue18556/include/asterisk/channel.h
team/pabelanger/issue18556/include/asterisk/sched.h
team/pabelanger/issue18556/main/app.c
team/pabelanger/issue18556/main/audiohook.c
team/pabelanger/issue18556/main/channel.c
team/pabelanger/issue18556/main/features.c
team/pabelanger/issue18556/main/http.c
team/pabelanger/issue18556/main/logger.c
team/pabelanger/issue18556/main/manager.c
team/pabelanger/issue18556/main/pbx.c
team/pabelanger/issue18556/main/say.c
team/pabelanger/issue18556/main/taskprocessor.c
team/pabelanger/issue18556/main/xmldoc.c
team/pabelanger/issue18556/pbx/pbx_loopback.c
team/pabelanger/issue18556/pbx/pbx_spool.c
team/pabelanger/issue18556/res/ais/evt.c
team/pabelanger/issue18556/res/res_agi.c
team/pabelanger/issue18556/res/res_config_ldap.c
team/pabelanger/issue18556/res/res_http_post.c
team/pabelanger/issue18556/res/res_jabber.c
team/pabelanger/issue18556/res/res_musiconhold.c
team/pabelanger/issue18556/res/res_odbc.c
team/pabelanger/issue18556/res/res_rtp_asterisk.c
team/pabelanger/issue18556/res/res_smdi.c
team/pabelanger/issue18556/utils/extconf.c
Modified: team/pabelanger/issue18556/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/addons/chan_ooh323.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/addons/chan_ooh323.c (original)
+++ team/pabelanger/issue18556/addons/chan_ooh323.c Tue Jan 4 08:21:26 2011
@@ -1224,7 +1224,7 @@
if (ast->_state != AST_STATE_UP) {
if (!p->progsent) {
if (gH323Debug)
- ast_log(LOG_DEBUG,"Sending manual progress for %s, res = %d\n", callToken,
+ ast_debug(1,"Sending manual progress for %s, res = %d\n", callToken,
ooManualProgress(callToken));
else
ooManualProgress(callToken);
@@ -1235,7 +1235,7 @@
case AST_CONTROL_RINGING:
if (ast->_state == AST_STATE_RING || ast->_state == AST_STATE_RINGING) {
if (gH323Debug)
- ast_log(LOG_DEBUG,"Sending manual ringback for %s, res = %d\n",
+ ast_debug(1,"Sending manual ringback for %s, res = %d\n",
callToken,
ooManualRingback(callToken));
else
@@ -1254,7 +1254,7 @@
break;
}
if (gH323Debug)
- ast_log(LOG_DEBUG, "Sending connected line info for %s (%s)\n",
+ ast_debug(1, "Sending connected line info for %s (%s)\n",
callToken, ast->connected.id.name.str);
ooSetANI(callToken, ast->connected.id.name.str);
break;
@@ -2055,7 +2055,7 @@
while (p->owner) {
if (ast_channel_trylock(p->owner)) {
ooTrace(OOTRCLVLINFO, "Failed to grab lock, trying again\n");
- ast_log(LOG_DEBUG,"Failed to grab lock, trying again\n");
+ ast_debug(1,"Failed to grab lock, trying again\n");
DEADLOCK_AVOIDANCE(&p->lock);
} else {
ownerLock = 1; break;
Modified: team/pabelanger/issue18556/apps/app_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/apps/app_fax.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/apps/app_fax.c (original)
+++ team/pabelanger/issue18556/apps/app_fax.c Tue Jan 4 08:21:26 2011
@@ -172,7 +172,7 @@
} else if (level == SPAN_LOG_WARNING) {
ast_log(LOG_WARNING, "%s", msg);
} else {
- ast_log(LOG_DEBUG, "%s", msg);
+ ast_debug(1, "%s", msg);
}
}
Modified: team/pabelanger/issue18556/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/apps/app_meetme.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/apps/app_meetme.c (original)
+++ team/pabelanger/issue18556/apps/app_meetme.c Tue Jan 4 08:21:26 2011
@@ -2093,7 +2093,7 @@
}
for (res = 1; !conf->announcethread_stop && (current = AST_LIST_REMOVE_HEAD(&local_list, entry)); ao2_ref(current, -1)) {
- ast_log(LOG_DEBUG, "About to play %s\n", current->namerecloc);
+ ast_debug(1, "About to play %s\n", current->namerecloc);
if (!ast_fileexists(current->namerecloc, NULL, NULL))
continue;
if ((current->confchan) && (current->confusers > 1) && !ast_check_hangup(current->confchan)) {
Modified: team/pabelanger/issue18556/apps/app_rpt.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/apps/app_rpt.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/apps/app_rpt.c (original)
+++ team/pabelanger/issue18556/apps/app_rpt.c Tue Jan 4 08:21:26 2011
@@ -1634,7 +1634,7 @@
ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[15], 0);
else {
/* not handled */
- ast_log(LOG_DEBUG, "Unable to generate DTMF tone '%c' for '%s'\n", digit, myrpt->txchannel->name);
+ ast_debug(1, "Unable to generate DTMF tone '%c' for '%s'\n", digit, myrpt->txchannel->name);
}
rpt_mutex_lock(&myrpt->lock);
}
@@ -12495,7 +12495,7 @@
f->data.ptr,f->datalen / 2);
if (n1 != l->wasvox)
{
- if (debug)ast_log(LOG_DEBUG,"Link Node %s, vox %d\n",l->name,n1);
+ if (debug)ast_debug(1,"Link Node %s, vox %d\n",l->name,n1);
l->wasvox = n1;
l->voxtostate = 0;
if (n1) l->voxtotimer = myrpt->p.voxtimeout_ms;
@@ -12844,7 +12844,7 @@
n = dovox(&myrpt->vox,f->data.ptr,f->datalen / 2);
if (n != myrpt->wasvox)
{
- if (debug) ast_log(LOG_DEBUG,"Node %s, vox %d\n",myrpt->name,n);
+ if (debug) ast_debug(1,"Node %s, vox %d\n",myrpt->name,n);
myrpt->wasvox = n;
myrpt->voxtostate = 0;
if (n) myrpt->voxtotimer = myrpt->p.voxtimeout_ms;
Modified: team/pabelanger/issue18556/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/apps/app_voicemail.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/apps/app_voicemail.c (original)
+++ team/pabelanger/issue18556/apps/app_voicemail.c Tue Jan 4 08:21:26 2011
@@ -1755,7 +1755,7 @@
return;
}
if (option_debug > 2)
- ast_log(LOG_DEBUG, "deleting msgnum %d, which is mailbox message %lu\n", msgnum, messageNum);
+ ast_debug(1, "deleting msgnum %d, which is mailbox message %lu\n", msgnum, messageNum);
/* delete message */
snprintf (arg, sizeof(arg), "%lu", messageNum);
ast_mutex_lock(&vms->lock);
@@ -1889,7 +1889,7 @@
}
if (option_debug > 2)
- ast_log(LOG_DEBUG, "Before mail_fetchheaders, curmsg is: %d, imap messages is %lu\n", msgnum, vms->msgArray[msgnum]);
+ ast_debug(1, "Before mail_fetchheaders, curmsg is: %d, imap messages is %lu\n", msgnum, vms->msgArray[msgnum]);
if (vms->msgArray[msgnum] == 0) {
ast_log(LOG_WARNING, "Trying to access unknown message\n");
res = -1;
@@ -2505,10 +2505,10 @@
return -1;
}
if (option_debug > 2)
- ast_log(LOG_DEBUG, "vm_state user is:%s\n", vms->imapuser);
+ ast_debug(1, "vm_state user is:%s\n", vms->imapuser);
if (vms->mailstream == NIL || !vms->mailstream) {
if (option_debug)
- ast_log(LOG_DEBUG, "mailstream not set.\n");
+ ast_debug(1, "mailstream not set.\n");
} else {
stream = vms->mailstream;
}
@@ -2542,7 +2542,7 @@
/* Now connect to the target folder */
imap_mailbox_name(tmp, sizeof(tmp), vms, box, 1);
if (option_debug > 2)
- ast_log(LOG_DEBUG, "Before mail_open, server: %s, box:%d\n", tmp, box);
+ ast_debug(1, "Before mail_open, server: %s, box:%d\n", tmp, box);
ast_mutex_lock(&vms->lock);
vms->mailstream = mail_open (stream, tmp, debug ? OP_DEBUG : NIL);
ast_mutex_unlock(&vms->lock);
@@ -4249,7 +4249,7 @@
}
if (!(msg_cfg = ast_config_load(fromfile, config_flags))) {
if (option_debug > 0) {
- ast_log(LOG_DEBUG, "Config load for message text file '%s' failed\n", fromfile);
+ ast_debug(1, "Config load for message text file '%s' failed\n", fromfile);
}
return;
}
@@ -5654,7 +5654,7 @@
/* If maxmsg is zero, act as a "greetings only" voicemail: Exit successfully without recording */
if (vmu->maxmsg == 0) {
if (option_debug > 2)
- ast_log(LOG_DEBUG, "Greetings only VM (maxmsg=0), Skipping voicemail recording\n");
+ ast_debug(1, "Greetings only VM (maxmsg=0), Skipping voicemail recording\n");
pbx_builtin_setvar_helper(chan, "VMSTATUS", "SUCCESS");
goto leave_vm_out;
}
Modified: team/pabelanger/issue18556/cel/cel_radius.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/cel/cel_radius.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/cel/cel_radius.c (original)
+++ team/pabelanger/issue18556/cel/cel_radius.c Tue Jan 4 08:21:26 2011
@@ -187,7 +187,7 @@
if (build_radius_record(&send, &record)) {
if (option_debug) {
- ast_log(LOG_DEBUG, "Unable to create RADIUS record. CEL not recorded!\n");
+ ast_debug(1, "Unable to create RADIUS record. CEL not recorded!\n");
}
goto return_cleanup;
}
Modified: team/pabelanger/issue18556/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_dahdi.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/channels/chan_dahdi.c (original)
+++ team/pabelanger/issue18556/channels/chan_dahdi.c Tue Jan 4 08:21:26 2011
@@ -1713,7 +1713,7 @@
if (num)
ast_copy_string(numbuf, num, ANALOG_MAX_CID);
- ast_log(LOG_DEBUG, "CallerID number: %s, name: %s, flags=%d\n", num, name, flags);
+ ast_debug(1, "CallerID number: %s, name: %s, flags=%d\n", num, name, flags);
return 0;
}
}
@@ -2213,7 +2213,7 @@
struct dahdi_pvt *p = pvt;
if (p->waitfordialtone && CANPROGRESSDETECT(p) && p->dsp) {
- ast_log(LOG_DEBUG, "Defer dialing for %dms or dialtone\n", p->waitfordialtone);
+ ast_debug(1, "Defer dialing for %dms or dialtone\n", p->waitfordialtone);
gettimeofday(&p->waitingfordt, NULL);
ast_setstate(ast, AST_STATE_OFFHOOK);
}
@@ -2876,7 +2876,7 @@
res = ioctl(p->subs[index].dfd, DAHDI_DIAL, &ddop);
if (res == -1)
- ast_log(LOG_DEBUG, "DAHDI_DIAL ioctl failed on %s: %s\n", p->owner->name, strerror(errno));
+ ast_debug(1, "DAHDI_DIAL ioctl failed on %s: %s\n", p->owner->name, strerror(errno));
return res;
}
@@ -2901,7 +2901,7 @@
index = analogsub_to_dahdisub(sub);
if (ioctl(p->subs[index].dfd, DAHDI_DIALING, &x)) {
- ast_log(LOG_DEBUG, "DAHDI_DIALING ioctl failed!\n");
+ ast_debug(1, "DAHDI_DIALING ioctl failed!\n");
return -1;
}
@@ -3806,13 +3806,13 @@
p->mfcr2_recvd_category = category;
/* if we're not supposed to use CID, clear whatever we have */
if (!p->use_callerid) {
- ast_log(LOG_DEBUG, "No CID allowed in configuration, CID is being cleared!\n");
+ ast_debug(1, "No CID allowed in configuration, CID is being cleared!\n");
p->cid_num[0] = 0;
p->cid_name[0] = 0;
}
/* if we're supposed to answer immediately, clear DNIS and set 's' exten */
if (p->immediate || !openr2_context_get_max_dnis(openr2_chan_get_context(r2chan))) {
- ast_log(LOG_DEBUG, "Setting exten => s because of immediate or 0 DNIS configured\n");
+ ast_debug(1, "Setting exten => s because of immediate or 0 DNIS configured\n");
p->exten[0] = 's';
p->exten[1] = 0;
}
@@ -3835,10 +3835,10 @@
ast_log(LOG_WARNING, "Unable to create PBX channel in DAHDI channel %d\n", p->channel);
dahdi_r2_disconnect_call(p, OR2_CAUSE_OUT_OF_ORDER);
} else if (p->mfcr2_charge_calls) {
- ast_log(LOG_DEBUG, "Accepting MFC/R2 call with charge on chan %d\n", p->channel);
+ ast_debug(1, "Accepting MFC/R2 call with charge on chan %d\n", p->channel);
openr2_chan_accept_call(r2chan, OR2_CALL_WITH_CHARGE);
} else {
- ast_log(LOG_DEBUG, "Accepting MFC/R2 call with no charge on chan %d\n", p->channel);
+ ast_debug(1, "Accepting MFC/R2 call with no charge on chan %d\n", p->channel);
openr2_chan_accept_call(r2chan, OR2_CALL_NO_CHARGE);
}
}
@@ -3870,7 +3870,7 @@
if (!p->mfcr2_accept_on_offer) {
openr2_chan_disable_read(r2chan);
if (p->mfcr2_answer_pending) {
- ast_log(LOG_DEBUG, "Answering MFC/R2 call after accepting it on chan %d\n", openr2_chan_get_number(r2chan));
+ ast_debug(1, "Answering MFC/R2 call after accepting it on chan %d\n", openr2_chan_get_number(r2chan));
dahdi_r2_answer(p);
}
return;
@@ -3904,7 +3904,7 @@
static void dahdi_r2_on_call_read(openr2_chan_t *r2chan, const unsigned char *buf, int buflen)
{
- /*ast_log(LOG_DEBUG, "Read data from dahdi channel %d\n", openr2_chan_get_number(r2chan));*/
+ /*ast_debug(1, "Read data from dahdi channel %d\n", openr2_chan_get_number(r2chan));*/
}
static int dahdi_r2_cause_to_ast_cause(openr2_call_disconnect_cause_t cause)
@@ -3987,11 +3987,11 @@
case OR2_LOG_CAS_TRACE:
case OR2_LOG_DEBUG:
case OR2_LOG_EX_DEBUG:
- ast_log(LOG_DEBUG, "%s", logmessage);
+ ast_debug(1, "%s", logmessage);
break;
default:
ast_log(LOG_WARNING, "We should handle logging level %d here.\n", level);
- ast_log(LOG_DEBUG, "%s", logmessage);
+ ast_debug(1, "%s", logmessage);
break;
}
}
@@ -5793,23 +5793,23 @@
);
if (ast_strlen_zero(data)) {
- ast_log(LOG_DEBUG, "No data sent to application!\n");
+ ast_debug(1, "No data sent to application!\n");
return -1;
}
if (chan->tech != &dahdi_tech) {
- ast_log(LOG_DEBUG, "Only DAHDI technology accepted!\n");
+ ast_debug(1, "Only DAHDI technology accepted!\n");
return -1;
}
pvt = (struct dahdi_pvt *) chan->tech_pvt;
if (!pvt) {
- ast_log(LOG_DEBUG, "Unable to find technology private\n");
+ ast_debug(1, "Unable to find technology private\n");
return -1;
}
switch (pvt->sig) {
case SIG_PRI_LIB_HANDLE_CASES:
break;
default:
- ast_log(LOG_DEBUG, "callrerouting attempted on non-ISDN channel %s\n",
+ ast_debug(1, "callrerouting attempted on non-ISDN channel %s\n",
chan->name);
return -1;
}
@@ -5856,18 +5856,18 @@
);
if (ast_strlen_zero(data)) {
- ast_log(LOG_DEBUG, "No data sent to application!\n");
+ ast_debug(1, "No data sent to application!\n");
return -1;
}
if (chan->tech != &dahdi_tech) {
- ast_log(LOG_DEBUG, "Only DAHDI technology accepted!\n");
+ ast_debug(1, "Only DAHDI technology accepted!\n");
return -1;
}
p = (struct dahdi_pvt *)chan->tech_pvt;
if (!p) {
- ast_log(LOG_DEBUG, "Unable to find technology private!\n");
+ ast_debug(1, "Unable to find technology private!\n");
return -1;
}
@@ -5882,13 +5882,13 @@
ast_mutex_lock(&p->lock);
if (!p->mfcr2 || !p->mfcr2call) {
ast_mutex_unlock(&p->lock);
- ast_log(LOG_DEBUG, "Channel %s does not seems to be an R2 active channel!\n", chan->name);
+ ast_debug(1, "Channel %s does not seems to be an R2 active channel!\n", chan->name);
return -1;
}
if (p->mfcr2_call_accepted) {
ast_mutex_unlock(&p->lock);
- ast_log(LOG_DEBUG, "MFC/R2 call already accepted on channel %s!\n", chan->name);
+ ast_debug(1, "MFC/R2 call already accepted on channel %s!\n", chan->name);
return 0;
}
accept_mode = ast_true(args.charge) ? OR2_CALL_WITH_CHARGE : OR2_CALL_NO_CHARGE;
@@ -5910,7 +5910,7 @@
}
res = ast_waitfor(chan, timeout);
if (res < 0) {
- ast_log(LOG_DEBUG, "ast_waitfor failed on channel %s, going out ...\n", chan->name);
+ ast_debug(1, "ast_waitfor failed on channel %s, going out ...\n", chan->name);
res = -1;
break;
}
@@ -5919,12 +5919,12 @@
}
f = ast_read(chan);
if (!f) {
- ast_log(LOG_DEBUG, "No frame read on channel %s, going out ...\n", chan->name);
+ ast_debug(1, "No frame read on channel %s, going out ...\n", chan->name);
res = -1;
break;
}
if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_HANGUP) {
- ast_log(LOG_DEBUG, "Got HANGUP frame on channel %s, going out ...\n", chan->name);
+ ast_debug(1, "Got HANGUP frame on channel %s, going out ...\n", chan->name);
ast_frfree(f);
res = -1;
break;
@@ -5933,7 +5933,7 @@
ast_mutex_lock(&p->lock);
if (p->mfcr2_call_accepted) {
ast_mutex_unlock(&p->lock);
- ast_log(LOG_DEBUG, "Accepted MFC/R2 call!\n");
+ ast_debug(1, "Accepted MFC/R2 call!\n");
break;
}
ast_mutex_unlock(&p->lock);
@@ -5977,7 +5977,7 @@
r2cause = OR2_CAUSE_NORMAL_CLEARING;
break;
}
- ast_log(LOG_DEBUG, "ast cause %d resulted in openr2 cause %d/%s\n",
+ ast_debug(1, "ast cause %d resulted in openr2 cause %d/%s\n",
cause, r2cause, openr2_proto_get_disconnect_string(r2cause));
return r2cause;
}
@@ -6279,7 +6279,7 @@
/* Perform low level hangup if no owner left */
#ifdef HAVE_OPENR2
if (p->mfcr2 && p->mfcr2call && openr2_chan_get_direction(p->r2chan) != OR2_DIR_STOPPED) {
- ast_log(LOG_DEBUG, "disconnecting MFC/R2 call on chan %d\n", p->channel);
+ ast_debug(1, "disconnecting MFC/R2 call on chan %d\n", p->channel);
/* If it's an incoming call, check the mfcr2_forced_release setting */
if (openr2_chan_get_direction(p->r2chan) == OR2_DIR_BACKWARD && p->mfcr2_forced_release) {
dahdi_r2_disconnect_call(p, OR2_CAUSE_FORCED_RELEASE);
@@ -6291,7 +6291,7 @@
dahdi_r2_disconnect_call(p, r2cause);
}
} else if (p->mfcr2call) {
- ast_log(LOG_DEBUG, "Clearing call request on channel %d\n", p->channel);
+ ast_debug(1, "Clearing call request on channel %d\n", p->channel);
/* since ast_request() was called but not ast_call() we have not yet dialed
and the openr2 stack will not call on_call_end callback, we need to unset
the mfcr2call flag and bump the monitor count so the monitor thread can take
@@ -6438,14 +6438,14 @@
openr2_chan_answer_call will be called when the callback on_call_accepted is executed */
p->mfcr2_answer_pending = 1;
if (p->mfcr2_charge_calls) {
- ast_log(LOG_DEBUG, "Accepting MFC/R2 call with charge before answering on chan %d\n", p->channel);
+ ast_debug(1, "Accepting MFC/R2 call with charge before answering on chan %d\n", p->channel);
openr2_chan_accept_call(p->r2chan, OR2_CALL_WITH_CHARGE);
} else {
- ast_log(LOG_DEBUG, "Accepting MFC/R2 call with no charge before answering on chan %d\n", p->channel);
+ ast_debug(1, "Accepting MFC/R2 call with no charge before answering on chan %d\n", p->channel);
openr2_chan_accept_call(p->r2chan, OR2_CALL_NO_CHARGE);
}
} else {
- ast_log(LOG_DEBUG, "Answering MFC/R2 call on chan %d\n", p->channel);
+ ast_debug(1, "Answering MFC/R2 call on chan %d\n", p->channel);
dahdi_r2_answer(p);
}
break;
@@ -7745,7 +7745,7 @@
if (p->sig != SIG_MFCR2) {
ast_log(LOG_WARNING, "Received bits changed on %s signalling?\n", sig2str(p->sig));
} else {
- ast_log(LOG_DEBUG, "bits changed in chan %d\n", p->channel);
+ ast_debug(1, "bits changed in chan %d\n", p->channel);
openr2_chan_handle_cas(p->r2chan);
}
#else
@@ -7767,7 +7767,7 @@
if (p->inalarm) break;
if ((p->radio || (p->oprmode < 0))) break;
if (ioctl(p->subs[idx].dfd,DAHDI_DIALING,&x) == -1) {
- ast_log(LOG_DEBUG, "DAHDI_DIALING ioctl failed on %s: %s\n",ast->name, strerror(errno));
+ ast_debug(1, "DAHDI_DIALING ioctl failed on %s: %s\n",ast->name, strerror(errno));
return NULL;
}
if (!x) { /* if not still dialing in driver */
@@ -8718,7 +8718,7 @@
if (p->mfcr2_call_accepted &&
!p->mfcr2_progress_sent &&
ast->_state == AST_STATE_RINGING) {
- ast_log(LOG_DEBUG, "Enqueuing progress frame after R2 accept in chan %d\n", p->channel);
+ ast_debug(1, "Enqueuing progress frame after R2 accept in chan %d\n", p->channel);
ast_queue_frame(p->owner, &fr);
p->mfcr2_progress_sent = 1;
}
@@ -8983,7 +8983,7 @@
p->waitingfordt.tv_sec = 0;
p->dsp_features &= ~DSP_FEATURE_WAITDIALTONE;
ast_dsp_set_features(p->dsp, p->dsp_features);
- ast_log(LOG_DEBUG, "Got 10 samples of dialtone!\n");
+ ast_debug(1, "Got 10 samples of dialtone!\n");
if (!ast_strlen_zero(p->dop.dialstr)) { /* Dial deferred digits */
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_DIAL, &p->dop);
if (res < 0) {
@@ -8992,7 +8992,7 @@
ast_mutex_unlock(&p->lock);
return NULL;
} else {
- ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", p->dop.dialstr);
+ ast_debug(1, "Sent deferred digit string: %s\n", p->dop.dialstr);
p->dialing = 1;
p->dop.dialstr[0] = '\0';
p->dop.op = DAHDI_DIAL_OP_REPLACE;
@@ -10424,7 +10424,7 @@
f = ast_read(chan);
if (f->frametype == AST_FRAME_DTMF) {
dtmfbuf[k++] = f->subclass.integer;
- ast_log(LOG_DEBUG, "CID got digit '%c'\n", f->subclass.integer);
+ ast_debug(1, "CID got digit '%c'\n", f->subclass.integer);
res = 2000;
}
ast_frfree(f);
@@ -10436,7 +10436,7 @@
dahdi_setlinear(p->subs[idx].dfd, p->subs[idx].linear);
/* Got cid and ring. */
callerid_get_dtmf(dtmfbuf, dtmfcid, &flags);
- ast_log(LOG_DEBUG, "CID is '%s', flags %d\n",
+ ast_debug(1, "CID is '%s', flags %d\n",
dtmfcid, flags);
/* If first byte is NULL, we have no cid */
if (!ast_strlen_zero(dtmfcid))
@@ -10484,7 +10484,7 @@
}
/* If we get a PR event, they hung up while processing calerid */
if ( res == DAHDI_EVENT_POLARITY && p->hanguponpolarityswitch && p->polarity == POLARITY_REV) {
- ast_log(LOG_DEBUG, "Hanging up due to polarity reversal on channel %d while detecting callerid\n", p->channel);
+ ast_debug(1, "Hanging up due to polarity reversal on channel %d while detecting callerid\n", p->channel);
p->polarity = POLARITY_IDLE;
callerid_free(cs);
ast_hangup(chan);
@@ -11497,7 +11497,7 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- ast_log(LOG_DEBUG, "Maybe some MWI on port %d!\n", i->channel);
+ ast_debug(1, "Maybe some MWI on port %d!\n", i->channel);
if ((mtd = ast_calloc(1, sizeof(*mtd)))) {
mtd->pvt = i;
memcpy(mtd->buf, buf, res);
@@ -11804,7 +11804,7 @@
new_r2link->r2master = AST_PTHREADT_NULL;
r2links[r2links_count] = new_r2link;
r2links_count++;
- ast_log(LOG_DEBUG, "Created new R2 link!\n");
+ ast_debug(1, "Created new R2 link!\n");
}
return r2links[r2links_count - 1];
}
@@ -11895,7 +11895,7 @@
return -EINVAL;
}
num = minor(stbuf.st_rdev);
- ast_log(LOG_DEBUG, "%s -> %d\n", path, num);
+ ast_debug(1, "%s -> %d\n", path, num);
return num;
}
@@ -13282,7 +13282,7 @@
ast_mutex_lock(&p->lock);
if (p->mfcr2call) {
ast_mutex_unlock(&p->lock);
- ast_log(LOG_DEBUG, "Yay!, someone just beat us in the race for channel %d.\n", p->channel);
+ ast_debug(1, "Yay!, someone just beat us in the race for channel %d.\n", p->channel);
goto next;
}
p->mfcr2call = 1;
@@ -13619,7 +13619,7 @@
continue;
}
if (!mfcr2->pvts[i]->r2chan) {
- ast_log(LOG_DEBUG, "Wow, no r2chan on channel %d\n", mfcr2->pvts[i]->channel);
+ ast_debug(1, "Wow, no r2chan on channel %d\n", mfcr2->pvts[i]->channel);
quit_loop = 1;
break;
}
@@ -13633,7 +13633,7 @@
}
if (pollsize == 0) {
if (!was_idle) {
- ast_log(LOG_DEBUG, "Monitor thread going idle since everybody has an owner\n");
+ ast_debug(1, "Monitor thread going idle since everybody has an owner\n");
was_idle = 1;
}
poll(NULL, 0, maxsleep);
@@ -16434,7 +16434,7 @@
return -1;
}
}
- ast_log(LOG_DEBUG, "Channel '%s' configured.\n", v->value);
+ ast_debug(1, "Channel '%s' configured.\n", v->value);
} else if (!strcasecmp(v->name, "ignore_failed_channels")) {
confp->ignore_failed_channels = ast_true(v->value);
} else if (!strcasecmp(v->name, "buffers")) {
Modified: team/pabelanger/issue18556/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_gtalk.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/channels/chan_gtalk.c (original)
+++ team/pabelanger/issue18556/channels/chan_gtalk.c Tue Jan 4 08:21:26 2011
@@ -491,7 +491,7 @@
(redirect = iks_find_cdata(traversenodes, "redirect")) &&
(redirect = strstr(redirect, "xmpp:"))) {
redirect += 5;
- ast_log(LOG_DEBUG, "redirect %s\n", redirect);
+ ast_debug(1, "redirect %s\n", redirect);
ast_copy_string(p->them, redirect, sizeof(p->them));
gtalk_invite(p, p->them, p->us, p->sid, 1);
@@ -617,7 +617,7 @@
char s1[BUFSIZ], s2[BUFSIZ], s3[BUFSIZ];
int peernoncodeccapability;
- ast_log(LOG_DEBUG, "The client is %s\n", client->name);
+ ast_debug(1, "The client is %s\n", client->name);
/* Make sure our new call does exist */
for (tmp = client->p; tmp; tmp = tmp->next) {
@@ -692,7 +692,7 @@
struct gtalk_pvt *tmp;
char *from;
- ast_log(LOG_DEBUG, "The client is %s\n", client->name);
+ ast_debug(1, "The client is %s\n", client->name);
/* find corresponding call */
for (tmp = client->p; tmp; tmp = tmp->next) {
if (iks_find_with_attrib(pak->x, "session", "id", tmp->sid)) {
Modified: team/pabelanger/issue18556/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_iax2.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/channels/chan_iax2.c (original)
+++ team/pabelanger/issue18556/channels/chan_iax2.c Tue Jan 4 08:21:26 2011
@@ -1808,7 +1808,7 @@
ast_mutex_lock(&iaxsl[callno]);
if (iaxs[callno]) {
if (option_debug) {
- ast_log(LOG_DEBUG, "Really destroying %d now...\n", callno);
+ ast_debug(1, "Really destroying %d now...\n", callno);
}
iax2_destroy(callno);
}
Modified: team/pabelanger/issue18556/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_misdn.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/channels/chan_misdn.c (original)
+++ team/pabelanger/issue18556/channels/chan_misdn.c Tue Jan 4 08:21:26 2011
@@ -11967,7 +11967,7 @@
return -1;
}
- ast_log(LOG_DEBUG, "%s(%s)\n", misdn_command_name, (char *) data);
+ ast_debug(1, "%s(%s)\n", misdn_command_name, (char *) data);
parse = ast_strdupa(data);
AST_STANDARD_APP_ARGS(subcommand, parse);
Modified: team/pabelanger/issue18556/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_sip.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/channels/chan_sip.c (original)
+++ team/pabelanger/issue18556/channels/chan_sip.c Tue Jan 4 08:21:26 2011
@@ -23517,7 +23517,7 @@
while (!found_supported && !ast_strlen_zero(acceptheader)) {
found_supported = strcmp(acceptheader, "application/simple-message-summary") ? 0 : 1;
if (!found_supported && (option_debug > 2)) {
- ast_log(LOG_DEBUG, "Received SIP mailbox subscription for unknown format: %s\n", acceptheader);
+ ast_debug(1, "Received SIP mailbox subscription for unknown format: %s\n", acceptheader);
}
acceptheader = __get_header(req, "Accept", &start);
}
Modified: team/pabelanger/issue18556/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/chan_skinny.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/channels/chan_skinny.c (original)
+++ team/pabelanger/issue18556/channels/chan_skinny.c Tue Jan 4 08:21:26 2011
@@ -4458,7 +4458,7 @@
return 0;
} else {
if (option_debug)
- ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n",
+ ast_debug(1, "Neither %s nor %s are in a bridge, nothing to transfer\n",
xferor->owner->name, xferee->owner->name);
}
}
Modified: team/pabelanger/issue18556/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/channels/sig_pri.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/channels/sig_pri.c (original)
+++ team/pabelanger/issue18556/channels/sig_pri.c Tue Jan 4 08:21:26 2011
@@ -914,7 +914,7 @@
{
struct ast_channel *ast;
- ast_log(LOG_DEBUG, "%s %d\n", __FUNCTION__, p->channel);
+ ast_debug(1, "%s %d\n", __FUNCTION__, p->channel);
p->outgoing = 1;
ast = sig_pri_new_ast_channel(p, AST_STATE_RESERVED, law, transfercapability, p->exten, requestor);
@@ -1552,7 +1552,7 @@
timeout = pri_gendigittimeout;
res = ast_waitfordigit(chan, timeout);
if (res < 0) {
- ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n");
+ ast_debug(1, "waitfordigit returned < 0...\n");
ast_hangup(chan);
return NULL;
} else if (res) {
@@ -1607,7 +1607,7 @@
ast_log(LOG_WARNING, "PBX exited non-zero!\n");
}
} else {
- ast_log(LOG_DEBUG, "No such possible extension '%s' in context '%s'\n", exten, chan->context);
+ ast_debug(1, "No such possible extension '%s' in context '%s'\n", exten, chan->context);
chan->hangupcause = AST_CAUSE_UNALLOCATED;
ast_hangup(chan);
p->exten[0] = '\0';
@@ -3412,7 +3412,7 @@
pvt->waiting_for_aoce = 1;
ast_channel_setwhentohangup_tv(pvt->owner, whentohangup);
- ast_log(LOG_DEBUG, "Delaying hangup on %s for aoc-e msg\n", pvt->owner->name);
+ ast_debug(1, "Delaying hangup on %s for aoc-e msg\n", pvt->owner->name);
cleanup_termination_request:
ast_channel_unlock(pvt->owner);
@@ -5830,7 +5830,7 @@
const char *useruser = pbx_builtin_getvar_helper(ast, "USERUSERINFO");
#endif
- ast_log(LOG_DEBUG, "%s %d\n", __FUNCTION__, p->channel);
+ ast_debug(1, "%s %d\n", __FUNCTION__, p->channel);
if (!ast->tech_pvt) {
ast_log(LOG_WARNING, "Asked to hangup channel not connected\n");
return 0;
@@ -5860,7 +5860,7 @@
if (!pri_grab(p, p->pri)) {
if (p->call) {
if (p->alreadyhungup) {
- ast_log(LOG_DEBUG, "Already hungup... Calling hangup once, and clearing call\n");
+ ast_debug(1, "Already hungup... Calling hangup once, and clearing call\n");
#ifdef SUPPORT_USERUSER
pri_call_set_useruser(p->call, useruser);
@@ -5876,7 +5876,7 @@
} else {
const char *cause = pbx_builtin_getvar_helper(ast,"PRI_CAUSE");
int icause = ast->hangupcause ? ast->hangupcause : -1;
- ast_log(LOG_DEBUG, "Not yet hungup... Calling hangup once with icause, and clearing call\n");
+ ast_debug(1, "Not yet hungup... Calling hangup once with icause, and clearing call\n");
#ifdef SUPPORT_USERUSER
pri_call_set_useruser(p->call, useruser);
@@ -6031,7 +6031,7 @@
struct ast_flags opts;
char *opt_args[OPT_ARG_ARRAY_SIZE];
- ast_log(LOG_DEBUG, "CALLER NAME: %s NUM: %s\n",
+ ast_debug(1, "CALLER NAME: %s NUM: %s\n",
S_COR(ast->connected.id.name.valid, ast->connected.id.name.str, ""),
S_COR(ast->connected.id.number.valid, ast->connected.id.number.str, ""));
@@ -6618,7 +6618,7 @@
* and initiate the softhangup since the delay is no longer necessary */
if (p->waiting_for_aoce) {
p->waiting_for_aoce = 0;
- ast_log(LOG_DEBUG,
+ ast_debug(1,
"Received final AOC-E msg, continue with hangup on %s\n",
chan->name);
ast_softhangup_nolock(chan, AST_SOFTHANGUP_DEV);
@@ -7308,7 +7308,7 @@
sig_pri_lock_private(p);
if (!p->pri || !p->call) {
- ast_log(LOG_DEBUG, "Unable to find pri or call on channel!\n");
+ ast_debug(1, "Unable to find pri or call on channel!\n");
sig_pri_unlock_private(p);
return -1;
}
@@ -7317,7 +7317,7 @@
res = pri_callrerouting_facility(p->pri->pri, p->call, destination, original, reason);
pri_rel(p->pri);
} else {
- ast_log(LOG_DEBUG, "Unable to grab pri to send callrerouting facility on span %d!\n", p->pri->span);
+ ast_debug(1, "Unable to grab pri to send callrerouting facility on span %d!\n", p->pri->span);
}
sig_pri_unlock_private(p);
Modified: team/pabelanger/issue18556/codecs/codec_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/codecs/codec_ilbc.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/codecs/codec_ilbc.c (original)
+++ team/pabelanger/issue18556/codecs/codec_ilbc.c Tue Jan 4 08:21:26 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;
}
Modified: team/pabelanger/issue18556/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/include/asterisk/channel.h?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/include/asterisk/channel.h (original)
+++ team/pabelanger/issue18556/include/asterisk/channel.h Tue Jan 4 08:21:26 2011
@@ -2329,7 +2329,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/pabelanger/issue18556/include/asterisk/sched.h
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/include/asterisk/sched.h?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/include/asterisk/sched.h (original)
+++ team/pabelanger/issue18556/include/asterisk/sched.h Tue Jan 4 08:21:26 2011
@@ -50,7 +50,7 @@
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); \
+ ast_debug(1, "Unable to cancel schedule ID %d.\n", id); \
} \
id = -1; \
(_sched_res); \
@@ -88,7 +88,7 @@
ast_mutex_lock(lock); \
} \
if (_count == 10 && option_debug > 2) { \
- ast_log(LOG_DEBUG, "Unable to cancel schedule ID %d.\n", id); \
+ ast_debug(1, "Unable to cancel schedule ID %d.\n", id); \
} \
id = -1; \
(_sched_res); \
Modified: team/pabelanger/issue18556/main/app.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/main/app.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/main/app.c (original)
+++ team/pabelanger/issue18556/main/app.c Tue Jan 4 08:21:26 2011
@@ -1439,9 +1439,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/pabelanger/issue18556/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/main/audiohook.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/main/audiohook.c (original)
+++ team/pabelanger/issue18556/main/audiohook.c Tue Jan 4 08:21:26 2011
@@ -139,14 +139,14 @@
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);
@@ -257,7 +257,7 @@
}
}
} 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) {
@@ -276,7 +276,7 @@
}
}
} 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)
@@ -816,7 +816,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;
}
@@ -854,7 +854,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/pabelanger/issue18556/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue18556/main/channel.c?view=diff&rev=300211&r1=300210&r2=300211
==============================================================================
--- team/pabelanger/issue18556/main/channel.c (original)
+++ team/pabelanger/issue18556/main/channel.c Tue Jan 4 08:21:26 2011
@@ -679,9 +679,9 @@
(AST_LIST_EMPTY(&traced->trace))) {
/* Just do some debug logging */
[... 909 lines stripped ...]
More information about the asterisk-commits
mailing list