diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_agent.c | 47 | ||||
| -rw-r--r-- | channels/chan_alsa.c | 30 | ||||
| -rw-r--r-- | channels/chan_features.c | 3 | ||||
| -rw-r--r-- | channels/chan_gtalk.c | 9 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 103 | ||||
| -rw-r--r-- | channels/chan_jingle.c | 6 | ||||
| -rw-r--r-- | channels/chan_mgcp.c | 49 | ||||
| -rw-r--r-- | channels/chan_misdn.c | 28 | ||||
| -rw-r--r-- | channels/chan_nbs.c | 3 | ||||
| -rw-r--r-- | channels/chan_phone.c | 39 | ||||
| -rw-r--r-- | channels/chan_sip.c | 108 | ||||
| -rw-r--r-- | channels/chan_skinny.c | 15 | ||||
| -rw-r--r-- | channels/chan_zap.c | 518 | ||||
| -rw-r--r-- | channels/iax2-provision.c | 2 |
14 files changed, 625 insertions, 335 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 42d795a06..db545c4b5 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -194,10 +194,12 @@ static AST_LIST_HEAD_STATIC(agents, agent_pvt); /*!< Holds the list of agents (l #define CHECK_FORMATS(ast, p) do { \ if (p->chan) {\ if (ast->nativeformats != p->chan->nativeformats) { \ - ast_log(LOG_DEBUG, "Native formats changing from %d to %d\n", ast->nativeformats, p->chan->nativeformats); \ + if (option_debug) \ + ast_log(LOG_DEBUG, "Native formats changing from %d to %d\n", ast->nativeformats, p->chan->nativeformats); \ /* Native formats changed, reset things */ \ ast->nativeformats = p->chan->nativeformats; \ - ast_log(LOG_DEBUG, "Resetting read to %d and write to %d\n", ast->readformat, ast->writeformat);\ + if (option_debug) \ + ast_log(LOG_DEBUG, "Resetting read to %d and write to %d\n", ast->readformat, ast->writeformat);\ ast_set_read_format(ast, ast->readformat); \ ast_set_write_format(ast, ast->writeformat); \ } \ @@ -442,7 +444,7 @@ static struct ast_frame *agent_read(struct ast_channel *ast) /* Note that we don't hangup if it's not a callback because Asterisk will do it for us when the PBX instance that called login finishes */ if (!ast_strlen_zero(p->loginchan)) { - if (p->chan) + if (p->chan && option_debug) ast_log(LOG_DEBUG, "Bridge on '%s' being cleared (2)\n", p->chan->name); status = pbx_builtin_getvar_helper(p->chan, "CHANLOCALSTATUS"); @@ -513,7 +515,7 @@ static struct ast_frame *agent_read(struct ast_channel *ast) if (p->chan && !p->chan->_bridge) { if (strcasecmp(p->chan->tech->type, "Local")) { p->chan->_bridge = ast; - if (p->chan) + if (p->chan && option_debug) ast_log(LOG_DEBUG, "Bridge on '%s' being set to '%s' (3)\n", p->chan->name, p->chan->_bridge->name); } } @@ -559,9 +561,10 @@ static int agent_write(struct ast_channel *ast, struct ast_frame *f) (f->subclass == p->chan->writeformat)) { res = ast_write(p->chan, f); } else { - ast_log(LOG_DEBUG, "Dropping one incompatible %s frame on '%s' to '%s'\n", - f->frametype == AST_FRAME_VOICE ? "audio" : "video", - ast->name, p->chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Dropping one incompatible %s frame on '%s' to '%s'\n", + f->frametype == AST_FRAME_VOICE ? "audio" : "video", + ast->name, p->chan->name); res = 0; } } @@ -626,7 +629,8 @@ static int agent_call(struct ast_channel *ast, char *dest, int timeout) p->acknowledged = 0; if (!p->chan) { if (p->pending) { - ast_log(LOG_DEBUG, "Pretending to dial on pending agent\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Pretending to dial on pending agent\n"); newstate = AST_STATE_DIALING; res = 0; } else { @@ -759,7 +763,8 @@ static int agent_hangup(struct ast_channel *ast) ast_hangup(p->chan); p->chan = NULL; } - ast_log(LOG_DEBUG, "Hungup, howlong is %d, autologoff is %d\n", howlong, p->autologoff); + if (option_debug) + ast_log(LOG_DEBUG, "Hungup, howlong is %d, autologoff is %d\n", howlong, p->autologoff); if (howlong && p->autologoff && (howlong > p->autologoff)) { long logintime = time(NULL) - p->loginstart; p->loginstart = 0; @@ -826,7 +831,7 @@ static int agent_cont_sleep( void *data ) } ast_mutex_unlock(&p->lock); - if(option_debug > 4 && !res ) + if (option_debug > 4 && !res) ast_log(LOG_DEBUG, "agent_cont_sleep() returning %d\n", res ); return res; @@ -1177,13 +1182,14 @@ static int check_availability(struct agent_pvt *newlyavailable, int needlock) res = 0; } else { if (option_debug > 2) - ast_log( LOG_DEBUG, "Playing beep, lang '%s'\n", newlyavailable->chan->language); + ast_log(LOG_DEBUG, "Playing beep, lang '%s'\n", newlyavailable->chan->language); res = ast_streamfile(newlyavailable->chan, beep, newlyavailable->chan->language); if (option_debug > 2) - ast_log( LOG_DEBUG, "Played beep, result '%d'\n", res); + ast_log(LOG_DEBUG, "Played beep, result '%d'\n", res); if (!res) { res = ast_waitstream(newlyavailable->chan, ""); - ast_log( LOG_DEBUG, "Waited for stream, result '%d'\n", res); + if (option_debug) + ast_log(LOG_DEBUG, "Waited for stream, result '%d'\n", res); } } if (!res) { @@ -1220,7 +1226,8 @@ static int check_beep(struct agent_pvt *newlyavailable, int needlock) struct agent_pvt *p; int res=0; - ast_log(LOG_DEBUG, "Checking beep availability of '%s'\n", newlyavailable->agent); + if (option_debug) + ast_log(LOG_DEBUG, "Checking beep availability of '%s'\n", newlyavailable->agent); if (needlock) AST_LIST_LOCK(&agents); AST_LIST_TRAVERSE(&agents, p, list) { @@ -1241,14 +1248,14 @@ static int check_beep(struct agent_pvt *newlyavailable, int needlock) if (p) { ast_mutex_unlock(&newlyavailable->lock); if (option_debug > 2) - ast_log( LOG_DEBUG, "Playing beep, lang '%s'\n", newlyavailable->chan->language); + ast_log(LOG_DEBUG, "Playing beep, lang '%s'\n", newlyavailable->chan->language); res = ast_streamfile(newlyavailable->chan, beep, newlyavailable->chan->language); if (option_debug > 2) - ast_log( LOG_DEBUG, "Played beep, result '%d'\n", res); + ast_log(LOG_DEBUG, "Played beep, result '%d'\n", res); if (!res) { res = ast_waitstream(newlyavailable->chan, ""); if (option_debug) - ast_log( LOG_DEBUG, "Waited for stream, result '%d'\n", res); + ast_log(LOG_DEBUG, "Waited for stream, result '%d'\n", res); } ast_mutex_lock(&newlyavailable->lock); } @@ -1361,8 +1368,10 @@ static struct ast_channel *agent_request(const char *type, int format, void *dat chan = agent_new(p, AST_STATE_DOWN); if (!chan) ast_log(LOG_WARNING, "Weird... Fix this to drop the unused pending agent\n"); - } else - ast_log(LOG_DEBUG, "Not creating place holder for '%s' since nobody logged in\n", s); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Not creating place holder for '%s' since nobody logged in\n", s); + } } *cause = hasagent ? AST_CAUSE_BUSY : AST_CAUSE_UNREGISTERED; AST_LIST_UNLOCK(&agents); diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 15e0222b7..44dc22fc3 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -366,8 +366,10 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) if (err < 0) { ast_log(LOG_ERROR, "snd_pcm_open failed: %s\n", snd_strerror(err)); return NULL; - } else - ast_log(LOG_DEBUG, "Opening device %s in %s mode\n", dev, (stream == SND_PCM_STREAM_CAPTURE) ? "read" : "write"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Opening device %s in %s mode\n", dev, (stream == SND_PCM_STREAM_CAPTURE) ? "read" : "write"); + } snd_pcm_hw_params_alloca(&hwparams); snd_pcm_hw_params_any(handle, hwparams); @@ -393,15 +395,19 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) err = snd_pcm_hw_params_set_period_size_near(handle, hwparams, &period_size, &direction); if (err < 0) ast_log(LOG_ERROR, "period_size(%ld frames) is bad: %s\n", period_size, snd_strerror(err)); - else - ast_log(LOG_DEBUG, "Period size is %d\n", err); + else { + if (option_debug) + ast_log(LOG_DEBUG, "Period size is %d\n", err); + } buffer_size = 4096 * 2; /* period_size * 16; */ err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &buffer_size); if (err < 0) ast_log(LOG_WARNING, "Problem setting buffer size of %ld: %s\n", buffer_size, snd_strerror(err)); - else - ast_log(LOG_DEBUG, "Buffer size is set to %d frames\n", err); + else { + if (option_debug) + ast_log(LOG_DEBUG, "Buffer size is set to %d frames\n", err); + } #if 0 direction = 0; @@ -460,11 +466,14 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) err = snd_pcm_poll_descriptors_count(handle); if (err <= 0) ast_log(LOG_ERROR, "Unable to get a poll descriptors count, error is %s\n", snd_strerror(err)); - if (err != 1) - ast_log(LOG_DEBUG, "Can't handle more than one device\n"); + if (err != 1) { + if (option_debug) + ast_log(LOG_DEBUG, "Can't handle more than one device\n"); + } snd_pcm_poll_descriptors(handle, &pfd, err); - ast_log(LOG_DEBUG, "Acquired fd %d from the poll descriptor\n", pfd.fd); + if (option_debug) + ast_log(LOG_DEBUG, "Acquired fd %d from the poll descriptor\n", pfd.fd); if (stream == SND_PCM_STREAM_CAPTURE) readdev = pfd.fd; @@ -628,7 +637,8 @@ static int alsa_write(struct ast_channel *chan, struct ast_frame *f) res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2); if (res == -EPIPE) { #if DEBUG - ast_log(LOG_DEBUG, "XRUN write\n"); + if (option_debug) + ast_log(LOG_DEBUG, "XRUN write\n"); #endif snd_pcm_prepare(alsa.ocard); res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2); diff --git a/channels/chan_features.c b/channels/chan_features.c index 273f349d6..3ed41ba76 100644 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -209,7 +209,8 @@ static void swap_subs(struct feature_pvt *p, int a, int b) int tinthreeway; struct ast_channel *towner; - ast_log(LOG_DEBUG, "Swapping %d and %d\n", a, b); + if (option_debug) + ast_log(LOG_DEBUG, "Swapping %d and %d\n", a, b); towner = p->subs[a].owner; tinthreeway = p->subs[a].inthreeway; diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 9346d5ce8..c5a8483e4 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -597,7 +597,8 @@ static int gtalk_is_answered(struct gtalk *client, ikspak *pak) { struct gtalk_pvt *tmp; char *from; - ast_log(LOG_DEBUG, "The client is %s\n", client->name); + if (option_debug) + ast_log(LOG_DEBUG, "The client is %s\n", client->name); /* Make sure our new call doesn't exist yet */ for (tmp = client->p; tmp; tmp = tmp->next) { if (iks_find_with_attrib(pak->x, "session", "id", tmp->sid)) @@ -675,7 +676,8 @@ static int gtalk_hangup_farend(struct gtalk *client, ikspak *pak) struct gtalk_pvt *tmp; char *from; - ast_log(LOG_DEBUG, "The client is %s\n", client->name); + if (option_debug) + ast_log(LOG_DEBUG, "The client is %s\n", client->name); /* Make sure our new call doesn't exist yet */ for (tmp = client->p; tmp; tmp = tmp->next) { if (iks_find_with_attrib(pak->x, "session", "id", tmp->sid)) @@ -1239,7 +1241,8 @@ static struct ast_frame *gtalk_rtp_read(struct ast_channel *ast, struct gtalk_pv /* if ((ast_test_flag(p, SIP_DTMF) == SIP_DTMF_INBAND) && p->vad) { f = ast_dsp_process(p->owner, p->vad, f); if (option_debug && f && (f->frametype == AST_FRAME_DTMF)) - ast_log(LOG_DEBUG, "* Detected inband DTMF '%c'\n", f->subclass); + if (option_debug) + ast_log(LOG_DEBUG, "* Detected inband DTMF '%c'\n", f->subclass); } */ } } diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 4ea3bd831..99949ed9a 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1177,7 +1177,8 @@ static int make_trunk(unsigned short callno, int locked) ast_log(LOG_WARNING, "Unable to trunk call: Insufficient space\n"); return -1; } - ast_log(LOG_DEBUG, "Made call %d into trunk call %d\n", callno, x); + if (option_debug) + ast_log(LOG_DEBUG, "Made call %d into trunk call %d\n", callno, x); /* We move this call from a non-trunked to a trunked call */ update_max_trunk(); update_max_nontrunk(); @@ -2274,7 +2275,8 @@ static int schedule_delivery(struct iax_frame *fr, int updatehistory, int fromtr fr->af.delivery = ast_tvadd(iaxs[fr->callno]->rxcore, ast_samp2tv(fr->ts, 1000)); else { #if 0 - ast_log(LOG_DEBUG, "schedule_delivery: set delivery to 0 as we don't have an rxcore yet, or frame is from trunk.\n"); + if (option_debug) + ast_log(LOG_DEBUG, "schedule_delivery: set delivery to 0 as we don't have an rxcore yet, or frame is from trunk.\n"); #endif fr->af.delivery = ast_tv(0,0); } @@ -2903,7 +2905,8 @@ static int iax2_hangup(struct ast_channel *c) memset(&ied, 0, sizeof(ied)); ast_mutex_lock(&iaxsl[callno]); if (callno && iaxs[callno]) { - ast_log(LOG_DEBUG, "We're hanging up %s now...\n", c->name); + if (option_debug) + ast_log(LOG_DEBUG, "We're hanging up %s now...\n", c->name); alreadygone = ast_test_flag(iaxs[callno], IAX_ALREADYGONE); /* Send the hangup unless we have had a transmission error or are already gone */ iax_ie_append_byte(&ied, IAX_IE_CAUSECODE, (unsigned char)c->hangupcause); @@ -2913,7 +2916,8 @@ static int iax2_hangup(struct ast_channel *c) iax2_predestroy(callno); /* If we were already gone to begin with, destroy us now */ if (alreadygone) { - ast_log(LOG_DEBUG, "Really destroying %s now...\n", c->name); + if (option_debug) + ast_log(LOG_DEBUG, "Really destroying %s now...\n", c->name); iax2_destroy(callno); } } @@ -3509,7 +3513,8 @@ static struct iax2_trunk_peer *find_tpeer(struct sockaddr_in *sin, int fd) #ifdef SO_NO_CHECK setsockopt(tpeer->sockfd, SOL_SOCKET, SO_NO_CHECK, &nochecksums, sizeof(nochecksums)); #endif - ast_log(LOG_DEBUG, "Created trunk peer for '%s:%d'\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port)); + if (option_debug) + ast_log(LOG_DEBUG, "Created trunk peer for '%s:%d'\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port)); AST_LIST_INSERT_TAIL(&tpeers, tpeer, list); } } @@ -3540,7 +3545,8 @@ static int iax2_trunk_queue(struct chan_iax2_pvt *pvt, struct iax_frame *fr) tpeer->trunkdataalloc += DEFAULT_TRUNKDATA; tpeer->trunkdata = tmp; - ast_log(LOG_DEBUG, "Expanded trunk '%s:%d' to %d bytes\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port), tpeer->trunkdataalloc); + if (option_debug) + ast_log(LOG_DEBUG, "Expanded trunk '%s:%d' to %d bytes\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port), tpeer->trunkdataalloc); } else { ast_log(LOG_WARNING, "Maximum trunk data space exceeded to %s:%d\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port)); ast_mutex_unlock(&tpeer->lock); @@ -4471,7 +4477,8 @@ static int iax2_write(struct ast_channel *c, struct ast_frame *f) /* Simple, just queue for transmission */ res = iax2_send(iaxs[callno], f, 0, -1, 0, 0, 0); } else { - ast_log(LOG_DEBUG, "Write error: %s\n", strerror(errno)); + if (option_debug) + ast_log(LOG_DEBUG, "Write error: %s\n", strerror(errno)); } } /* If it's already gone, just return */ @@ -5455,7 +5462,8 @@ static void __expire_registry(void *data) if (!p) return; - ast_log(LOG_DEBUG, "Expiring registration for peer '%s'\n", p->name); + if (option_debug) + ast_log(LOG_DEBUG, "Expiring registration for peer '%s'\n", p->name); if (ast_test_flag((&globalflags), IAX_RTUPDATE) && (ast_test_flag(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS))) realtime_update_peer(p->name, &p->addr, 0); manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: IAX2/%s\r\nPeerStatus: Unregistered\r\nCause: Expired\r\n", p->name); @@ -5869,7 +5877,8 @@ static int send_trunk(struct iax2_trunk_peer *tpeer, struct timeval *now) res = transmit_trunk(fr, &tpeer->addr, tpeer->sockfd); calls = tpeer->calls; #if 0 - ast_log(LOG_DEBUG, "Trunking %d call chunks in %d bytes to %s:%d, ts=%d\n", calls, fr->datalen, ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port), ntohl(mth->ts)); + if (option_debug) + ast_log(LOG_DEBUG, "Trunking %d call chunks in %d bytes to %s:%d, ts=%d\n", calls, fr->datalen, ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port), ntohl(mth->ts)); #endif /* Reset transmit trunk side data */ tpeer->trunkdatalen = 0; @@ -5944,7 +5953,8 @@ static int timing_read(int *id, int fd, short events, void *cbdata) ast_mutex_lock(&drop->lock); /* Once we have this lock, we're sure nobody else is using it or could use it once we release it, because by the time they could get tpeerlock, we've already grabbed it */ - ast_log(LOG_DEBUG, "Dropping unused iax2 trunk peer '%s:%d'\n", ast_inet_ntoa(drop->addr.sin_addr), ntohs(drop->addr.sin_port)); + if (option_debug) + ast_log(LOG_DEBUG, "Dropping unused iax2 trunk peer '%s:%d'\n", ast_inet_ntoa(drop->addr.sin_addr), ntohs(drop->addr.sin_port)); free(drop->trunkdata); ast_mutex_unlock(&drop->lock); ast_mutex_destroy(&drop->lock); @@ -6561,8 +6571,10 @@ static int socket_process(struct iax2_thread *thread) ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } - } else - ast_log(LOG_DEBUG, "Received iseqno %d not within window %d->%d\n", fr->iseqno, iaxs[fr->callno]->rseqno, iaxs[fr->callno]->oseqno); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Received iseqno %d not within window %d->%d\n", fr->iseqno, iaxs[fr->callno]->rseqno, iaxs[fr->callno]->oseqno); + } } if (inaddrcmp(&sin, &iaxs[fr->callno]->addr) && ((f.frametype != AST_FRAME_IAX) || @@ -6593,7 +6605,8 @@ static int socket_process(struct iax2_thread *thread) if (f.frametype == AST_FRAME_VOICE) { if (f.subclass != iaxs[fr->callno]->voiceformat) { iaxs[fr->callno]->voiceformat = f.subclass; - ast_log(LOG_DEBUG, "Ooh, voice format changed to %d\n", f.subclass); + if (option_debug) + ast_log(LOG_DEBUG, "Ooh, voice format changed to %d\n", f.subclass); if (iaxs[fr->callno]->owner) { int orignative; retryowner: @@ -6613,7 +6626,8 @@ retryowner: ast_mutex_unlock(&iaxs[fr->callno]->owner->lock); } } else { - ast_log(LOG_DEBUG, "Neat, somebody took away the channel at a magical time but i found it!\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Neat, somebody took away the channel at a magical time but i found it!\n"); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -6622,7 +6636,8 @@ retryowner: } if (f.frametype == AST_FRAME_VIDEO) { if (f.subclass != iaxs[fr->callno]->videoformat) { - ast_log(LOG_DEBUG, "Ooh, video format changed to %d\n", f.subclass & ~0x1); + if (option_debug) + ast_log(LOG_DEBUG, "Ooh, video format changed to %d\n", f.subclass & ~0x1); iaxs[fr->callno]->videoformat = f.subclass & ~0x1; } } @@ -6888,7 +6903,8 @@ retryowner: break; case IAX_COMMAND_HANGUP: ast_set_flag(iaxs[fr->callno], IAX_ALREADYGONE); - ast_log(LOG_DEBUG, "Immediately destroying %d, having received hangup\n", fr->callno); + if (option_debug) + ast_log(LOG_DEBUG, "Immediately destroying %d, having received hangup\n", fr->callno); /* Set hangup cause according to remote */ if (ies.causecode && iaxs[fr->callno]->owner) iaxs[fr->callno]->owner->hangupcause = ies.causecode; @@ -6906,8 +6922,9 @@ retryowner: ast_log(LOG_WARNING, "Call rejected by %s: %s\n", ast_inet_ntoa(iaxs[fr->callno]->addr.sin_addr), ies.cause ? ies.cause : "<Unknown>"); - ast_log(LOG_DEBUG, "Immediately destroying %d, having received reject\n", - fr->callno); + if (option_debug) + ast_log(LOG_DEBUG, "Immediately destroying %d, having received reject\n", + fr->callno); } /* Send ack immediately, before we destroy */ send_command_immediate(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_ACK, @@ -6924,18 +6941,24 @@ retryowner: if (!strcmp(ies.called_number, ast_parking_ext())) { if (iax_park(ast_bridged_channel(iaxs[fr->callno]->owner), iaxs[fr->callno]->owner)) { ast_log(LOG_WARNING, "Failed to park call on '%s'\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name); - } else - ast_log(LOG_DEBUG, "Parked call on '%s'\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Parked call on '%s'\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name); + } } else { if (ast_async_goto(ast_bridged_channel(iaxs[fr->callno]->owner), iaxs[fr->callno]->context, ies.called_number, 1)) ast_log(LOG_WARNING, "Async goto of '%s' to '%s@%s' failed\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name, ies.called_number, iaxs[fr->callno]->context); - else - ast_log(LOG_DEBUG, "Async goto of '%s' to '%s@%s' started\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name, - ies.called_number, iaxs[fr->callno]->context); + else { + if (option_debug) + ast_log(LOG_DEBUG, "Async goto of '%s' to '%s@%s' started\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name, + ies.called_number, iaxs[fr->callno]->context); + } } - } else + } else { + if (option_debug) ast_log(LOG_DEBUG, "Async goto not applicable on call %d\n", fr->callno); + } break; case IAX_COMMAND_ACCEPT: /* Ignore if call is already up or needs authentication or is a TBD */ @@ -7146,7 +7169,8 @@ retryowner2: } if (!format) { if(!ast_test_flag(iaxs[fr->callno], IAX_CODEC_NOCAP)) { - ast_log(LOG_DEBUG, "We don't do requested format %s, falling back to peer capability %d\n", ast_getformatname(iaxs[fr->callno]->peerformat), iaxs[fr->callno]->peercapability); + if (option_debug) + ast_log(LOG_DEBUG, "We don't do requested format %s, falling back to peer capability %d\n", ast_getformatname(iaxs[fr->callno]->peerformat), iaxs[fr->callno]->peercapability); format = iaxs[fr->callno]->peercapability & iaxs[fr->callno]->capability; } if (!format) { @@ -7265,13 +7289,15 @@ retryowner2: break; case IAX_COMMAND_INVAL: iaxs[fr->callno]->error = ENOTCONN; - ast_log(LOG_DEBUG, "Immediately destroying %d, having received INVAL\n", fr->callno); + if (option_debug) + ast_log(LOG_DEBUG, "Immediately destroying %d, having received INVAL\n", fr->callno); iax2_destroy(fr->callno); if (option_debug) ast_log(LOG_DEBUG, "Destroying call %d\n", fr->callno); break; case IAX_COMMAND_VNAK: - ast_log(LOG_DEBUG, "Received VNAK: resending outstanding frames\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Received VNAK: resending outstanding frames\n"); /* Force retransmission */ vnak_retransmit(fr->callno, fr->iseqno); break; @@ -7427,7 +7453,8 @@ retryowner2: send_command(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_FWDATA, 0, ied0.buf, ied0.pos, -1); break; default: - ast_log(LOG_DEBUG, "Unknown IAX command %d on %d/%d\n", f.subclass, fr->callno, iaxs[fr->callno]->peercallno); + if (option_debug) + ast_log(LOG_DEBUG, "Unknown IAX command %d on %d/%d\n", f.subclass, fr->callno, iaxs[fr->callno]->peercallno); memset(&ied0, 0, sizeof(ied0)); iax_ie_append_byte(&ied0, IAX_IE_IAX_UNKNOWN, f.subclass); send_command(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_UNSUPPORT, 0, ied0.buf, ied0.pos, -1); @@ -7693,7 +7720,8 @@ static int iax2_provision(struct sockaddr_in *end, int sockfd, char *dest, const ast_log(LOG_DEBUG, "Provisioning '%s' from template '%s'\n", dest, template); if (iax_provision_build(&provdata, &sig, template, force)) { - ast_log(LOG_DEBUG, "No provisioning found for template '%s'\n", template); + if (option_debug) + ast_log(LOG_DEBUG, "No provisioning found for template '%s'\n", template); return 0; } @@ -7973,7 +8001,7 @@ static void *sched_thread(void *ignore) pthread_testcancel(); count = ast_sched_runq(sched); - if (count >= 20) + if (count >= 20 && option_debug) ast_log(LOG_DEBUG, "chan_iax2: ast_sched_runq ran %d scheduled tasks all at once\n", count); } @@ -8021,13 +8049,13 @@ static void *network_thread(void *ignore) AST_LIST_TRAVERSE_SAFE_END AST_LIST_UNLOCK(&iaxq.queue); - if (count >= 20) + if (count >= 20 && option_debug) ast_log(LOG_DEBUG, "chan_iax2: Sent %d queued outbound frames all at once\n", count); /* Now do the IO, and run scheduled tasks */ res = ast_io_wait(io, -1); if (res >= 0) { - if (res >= 20) + if (res >= 20 && option_debug) ast_log(LOG_DEBUG, "chan_iax2: ast_io_wait ran %d I/Os all at once\n", res); } } @@ -8101,7 +8129,8 @@ static int check_srcaddr(struct sockaddr *sa, socklen_t salen) res = bind(sd, sa, salen); if (res < 0) { - ast_log(LOG_DEBUG, "Can't bind: %s\n", strerror(errno)); + if (option_debug) + ast_log(LOG_DEBUG, "Can't bind: %s\n", strerror(errno)); close(sd); return 1; } @@ -8160,7 +8189,8 @@ static int peer_set_srcaddr(struct iax2_peer *peer, const char *srcaddr) srcaddr, peer->name); return -1; } else { - ast_log(LOG_DEBUG, "Using sourceaddress %s for '%s'\n", srcaddr, peer->name); + if (option_debug) + ast_log(LOG_DEBUG, "Using sourceaddress %s for '%s'\n", srcaddr, peer->name); return 0; } } @@ -9125,8 +9155,9 @@ static int cache_get_callno_locked(const char *data) if (create_addr(pds.peer, &sin, &cai)) return -1; - ast_log(LOG_DEBUG, "peer: %s, username: %s, password: %s, context: %s\n", - pds.peer, pds.username, pds.password, pds.context); + if (option_debug) + ast_log(LOG_DEBUG, "peer: %s, username: %s, password: %s, context: %s\n", + pds.peer, pds.username, pds.password, pds.context); callno = find_callno(0, 0, &sin, NEW_FORCE, 1, cai.sockfd); if (callno < 1) { diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 6b09815fb..20fa6d083 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -487,7 +487,8 @@ static int jingle_is_answered(struct jingle *client, ikspak *pak) { struct jingle_pvt *tmp; - ast_log(LOG_DEBUG, "The client is %s\n", client->name); + if (option_debug) + ast_log(LOG_DEBUG, "The client is %s\n", client->name); /* Make sure our new call doesn't exist yet */ for (tmp = client->p; tmp; tmp = tmp->next) { if (iks_find_with_attrib(pak->x, GOOGLE_NODE, GOOGLE_SID, tmp->sid)) @@ -555,7 +556,8 @@ static int jingle_hangup_farend(struct jingle *client, ikspak *pak) { struct jingle_pvt *tmp; - ast_log(LOG_DEBUG, "The client is %s\n", client->name); + if (option_debug) + ast_log(LOG_DEBUG, "The client is %s\n", client->name); /* Make sure our new call doesn't exist yet */ for (tmp = client->p; tmp; tmp = tmp->next) { if (iks_find_with_attrib(pak->x, GOOGLE_NODE, GOOGLE_SID, tmp->sid)) diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index fbdf74982..cd2cad804 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -462,7 +462,8 @@ static int unalloc_sub(struct mgcp_subchannel *sub) ast_log(LOG_WARNING, "Trying to unalloc the real channel %s@%s?!?\n", p->name, p->parent->name); return -1; } - ast_log(LOG_DEBUG, "Released sub %d of channel %s@%s\n", sub->id, p->name, p->parent->name); + if (option_debug) + ast_log(LOG_DEBUG, "Released sub %d of channel %s@%s\n", sub->id, p->name, p->parent->name); sub->owner = NULL; if (!ast_strlen_zero(sub->cxident)) { @@ -725,7 +726,8 @@ static int mgcp_postrequest(struct mgcp_endpoint *p, struct mgcp_subchannel *sub /* XXX Should schedule retransmission XXX */ /* SC } else - ast_log(LOG_DEBUG, "Deferring transmission of transaction %d\n", seqno); + if (option_debug) + ast_log(LOG_DEBUG, "Deferring transmission of transaction %d\n", seqno); */ return 0; } @@ -738,7 +740,8 @@ static int send_request(struct mgcp_endpoint *p, struct mgcp_subchannel *sub, struct mgcp_request **queue, *q, *r, *t; ast_mutex_t *l; - ast_log(LOG_DEBUG, "Slow sequence is %d\n", p->slowsequence); + if (option_debug) + ast_log(LOG_DEBUG, "Slow sequence is %d\n", p->slowsequence); if (p->slowsequence) { queue = &p->cmd_queue; l = &p->cmd_queue_lock; @@ -918,11 +921,13 @@ static int mgcp_hangup(struct ast_channel *ast) ast_log(LOG_DEBUG, "mgcp_hangup(%s)\n", ast->name); } if (!ast->tech_pvt) { - ast_log(LOG_DEBUG, "Asked to hangup channel not connected\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Asked to hangup channel not connected\n"); return 0; } if (strcmp(sub->magic, MGCP_SUBCHANNEL_MAGIC)) { - ast_log(LOG_DEBUG, "Invalid magic. MGCP subchannel freed up already.\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Invalid magic. MGCP subchannel freed up already.\n"); return 0; } ast_mutex_lock(&sub->lock); @@ -1195,7 +1200,8 @@ static struct ast_frame *mgcp_rtp_read(struct mgcp_subchannel *sub) /* We already hold the channel lock */ if (f->frametype == AST_FRAME_VOICE) { if (f->subclass != sub->owner->nativeformats) { - ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); + if (option_debug) + ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); sub->owner->nativeformats = f->subclass; ast_set_read_format(sub->owner, sub->owner->readformat); ast_set_write_format(sub->owner, sub->owner->writeformat); @@ -1670,8 +1676,9 @@ static struct mgcp_subchannel *find_subchannel_and_lock(char *name, int msgid, s /* SC */ break; } else if (name && !strcasecmp(p->name, tmp)) { - ast_log(LOG_DEBUG, "Coundn't determine subchannel, assuming current master %s@%s-%d\n", - p->name, g->name, p->sub->id); + if (option_debug) + ast_log(LOG_DEBUG, "Coundn't determine subchannel, assuming current master %s@%s-%d\n", + p->name, g->name, p->sub->id); sub = p->sub; found = 1; break; @@ -2616,7 +2623,8 @@ static void *mgcp_ss(void *data) res = ast_waitfordigit(chan, timeout); timeout = 0; if (res < 0) { - ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ ast_indicate(chan, -1); ast_hangup(chan); @@ -2684,7 +2692,8 @@ static void *mgcp_ss(void *data) timeout = matchdigittimeout; } } else if (res == 0) { - ast_log(LOG_DEBUG, "not enough digits (and no ambiguous match)...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "not enough digits (and no ambiguous match)...\n"); /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION);*/ transmit_notify_request(sub, "G/cg"); /*zt_wait_event(p->subs[index].zfd);*/ @@ -2820,11 +2829,13 @@ static void *mgcp_ss(void *data) for (;;) { res = ast_waitfordigit(chan, to); if (!res) { - ast_log(LOG_DEBUG, "Timeout...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Timeout...\n"); break; } if (res < 0) { - ast_log(LOG_DEBUG, "Got hangup...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Got hangup...\n"); ast_hangup(chan); break; } @@ -2901,8 +2912,9 @@ static int attempt_transfer(struct mgcp_endpoint *p) /* Tell the caller not to hangup */ return 1; } else { - ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n", - p->sub->owner->name, p->sub->next->owner->name); + if (option_debug) + ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n", + p->sub->owner->name, p->sub->next->owner->name); p->sub->next->owner->_softhangup |= AST_SOFTHANGUP_DEV; if (p->sub->next->owner) { p->sub->next->alreadygone = 1; @@ -3068,7 +3080,8 @@ static int handle_request(struct mgcp_subchannel *sub, struct mgcp_request *req, ev = get_header(req, "O"); s = strchr(ev, '/'); if (s) ev = s + 1; - ast_log(LOG_DEBUG, "Endpoint '%s@%s-%d' observed '%s'\n", p->name, p->parent->name, sub->id, ev); + if (option_debug) + ast_log(LOG_DEBUG, "Endpoint '%s@%s-%d' observed '%s'\n", p->name, p->parent->name, sub->id, ev); /* Keep looking for events unless this was a hangup */ if (strcasecmp(ev, "hu") && strcasecmp(ev, "hd") && strcasecmp(ev, "ping")) { transmit_notify_request(sub, p->curtone); @@ -3166,7 +3179,8 @@ static int handle_request(struct mgcp_subchannel *sub, struct mgcp_request *req, } else if (!strcasecmp(ev, "hu")) { p->hookstate = MGCP_ONHOOK; sub->cxmode = MGCP_CX_RECVONLY; - ast_log(LOG_DEBUG, "MGCP %s@%s Went on hook\n", p->name, p->parent->name); + if (option_debug) + ast_log(LOG_DEBUG, "MGCP %s@%s Went on hook\n", p->name, p->parent->name); /* Do we need to send MDCX before a DLCX ? if (sub->rtp) { transmit_modify_request(sub); @@ -3333,7 +3347,8 @@ static int mgcpsock_read(int *id, int fd, short events, void *ignore) ast_mutex_lock(&gw->msgs_lock); for (prev = NULL, cur = gw->msgs; cur; prev = cur, cur = cur->next) { if (cur->seqno == ident) { - ast_log(LOG_DEBUG, "Got response back on transaction %d\n", ident); + if (option_debug) + ast_log(LOG_DEBUG, "Got response back on transaction %d\n", ident); if (prev) prev->next = cur->next; else diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index c1a0f0dfc..2288b1d8c 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -647,9 +647,8 @@ static void send_digit_to_chan(struct chan_list *cl, char digit ) ast_playtones_start(chan,0,dtmf_tones[15], 0); else { /* not handled */ - ast_log(LOG_DEBUG, "Unable to handle DTMF tone '%c' for '%s'\n", digit, chan->name); - - + if (option_debug) + ast_log(LOG_DEBUG, "Unable to handle DTMF tone '%c' for '%s'\n", digit, chan->name); } } /*** CLI HANDLING ***/ @@ -2223,8 +2222,9 @@ static int misdn_hangup(struct ast_channel *ast) { struct chan_list *p; struct misdn_bchannel *bc=NULL; - - ast_log(LOG_DEBUG, "misdn_hangup(%s)\n", ast->name); + + if (option_debug) + ast_log(LOG_DEBUG, "misdn_hangup(%s)\n", ast->name); if (!ast || ! (p=MISDN_ASTERISK_TECH_PVT(ast) ) ) return -1; @@ -2248,7 +2248,8 @@ static int misdn_hangup(struct ast_channel *ast) if (ast->_state == AST_STATE_RESERVED || p->state == MISDN_NOTHING) { /* between request and call */ - ast_log(LOG_DEBUG, "State Reserved (or nothing) => chanIsAvail\n"); + if (option_debug) + ast_log(LOG_DEBUG, "State Reserved (or nothing) => chanIsAvail\n"); MISDN_ASTERISK_TECH_PVT(ast)=NULL; cl_dequeue_chan(&cl_te, p); @@ -2392,7 +2393,8 @@ static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame if (!f || (f->frametype != AST_FRAME_DTMF)) return frame; - ast_log(LOG_DEBUG, "Detected inband DTMF digit: %c\n", f->subclass); + if (option_debug) + ast_log(LOG_DEBUG, "Detected inband DTMF digit: %c\n", f->subclass); if (tmp->faxdetect && (f->subclass == 'f')) { /* Fax tone -- Handle and return NULL */ @@ -2423,15 +2425,19 @@ static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast->name, context); } else ast_log(LOG_NOTICE, "Fax detected, but no fax extension ctx:%s exten:%s\n", context, ast->exten); - } else - ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n"); + } break; case 2: ast_verbose(VERBOSE_PREFIX_3 "Not redirecting %s to fax extension, nojump is set.\n", ast->name); break; } - } else - ast_log(LOG_DEBUG, "Fax already handled\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Fax already handled\n"); + } } if (tmp->ast_dsp && (f->subclass != 'f')) { diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index 30ee32346..340ed2475 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -201,7 +201,8 @@ static struct ast_frame *nbs_xread(struct ast_channel *ast) p->fr.delivery.tv_sec = 0; p->fr.delivery.tv_usec = 0; - ast_log(LOG_DEBUG, "Returning null frame on %s\n", ast->name); + if (option_debug) + ast_log(LOG_DEBUG, "Returning null frame on %s\n", ast->name); return &p->fr; } diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 6e658ad3a..a6e3d7b45 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -214,7 +214,8 @@ static int phone_indicate(struct ast_channel *chan, int condition, const void *d { struct phone_pvt *p = chan->tech_pvt; int res=-1; - ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name); switch(condition) { case AST_CONTROL_FLASH: ioctl(p->fd, IXJCTL_PSTN_SET_STATE, PSTN_ON_HOOK); @@ -370,8 +371,10 @@ static int phone_hangup(struct ast_channel *ast) /* If it's an FXO, hang them up */ if (p->mode == MODE_FXO) { - if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) - ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",ast->name, strerror(errno)); + if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) { + if (option_debug) + ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",ast->name, strerror(errno)); + } } /* If they're off hook, give a busy signal */ @@ -466,10 +469,14 @@ static int phone_answer(struct ast_channel *ast) p = ast->tech_pvt; /* In case it's a LineJack, take it off hook */ if (p->mode == MODE_FXO) { - if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_OFF_HOOK)) - ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n", ast->name, strerror(errno)); - else - ast_log(LOG_DEBUG, "Took linejack off hook\n"); + if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_OFF_HOOK)) { + if (option_debug) + ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n", ast->name, strerror(errno)); + } + else { + if (option_debug) + ast_log(LOG_DEBUG, "Took linejack off hook\n"); + } } phone_setup(ast); if (option_debug) @@ -919,7 +926,8 @@ static void phone_check_exception(struct phone_pvt *i) union telephony_exception phonee; /* XXX Do something XXX */ #if 0 - ast_log(LOG_DEBUG, "Exception!\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Exception!\n"); #endif phonee.bytes = ioctl(i->fd, PHONE_EXCEPTION); if (phonee.bits.dtmf_ready) { @@ -1085,7 +1093,8 @@ static void *do_monitor(void *data) } /* Okay, select has finished. Let's see what happened. */ if (res < 0) { - ast_log(LOG_DEBUG, "select return %d: %s\n", res, strerror(errno)); + if (option_debug) + ast_log(LOG_DEBUG, "select return %d: %s\n", res, strerror(errno)); continue; } /* If there are no fd's changed, just continue, it's probably time @@ -1172,8 +1181,10 @@ static struct phone_pvt *mkif(char *iface, int mode, int txgain, int rxgain) return NULL; } if (mode == MODE_FXO) { - if (ioctl(tmp->fd, IXJCTL_PORT, PORT_PSTN)) - ast_log(LOG_DEBUG, "Unable to set port to PSTN\n"); + if (ioctl(tmp->fd, IXJCTL_PORT, PORT_PSTN)) { + if (option_debug) + ast_log(LOG_DEBUG, "Unable to set port to PSTN\n"); + } } else { if (ioctl(tmp->fd, IXJCTL_PORT, PORT_POTS)) if (mode != MODE_FXS) @@ -1183,8 +1194,10 @@ static struct phone_pvt *mkif(char *iface, int mode, int txgain, int rxgain) ioctl(tmp->fd, PHONE_REC_STOP); ioctl(tmp->fd, PHONE_RING_STOP); ioctl(tmp->fd, PHONE_CPT_STOP); - if (ioctl(tmp->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) - ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",iface, strerror(errno)); + if (ioctl(tmp->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) { + if (option_debug) + ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",iface, strerror(errno)); + } if (echocancel != AEC_OFF) ioctl(tmp->fd, IXJCTL_AEC_START, echocancel); if (silencesupression) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 21ce89647..78ebc97c7 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1569,7 +1569,7 @@ static char *referstatus2str(enum referstatus rstatus) a dialog */ static void initialize_initreq(struct sip_pvt *p, struct sip_request *req) { - if (p->initreq.headers) { + if (p->initreq.headers && option_debug) { ast_log(LOG_DEBUG, "Initializing already initialized SIP dialog %s (presumably reinvite)\n", p->callid); } /* Use this as the basis */ @@ -2002,7 +2002,8 @@ static void __sip_ack(struct sip_pvt *p, int seqno, int resp, int sipmethod, int ((ast_test_flag(cur, FLAG_RESPONSE)) || (!strncasecmp(msg, cur->data, strlen(msg)) && (cur->data[strlen(msg)] < 33)))) { if (!resp && (seqno == p->pendinginvite)) { - ast_log(LOG_DEBUG, "Acked pending invite %d\n", p->pendinginvite); + if (option_debug) + ast_log(LOG_DEBUG, "Acked pending invite %d\n", p->pendinginvite); p->pendinginvite = 0; } /* this is our baby */ @@ -3148,7 +3149,8 @@ static const char *hangup_cause2sip(int cause) case AST_CAUSE_NOTDEFINED: default: - ast_log(LOG_DEBUG, "AST hangup cause %d (no match found in SIP)\n", cause); + if (option_debug) + ast_log(LOG_DEBUG, "AST hangup cause %d (no match found in SIP)\n", cause); return NULL; } @@ -3167,7 +3169,8 @@ static int sip_hangup(struct ast_channel *ast) struct ast_channel *oldowner = ast; if (!p) { - ast_log(LOG_DEBUG, "Asked to hangup channel that was not connected\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Asked to hangup channel that was not connected\n"); return 0; } @@ -3186,8 +3189,10 @@ static int sip_hangup(struct ast_channel *ast) if (option_debug) { if (ast_test_flag(ast, AST_FLAG_ZOMBIE) && p->refer && option_debug) ast_log(LOG_DEBUG, "SIP Transfer: Hanging up Zombie channel %s after transfer ... Call-ID: %s\n", ast->name, p->callid); - else - ast_log(LOG_DEBUG, "Hangup call %s, SIP callid %s)\n", ast->name, p->callid); + else { + if (option_debug) + ast_log(LOG_DEBUG, "Hangup call %s, SIP callid %s)\n", ast->name, p->callid); + } } if (option_debug && ast_test_flag(ast, AST_FLAG_ZOMBIE)) ast_log(LOG_DEBUG, "Hanging up zombie call. Be scared.\n"); @@ -3433,9 +3438,9 @@ static int sip_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) int ret = -1; struct sip_pvt *p; - if (newchan && ast_test_flag(newchan, AST_FLAG_ZOMBIE)) + if (newchan && ast_test_flag(newchan, AST_FLAG_ZOMBIE) && option_debug) ast_log(LOG_DEBUG, "New channel is zombie\n"); - if (oldchan && ast_test_flag(oldchan, AST_FLAG_ZOMBIE)) + if (oldchan && ast_test_flag(oldchan, AST_FLAG_ZOMBIE) && option_debug) ast_log(LOG_DEBUG, "Old channel is zombie\n"); if (!newchan || !newchan->tech_pvt) { @@ -4764,7 +4769,8 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req) framing = strtol(tmp, NULL, 10); if (framing == LONG_MIN || framing == LONG_MAX) { framing = 0; - ast_log(LOG_DEBUG, "Can't read framing from SDP: %s\n", a); + if (option_debug) + ast_log(LOG_DEBUG, "Can't read framing from SDP: %s\n", a); } } if (framing && last_rtpmap_codec) { @@ -7002,7 +7008,8 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char * ast_sched_del(sched, r->timeout); } r->timeout = ast_sched_add(sched, global_reg_timeout * 1000, sip_reg_timeout, r); - ast_log(LOG_DEBUG, "Scheduled a registration timeout for %s id #%d \n", r->hostname, r->timeout); + if (option_debug) + ast_log(LOG_DEBUG, "Scheduled a registration timeout for %s id #%d \n", r->hostname, r->timeout); } if (strchr(r->username, '@')) { @@ -7611,7 +7618,8 @@ static void build_route(struct sip_pvt *p, struct sip_request *req, int backward /* Once a persistant route is set, don't fool with it */ if (p->route && p->route_persistant) { - ast_log(LOG_DEBUG, "build_route: Retaining previous route: <%s>\n", p->route->hop); + if (option_debug) + ast_log(LOG_DEBUG, "build_route: Retaining previous route: <%s>\n", p->route->hop); return; } @@ -8208,7 +8216,8 @@ static int get_destination(struct sip_pvt *p, struct sip_request *oreq) domain_context[0] = '\0'; if (!check_sip_domain(p->domain, domain_context, sizeof(domain_context))) { if (!allow_external_domains && (req->method == SIP_INVITE || req->method == SIP_REFER)) { - ast_log(LOG_DEBUG, "Got SIP %s to non-local domain '%s'; refusing request.\n", sip_methods[req->method].text, p->domain); + if (option_debug) + ast_log(LOG_DEBUG, "Got SIP %s to non-local domain '%s'; refusing request.\n", sip_methods[req->method].text, p->domain); return -2; } } @@ -8861,15 +8870,18 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ } usenatroute = ast_test_flag(&p->flags[0], SIP_NAT_ROUTE); if (p->rtp) { - ast_log(LOG_DEBUG, "Setting NAT on RTP to %s\n", usenatroute ? "On" : "Off"); + if (option_debug) + ast_log(LOG_DEBUG, "Setting NAT on RTP to %s\n", usenatroute ? "On" : "Off"); ast_rtp_setnat(p->rtp, usenatroute); } if (p->vrtp) { - ast_log(LOG_DEBUG, "Setting NAT on VRTP to %s\n", usenatroute ? "On" : "Off"); + if (option_debug) + ast_log(LOG_DEBUG, "Setting NAT on VRTP to %s\n", usenatroute ? "On" : "Off"); ast_rtp_setnat(p->vrtp, usenatroute); } if (p->udptl) { - ast_log(LOG_DEBUG, "Setting NAT on UDPTL to %s\n", usenatroute ? "On" : "Off"); + if (option_debug) + ast_log(LOG_DEBUG, "Setting NAT on UDPTL to %s\n", usenatroute ? "On" : "Off"); ast_udptl_setnat(p->udptl, usenatroute); } ast_string_field_set(p, peersecret, peer->secret); @@ -10409,6 +10421,11 @@ static void sip_dump_history(struct sip_pvt *dialog) if (!dialog) return; + if (!option_debug && !sipdebug) { + ast_log(LOG_NOTICE, "You must have debugging enabled (SIP or Asterisk) in order to dump SIP history.\n"); + return; + } + ast_log(LOG_DEBUG, "\n---------- SIP HISTORY for '%s' \n", dialog->callid); if (dialog->subscribed) ast_log(LOG_DEBUG, " * Subscription\n"); @@ -11220,7 +11237,8 @@ static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req) e = strchr(s, '/'); if (e) *e = '\0'; - ast_log(LOG_DEBUG, "Found promiscuous redirection to 'SIP/%s'\n", s); + if (option_debug) + ast_log(LOG_DEBUG, "Found promiscuous redirection to 'SIP/%s'\n", s); if (p->owner) ast_string_field_build(p->owner, call_forward, "SIP/%s", s); } else { @@ -11284,7 +11302,8 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru } if (ast_test_flag(&p->flags[0], SIP_ALREADYGONE)) { /* This call is already gone */ - ast_log(LOG_DEBUG, "Got response on call that is already terminated: %s (ignoring)\n", p->callid); + if (option_debug) + ast_log(LOG_DEBUG, "Got response on call that is already terminated: %s (ignoring)\n", p->callid); return; } @@ -11602,9 +11621,11 @@ static int handle_response_register(struct sip_pvt *p, int resp, char *rest, str r->regtime = time(NULL); /* Reset time of last succesful registration */ manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelDriver: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate)); r->regattempts = 0; - ast_log(LOG_DEBUG, "Registration successful\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Registration successful\n"); if (r->timeout > -1) { - ast_log(LOG_DEBUG, "Cancelling timeout %d\n", r->timeout); + if (option_debug) + ast_log(LOG_DEBUG, "Cancelling timeout %d\n", r->timeout); ast_sched_del(sched, r->timeout); } r->timeout=-1; @@ -11883,7 +11904,8 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ if (sipmethod == SIP_INVITE) handle_response_invite(p, resp, rest, req, seqno); else { - ast_log(LOG_DEBUG, "Got 491 on %s, unspported. Call ID %s\n", sip_methods[sipmethod].text, p->callid); + if (option_debug) + ast_log(LOG_DEBUG, "Got 491 on %s, unspported. Call ID %s\n", sip_methods[sipmethod].text, p->callid); ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); } break; @@ -11944,7 +11966,8 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ is yet another failure of not having a layer 2 (again, YAY IETF for thinking ahead). So we treat this as a call forward and hope we end up at the right place... */ - ast_log(LOG_DEBUG, "Hairpin detected, setting up call forward for what it's worth\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Hairpin detected, setting up call forward for what it's worth\n"); if (p->owner) ast_string_field_build(p->owner, call_forward, "Local/%s@%s", p->username, p->context); @@ -12010,7 +12033,8 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ if (sipmethod == SIP_INVITE) { handle_response_invite(p, resp, rest, req, seqno); } else if (sipmethod == SIP_CANCEL) { - ast_log(LOG_DEBUG, "Got 200 OK on CANCEL\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Got 200 OK on CANCEL\n"); /* Wait for 487, then destroy */ } else if (sipmethod == SIP_NOTIFY) { @@ -12235,10 +12259,14 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct } ast_channel_unlock(transferer); if (!transferer || !transferee) { - if (!transferer) - ast_log(LOG_DEBUG, "No transferer channel, giving up parking\n"); - if (!transferee) - ast_log(LOG_DEBUG, "No transferee channel, giving up parking\n"); + if (!transferer) { + if (option_debug) + ast_log(LOG_DEBUG, "No transferer channel, giving up parking\n"); + } + if (!transferee) { + if (option_debug) + ast_log(LOG_DEBUG, "No transferee channel, giving up parking\n"); + } return -1; } if ((d = ast_calloc(1, sizeof(*d)))) { @@ -12874,7 +12902,8 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int } } else { p->jointcapability = p->capability; - ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); } if (recordhistory) /* This is a response, note what it was for */ append_history(p, "ReInv", "Re-invite received"); @@ -13269,7 +13298,8 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual * append_history(transferer, "Xfer", "Refer succeeded"); transferer->refer->status = REFER_200OK; if (targetcall_pvt->owner) { - ast_log(LOG_DEBUG, "SIP attended transfer: Unlocking channel %s\n", targetcall_pvt->owner->name); + if (option_debug) + ast_log(LOG_DEBUG, "SIP attended transfer: Unlocking channel %s\n", targetcall_pvt->owner->name); ast_channel_unlock(targetcall_pvt->owner); } } @@ -13397,13 +13427,13 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int case -2: /* Syntax error */ transmit_response(p, "400 Bad Request (Refer-to missing)", req); append_history(p, "Xfer", "Refer failed. Refer-to missing."); - if (ast_test_flag(req, SIP_PKT_DEBUG)) + if (ast_test_flag(req, SIP_PKT_DEBUG) && option_debug) ast_log(LOG_DEBUG, "SIP transfer to black hole can't be handled (no refer-to: )\n"); break; case -3: transmit_response(p, "603 Declined (Non sip: uri)", req); append_history(p, "Xfer", "Refer failed. Non SIP uri"); - if (ast_test_flag(req, SIP_PKT_DEBUG)) + if (ast_test_flag(req, SIP_PKT_DEBUG) && option_debug) ast_log(LOG_DEBUG, "SIP transfer to non-SIP uri denied\n"); break; default: @@ -13412,7 +13442,7 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int append_history(p, "Xfer", "Refer failed. Bad extension."); transmit_notify_with_sipfrag(p, seqno, "404 Not found", TRUE); ast_clear_flag(&p->flags[0], SIP_GOTREFER); - if (ast_test_flag(req, SIP_PKT_DEBUG)) + if (ast_test_flag(req, SIP_PKT_DEBUG) && option_debug) ast_log(LOG_DEBUG, "SIP transfer to bad extension: %s\n", p->refer->refer_to); break; } @@ -13770,13 +13800,16 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, /* For transfers, this could happen, but since we haven't seen it happening, let us just refuse this */ transmit_response(p, "403 Forbidden (within dialog)", req); /* Do not destroy session, since we will break the call if we do */ - ast_log(LOG_DEBUG, "Got a subscription within the context of another call, can't handle that - %s (Method %s)\n", p->callid, sip_methods[p->initreq.method].text); + if (option_debug) + ast_log(LOG_DEBUG, "Got a subscription within the context of another call, can't handle that - %s (Method %s)\n", p->callid, sip_methods[p->initreq.method].text); return 0; } else if (ast_test_flag(req, SIP_PKT_DEBUG)) { - if (resubscribe) - ast_log(LOG_DEBUG, "Got a re-subscribe on existing subscription %s\n", p->callid); - else - ast_log(LOG_DEBUG, "Got a new subscription %s (possibly with auth)\n", p->callid); + if (option_debug) { + if (resubscribe) + ast_log(LOG_DEBUG, "Got a re-subscribe on existing subscription %s\n", p->callid); + else + ast_log(LOG_DEBUG, "Got a new subscription %s (possibly with auth)\n", p->callid); + } } } @@ -15041,7 +15074,8 @@ static struct sip_auth *add_realm_authentication(struct sip_auth *authlist, char if (ast_strlen_zero(configuration)) return authlist; - ast_log(LOG_DEBUG, "Auth config :: %s\n", configuration); + if (option_debug) + ast_log(LOG_DEBUG, "Auth config :: %s\n", configuration); ast_copy_string(authcopy, configuration, sizeof(authcopy)); stringp = authcopy; diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 232bfd1ca..57fb071e8 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -2297,7 +2297,8 @@ static void *skinny_ss(void *data) timeout = matchdigittimeout; } } else if (res == 0) { - ast_log(LOG_DEBUG, "Not enough digits (and no ambiguous match)...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Not enough digits (and no ambiguous match)...\n"); transmit_tone(s, SKINNY_REORDER); ast_hangup(c); return NULL; @@ -2384,7 +2385,8 @@ static int skinny_hangup(struct ast_channel *ast) struct skinnysession *s; if (!sub) { - ast_log(LOG_DEBUG, "Asked to hangup channel not connected\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Asked to hangup channel not connected\n"); return 0; } l = sub->parent; @@ -2487,7 +2489,8 @@ static struct ast_frame *skinny_rtp_read(struct skinny_subchannel *sub) /* We already hold the channel lock */ if (f->frametype == AST_FRAME_VOICE) { if (f->subclass != ast->nativeformats) { - ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); + if (option_debug) + ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); ast->nativeformats = f->subclass; ast_set_read_format(ast, ast->readformat); ast_set_write_format(ast, ast->writeformat); @@ -3161,7 +3164,8 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession ast_setstate(sub->owner, AST_STATE_UP); } else { if (sub && sub->owner) { - ast_log(LOG_DEBUG, "Current subchannel [%s] already has owner\n", sub->owner->name); + if (option_debug) + ast_log(LOG_DEBUG, "Current subchannel [%s] already has owner\n", sub->owner->name); } else { c = skinny_new(l, AST_STATE_DOWN); if(c) { @@ -3237,7 +3241,8 @@ static int handle_offhook_message(struct skinny_req *req, struct skinnysession * ast_setstate(sub->owner, AST_STATE_UP); } else { if (sub && sub->owner) { - ast_log(LOG_DEBUG, "Current sub [%s] already has owner\n", sub->owner->name); + if (option_debug) + ast_log(LOG_DEBUG, "Current sub [%s] already has owner\n", sub->owner->name); } else { c = skinny_new(l, AST_STATE_DOWN); if(c) { diff --git a/channels/chan_zap.c b/channels/chan_zap.c index e0d2308ef..da1d48233 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -975,7 +975,8 @@ static void swap_subs(struct zt_pvt *p, int a, int b) int tinthreeway; struct ast_channel *towner; - ast_log(LOG_DEBUG, "Swapping %d and %d\n", a, b); + if (option_debug) + ast_log(LOG_DEBUG, "Swapping %d and %d\n", a, b); tchan = p->subs[a].chan; towner = p->subs[a].owner; @@ -1095,7 +1096,8 @@ static int unalloc_sub(struct zt_pvt *p, int x) ast_log(LOG_WARNING, "Trying to unalloc the real channel %d?!?\n", p->channel); return -1; } - ast_log(LOG_DEBUG, "Released sub %d of channel %d\n", x, p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Released sub %d of channel %d\n", x, p->channel); if (p->subs[x].zfd > -1) { zt_close(p->subs[x].zfd); } @@ -1150,7 +1152,8 @@ static int zt_digit_begin(struct ast_channel *chan, char digit) ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", pvt->span); } else if (strlen(pvt->dialdest) < sizeof(pvt->dialdest) - 1) { int res; - ast_log(LOG_DEBUG, "Queueing digit '%c' since setup_ack not yet received\n", digit); + if (option_debug) + ast_log(LOG_DEBUG, "Queueing digit '%c' since setup_ack not yet received\n", digit); res = strlen(pvt->dialdest); pvt->dialdest[res++] = digit; pvt->dialdest[res] = '\0'; @@ -1174,7 +1177,8 @@ static int zt_digit_begin(struct ast_channel *chan, char digit) else pvt->dialing = 1; } else { - ast_log(LOG_DEBUG, "Started VLDTMF digit '%c'\n", digit); + if (option_debug) + ast_log(LOG_DEBUG, "Started VLDTMF digit '%c'\n", digit); pvt->dialing = 1; pvt->begindigit = digit; } @@ -1209,7 +1213,8 @@ static int zt_digit_end(struct ast_channel *chan, char digit) if (pvt->begindigit) { x = -1; - ast_log(LOG_DEBUG, "Ending VLDTMF digit '%c'\n", digit); + if (option_debug) + ast_log(LOG_DEBUG, "Ending VLDTMF digit '%c'\n", digit); res = ioctl(pvt->subs[SUB_REAL].zfd, ZT_SENDTONE, &x); pvt->dialing = 0; pvt->begindigit = 0; @@ -1383,7 +1388,8 @@ static int conf_add(struct zt_pvt *p, struct zt_subchannel *c, int index, int sl p->confno = zi.confno; } memcpy(&c->curconf, &zi, sizeof(c->curconf)); - ast_log(LOG_DEBUG, "Added %d to conference %d/%d\n", c->zfd, c->curconf.confmode, c->curconf.confno); + if (option_debug) + ast_log(LOG_DEBUG, "Added %d to conference %d/%d\n", c->zfd, c->curconf.confmode, c->curconf.confno); return 0; } @@ -1415,7 +1421,8 @@ static int conf_del(struct zt_pvt *p, struct zt_subchannel *c, int index) ast_log(LOG_WARNING, "Failed to drop %d from conference %d/%d\n", c->zfd, c->curconf.confmode, c->curconf.confno); return -1; } - ast_log(LOG_DEBUG, "Removed %d from conference %d/%d\n", c->zfd, c->curconf.confmode, c->curconf.confno); + if (option_debug) + ast_log(LOG_DEBUG, "Removed %d from conference %d/%d\n", c->zfd, c->curconf.confmode, c->curconf.confno); memcpy(&c->curconf, &zi, sizeof(c->curconf)); return 0; } @@ -1529,7 +1536,8 @@ static int update_conf(struct zt_pvt *p) Kill it. */ p->confno = -1; } - ast_log(LOG_DEBUG, "Updated conferencing on %d, with %d conference users\n", p->channel, needconf); + if (option_debug) + ast_log(LOG_DEBUG, "Updated conferencing on %d, with %d conference users\n", p->channel, needconf); return 0; } @@ -1540,11 +1548,13 @@ static void zt_enable_ec(struct zt_pvt *p) if (!p) return; if (p->echocanon) { - ast_log(LOG_DEBUG, "Echo cancellation already on\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Echo cancellation already on\n"); return; } if (p->digital) { - ast_log(LOG_DEBUG, "Echo cancellation isn't required on digital connection\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Echo cancellation isn't required on digital connection\n"); return; } if (p->echocancel) { @@ -1560,10 +1570,13 @@ static void zt_enable_ec(struct zt_pvt *p) ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d\n", p->channel); else { p->echocanon = 1; - ast_log(LOG_DEBUG, "Enabled echo cancellation on channel %d\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Enabled echo cancellation on channel %d\n", p->channel); } - } else - ast_log(LOG_DEBUG, "No echo cancellation requested\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "No echo cancellation requested\n"); + } } static void zt_train_ec(struct zt_pvt *p) @@ -1576,10 +1589,13 @@ static void zt_train_ec(struct zt_pvt *p) if (res) ast_log(LOG_WARNING, "Unable to request echo training on channel %d\n", p->channel); else { - ast_log(LOG_DEBUG, "Engaged echo training on channel %d\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Engaged echo training on channel %d\n", p->channel); } - } else - ast_log(LOG_DEBUG, "No echo training requested\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "No echo training requested\n"); + } } static void zt_disable_ec(struct zt_pvt *p) @@ -1591,8 +1607,10 @@ static void zt_disable_ec(struct zt_pvt *p) res = ioctl(p->subs[SUB_REAL].zfd, ZT_ECHOCANCEL, &x); if (res) ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d\n", p->channel); - else - ast_log(LOG_DEBUG, "disabled echo cancellation on channel %d\n", p->channel); + else { + if (option_debug) + ast_log(LOG_DEBUG, "disabled echo cancellation on channel %d\n", p->channel); + } } p->echocanon = 0; } @@ -1674,7 +1692,8 @@ static int set_actual_txgain(int fd, int chan, float gain, int law) g.chan = chan; res = ioctl(fd, ZT_GETGAINS, &g); if (res) { - ast_log(LOG_DEBUG, "Failed to read gains: %s\n", strerror(errno)); + if (option_debug) + ast_log(LOG_DEBUG, "Failed to read gains: %s\n", strerror(errno)); return res; } @@ -1692,7 +1711,8 @@ static int set_actual_rxgain(int fd, int chan, float gain, int law) g.chan = chan; res = ioctl(fd, ZT_GETGAINS, &g); if (res) { - ast_log(LOG_DEBUG, "Failed to read gains: %s\n", strerror(errno)); + if (option_debug) + ast_log(LOG_DEBUG, "Failed to read gains: %s\n", strerror(errno)); return res; } @@ -1977,7 +1997,8 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout) if (c) { p->dop.op = ZT_DIAL_OP_REPLACE; snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "Tw%s", c); - ast_log(LOG_DEBUG, "FXO: setup deferred dialstring: %s\n", c); + if (option_debug) + ast_log(LOG_DEBUG, "FXO: setup deferred dialstring: %s\n", c); } else { p->dop.dialstr[0] = '\0'; } @@ -2069,7 +2090,8 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout) #ifdef HAVE_PRI } #endif - ast_log(LOG_DEBUG, "Dialing '%s'\n", c); + if (option_debug) + ast_log(LOG_DEBUG, "Dialing '%s'\n", c); p->dop.op = ZT_DIAL_OP_REPLACE; c += p->stripmsd; @@ -2144,8 +2166,10 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout) ast_mutex_unlock(&p->lock); return -1; } - } else - ast_log(LOG_DEBUG, "Deferring dialing...\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Deferring dialing...\n"); + } p->dialing = 1; if (ast_strlen_zero(c)) p->dialednone = 1; @@ -2161,7 +2185,8 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout) p->dialdest[0] = '\0'; break; default: - ast_log(LOG_DEBUG, "not yet implemented\n"); + if (option_debug) + ast_log(LOG_DEBUG, "not yet implemented\n"); ast_mutex_unlock(&p->lock); return -1; } @@ -2258,10 +2283,13 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout) } if (p->bearer || (mysig == SIG_FXSKS)) { if (p->bearer) { - ast_log(LOG_DEBUG, "Oooh, I have a bearer on %d (%d:%d)\n", PVT_TO_CHANNEL(p->bearer), p->bearer->logicalspan, p->bearer->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Oooh, I have a bearer on %d (%d:%d)\n", PVT_TO_CHANNEL(p->bearer), p->bearer->logicalspan, p->bearer->channel); p->bearer->call = p->call; - } else - ast_log(LOG_DEBUG, "I'm being setup with no bearer right now...\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "I'm being setup with no bearer right now...\n"); + } pri_set_crv(p->pri->pri, p->call, p->channel, 0); } p->digital = IS_DIGITAL(ast->transfercapability); @@ -2442,21 +2470,24 @@ static int zap_send_keypad_facility_exec(struct ast_channel *chan, void *data) char *digits = (char *) data; if (ast_strlen_zero(digits)) { - ast_log(LOG_DEBUG, "No digit string sent to application!\n"); + if (option_debug) + ast_log(LOG_DEBUG, "No digit string sent to application!\n"); return -1; } p = (struct zt_pvt *)chan->tech_pvt; if (!p) { - ast_log(LOG_DEBUG, "Unable to find technology private\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Unable to find technology private\n"); return -1; } ast_mutex_lock(&p->lock); if (!p->pri || !p->call) { - ast_log(LOG_DEBUG, "Unable to find pri or call on channel!\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Unable to find pri or call on channel!\n"); ast_mutex_unlock(&p->lock); return -1; } @@ -2465,7 +2496,8 @@ static int zap_send_keypad_facility_exec(struct ast_channel *chan, void *data) pri_keypad_facility(p->pri->pri, p->call, digits); pri_rel(p->pri); } else { - ast_log(LOG_DEBUG, "Unable to grab pri to send keypad facility!\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Unable to grab pri to send keypad facility!\n"); ast_mutex_unlock(&p->lock); return -1; } @@ -2598,8 +2630,9 @@ static int zt_hangup(struct ast_channel *ast) if (p->exten) p->exten[0] = '\0'; - ast_log(LOG_DEBUG, "Hangup: channel: %d index = %d, normal = %d, callwait = %d, thirdcall = %d\n", - p->channel, index, p->subs[SUB_REAL].zfd, p->subs[SUB_CALLWAIT].zfd, p->subs[SUB_THREEWAY].zfd); + if (option_debug) + ast_log(LOG_DEBUG, "Hangup: channel: %d index = %d, normal = %d, callwait = %d, thirdcall = %d\n", + p->channel, index, p->subs[SUB_REAL].zfd, p->subs[SUB_CALLWAIT].zfd, p->subs[SUB_THREEWAY].zfd); p->ignoredtmf = 0; if (index > -1) { @@ -2616,27 +2649,32 @@ static int zt_hangup(struct ast_channel *ast) zt_setlinear(p->subs[index].zfd, 0); if (index == SUB_REAL) { if ((p->subs[SUB_CALLWAIT].zfd > -1) && (p->subs[SUB_THREEWAY].zfd > -1)) { - ast_log(LOG_DEBUG, "Normal call hung up with both three way call and a call waiting call in place?\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Normal call hung up with both three way call and a call waiting call in place?\n"); if (p->subs[SUB_CALLWAIT].inthreeway) { /* We had flipped over to answer a callwait and now it's gone */ - ast_log(LOG_DEBUG, "We were flipped over to the callwait, moving back and unowning.\n"); + if (option_debug) + ast_log(LOG_DEBUG, "We were flipped over to the callwait, moving back and unowning.\n"); /* Move to the call-wait, but un-own us until they flip back. */ swap_subs(p, SUB_CALLWAIT, SUB_REAL); unalloc_sub(p, SUB_CALLWAIT); p->owner = NULL; } else { /* The three way hung up, but we still have a call wait */ - ast_log(LOG_DEBUG, "We were in the threeway and have a callwait still. Ditching the threeway.\n"); + if (option_debug) + ast_log(LOG_DEBUG, "We were in the threeway and have a callwait still. Ditching the threeway.\n"); swap_subs(p, SUB_THREEWAY, SUB_REAL); unalloc_sub(p, SUB_THREEWAY); if (p->subs[SUB_REAL].inthreeway) { /* This was part of a three way call. Immediately make way for another call */ - ast_log(LOG_DEBUG, "Call was complete, setting owner to former third call\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Call was complete, setting owner to former third call\n"); p->owner = p->subs[SUB_REAL].owner; } else { /* This call hasn't been completed yet... Set owner to NULL */ - ast_log(LOG_DEBUG, "Call was incomplete, setting owner to NULL\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Call was incomplete, setting owner to NULL\n"); p->owner = NULL; } p->subs[SUB_REAL].inthreeway = 0; @@ -2656,11 +2694,13 @@ static int zt_hangup(struct ast_channel *ast) if (p->subs[SUB_REAL].inthreeway) { /* This was part of a three way call. Immediately make way for another call */ - ast_log(LOG_DEBUG, "Call was complete, setting owner to former third call\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Call was complete, setting owner to former third call\n"); p->owner = p->subs[SUB_REAL].owner; } else { /* This call hasn't been completed yet... Set owner to NULL */ - ast_log(LOG_DEBUG, "Call was incomplete, setting owner to NULL\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Call was incomplete, setting owner to NULL\n"); p->owner = NULL; } p->subs[SUB_REAL].inthreeway = 0; @@ -2756,7 +2796,8 @@ static int zt_hangup(struct ast_channel *ast) if (p->call && (!p->bearer || (p->bearer->call == p->call))) { if (!pri_grab(p, p->pri)) { if (p->alreadyhungup) { - ast_log(LOG_DEBUG, "Already hungup... Calling hangup once, and clearing call\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Already hungup... Calling hangup once, and clearing call\n"); #ifdef SUPPORT_USERUSER pri_call_set_useruser(p->call, useruser); @@ -2769,7 +2810,8 @@ static int zt_hangup(struct ast_channel *ast) } 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"); + if (option_debug) + ast_log(LOG_DEBUG, "Not yet hungup... Calling hangup once with icause, and clearing call\n"); #ifdef SUPPORT_USERUSER pri_call_set_useruser(p->call, useruser); @@ -2793,7 +2835,8 @@ static int zt_hangup(struct ast_channel *ast) } } else { if (p->bearer) - ast_log(LOG_DEBUG, "Bearer call is %p, while ours is still %p\n", p->bearer->call, p->call); + if (option_debug) + ast_log(LOG_DEBUG, "Bearer call is %p, while ours is still %p\n", p->bearer->call, p->call); p->call = NULL; res = 0; } @@ -2811,7 +2854,8 @@ static int zt_hangup(struct ast_channel *ast) res = ioctl(p->subs[SUB_REAL].zfd, ZT_GET_PARAMS, &par); if (!res) { #if 0 - ast_log(LOG_DEBUG, "Hanging up channel %d, offhook = %d\n", p->channel, par.rxisoffhook); + if (option_debug) + ast_log(LOG_DEBUG, "Hanging up channel %d, offhook = %d\n", p->channel, par.rxisoffhook); #endif /* If they're off hook, try playing congestion */ if ((par.rxisoffhook) && (!(p->radio || (p->oprmode < 0)))) @@ -2856,7 +2900,8 @@ static int zt_hangup(struct ast_channel *ast) } #ifdef HAVE_PRI if (p->bearer) { - ast_log(LOG_DEBUG, "Freeing up bearer channel %d\n", p->bearer->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Freeing up bearer channel %d\n", p->bearer->channel); /* Free up the bearer channel as well, and don't use its file descriptor anymore */ update_conf(p->bearer); @@ -2940,7 +2985,8 @@ static int zt_answer(struct ast_channel *ast) case SIG_FXOGS: case SIG_FXOKS: /* Pick up the line */ - ast_log(LOG_DEBUG, "Took %s off hook\n", ast->name); + if (option_debug) + ast_log(LOG_DEBUG, "Took %s off hook\n", ast->name); if (p->hanguponpolarityswitch) { gettimeofday(&p->polaritydelaytv, NULL); } @@ -2949,7 +2995,8 @@ static int zt_answer(struct ast_channel *ast) p->dialing = 0; if ((index == SUB_REAL) && p->subs[SUB_THREEWAY].inthreeway) { if (oldstate == AST_STATE_RINGING) { - ast_log(LOG_DEBUG, "Finally swapping real and threeway\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Finally swapping real and threeway\n"); tone_zone_play_tone(p->subs[SUB_THREEWAY].zfd, -1); swap_subs(p, SUB_THREEWAY, SUB_REAL); p->owner = p->subs[SUB_REAL].owner; @@ -3020,7 +3067,8 @@ static int zt_setoption(struct ast_channel *chan, int option, void *data, int da ast_log(LOG_WARNING, "No index in TXGAIN?\n"); return -1; } - ast_log(LOG_DEBUG, "Setting actual tx gain on %s to %f\n", chan->name, p->txgain + (float) *scp); + if (option_debug) + ast_log(LOG_DEBUG, "Setting actual tx gain on %s to %f\n", chan->name, p->txgain + (float) *scp); return set_actual_txgain(p->subs[index].zfd, 0, p->txgain + (float) *scp, p->law); case AST_OPTION_RXGAIN: scp = (signed char *) data; @@ -3029,7 +3077,8 @@ static int zt_setoption(struct ast_channel *chan, int option, void *data, int da ast_log(LOG_WARNING, "No index in RXGAIN?\n"); return -1; } - ast_log(LOG_DEBUG, "Setting actual rx gain on %s to %f\n", chan->name, p->rxgain + (float) *scp); + if (option_debug) + ast_log(LOG_DEBUG, "Setting actual rx gain on %s to %f\n", chan->name, p->rxgain + (float) *scp); return set_actual_rxgain(p->subs[index].zfd, 0, p->rxgain + (float) *scp, p->law); case AST_OPTION_TONE_VERIFY: if (!p->dsp) @@ -3037,15 +3086,18 @@ static int zt_setoption(struct ast_channel *chan, int option, void *data, int da cp = (char *) data; switch (*cp) { case 1: - ast_log(LOG_DEBUG, "Set option TONE VERIFY, mode: MUTECONF(1) on %s\n",chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Set option TONE VERIFY, mode: MUTECONF(1) on %s\n",chan->name); ast_dsp_digitmode(p->dsp,DSP_DIGITMODE_MUTECONF | p->dtmfrelax); /* set mute mode if desired */ break; case 2: - ast_log(LOG_DEBUG, "Set option TONE VERIFY, mode: MUTECONF/MAX(2) on %s\n",chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Set option TONE VERIFY, mode: MUTECONF/MAX(2) on %s\n",chan->name); ast_dsp_digitmode(p->dsp,DSP_DIGITMODE_MUTECONF | DSP_DIGITMODE_MUTEMAX | p->dtmfrelax); /* set mute mode if desired */ break; default: - ast_log(LOG_DEBUG, "Set option TONE VERIFY, mode: OFF(0) on %s\n",chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Set option TONE VERIFY, mode: OFF(0) on %s\n",chan->name); ast_dsp_digitmode(p->dsp,DSP_DIGITMODE_DTMF | p->dtmfrelax); /* set mute mode if desired */ break; } @@ -3055,14 +3107,16 @@ static int zt_setoption(struct ast_channel *chan, int option, void *data, int da cp = (char *) data; p->mate = 0; if (!*cp) { /* turn it off */ - ast_log(LOG_DEBUG, "Set option TDD MODE, value: OFF(0) on %s\n",chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Set option TDD MODE, value: OFF(0) on %s\n",chan->name); if (p->tdd) tdd_free(p->tdd); p->tdd = 0; break; } - ast_log(LOG_DEBUG, "Set option TDD MODE, value: %s(%d) on %s\n", - (*cp == 2) ? "MATE" : "ON", (int) *cp, chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Set option TDD MODE, value: %s(%d) on %s\n", + (*cp == 2) ? "MATE" : "ON", (int) *cp, chan->name); zt_disable_ec(p); /* otherwise, turn it on */ if (!p->didtdd) { /* if havent done it yet */ @@ -3091,20 +3145,23 @@ static int zt_setoption(struct ast_channel *chan, int option, void *data, int da fds[0].revents = 0; res = poll(fds, 1, -1); if (!res) { - ast_log(LOG_DEBUG, "poll (for write) ret. 0 on channel %d\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "poll (for write) ret. 0 on channel %d\n", p->channel); continue; } /* if got exception */ if (fds[0].revents & POLLPRI) return -1; if (!(fds[0].revents & POLLOUT)) { - ast_log(LOG_DEBUG, "write fd not ready on channel %d\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "write fd not ready on channel %d\n", p->channel); continue; } res = write(fd, buf, size); if (res != size) { if (res == -1) return -1; - ast_log(LOG_DEBUG, "Write returned %d (%s) on channel %d\n", res, strerror(errno), p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Write returned %d (%s) on channel %d\n", res, strerror(errno), p->channel); break; } len -= size; @@ -3127,18 +3184,21 @@ static int zt_setoption(struct ast_channel *chan, int option, void *data, int da if (!p->dsp) break; cp = (char *) data; - ast_log(LOG_DEBUG, "Set option RELAX DTMF, value: %s(%d) on %s\n", - *cp ? "ON" : "OFF", (int) *cp, chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Set option RELAX DTMF, value: %s(%d) on %s\n", + *cp ? "ON" : "OFF", (int) *cp, chan->name); ast_dsp_digitmode(p->dsp, ((*cp) ? DSP_DIGITMODE_RELAXDTMF : DSP_DIGITMODE_DTMF) | p->dtmfrelax); break; case AST_OPTION_AUDIO_MODE: /* Set AUDIO mode (or not) */ cp = (char *) data; if (!*cp) { - ast_log(LOG_DEBUG, "Set option AUDIO MODE, value: OFF(0) on %s\n", chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Set option AUDIO MODE, value: OFF(0) on %s\n", chan->name); x = 0; zt_disable_ec(p); } else { - ast_log(LOG_DEBUG, "Set option AUDIO MODE, value: ON(1) on %s\n", chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Set option AUDIO MODE, value: ON(1) on %s\n", chan->name); x = 1; } if (ioctl(p->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &x) == -1) @@ -3157,16 +3217,19 @@ static int zt_setoption(struct ast_channel *chan, int option, void *data, int da pp->oprmode = oprmode->mode; p->oprmode = -oprmode->mode; } - ast_log(LOG_DEBUG, "Set Operator Services mode, value: %d on %s/%s\n", - oprmode->mode, chan->name,oprmode->peer->name);; + if (option_debug) + ast_log(LOG_DEBUG, "Set Operator Services mode, value: %d on %s/%s\n", + oprmode->mode, chan->name,oprmode->peer->name); break; case AST_OPTION_ECHOCAN: cp = (char *) data; if (*cp) { - ast_log(LOG_DEBUG, "Enabling echo cancelation on %s\n", chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Enabling echo cancelation on %s\n", chan->name); zt_enable_ec(p); } else { - ast_log(LOG_DEBUG, "Disabling echo cancelation on %s\n", chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Disabling echo cancelation on %s\n", chan->name); zt_disable_ec(p); } break; @@ -3217,7 +3280,8 @@ static void zt_unlink(struct zt_pvt *slave, struct zt_pvt *master, int needlock) if (master->slaves[x]) { if (!slave || (master->slaves[x] == slave)) { /* Take slave out of the conference */ - ast_log(LOG_DEBUG, "Unlinking slave %d from %d\n", master->slaves[x]->channel, master->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Unlinking slave %d from %d\n", master->slaves[x]->channel, master->channel); conf_del(master, &master->slaves[x]->subs[SUB_REAL], SUB_REAL); conf_del(master->slaves[x], &master->subs[SUB_REAL], SUB_REAL); master->slaves[x]->master = NULL; @@ -3273,7 +3337,8 @@ static void zt_link(struct zt_pvt *slave, struct zt_pvt *master) { ast_log(LOG_WARNING, "Replacing master %d with new master, %d\n", slave->master->channel, master->channel); slave->master = master; - ast_log(LOG_DEBUG, "Making %d slave to master %d at %d\n", slave->channel, master->channel, x); + if (option_debug) + ast_log(LOG_DEBUG, "Making %d slave to master %d at %d\n", slave->channel, master->channel, x); } static void disable_dtmf_detect(struct zt_pvt *p) @@ -3436,8 +3501,9 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann nothingok = 0; } } - ast_log(LOG_DEBUG, "master: %d, slave: %d, nothingok: %d\n", - master ? master->channel : 0, slave ? slave->channel : 0, nothingok); + if (option_debug) + ast_log(LOG_DEBUG, "master: %d, slave: %d, nothingok: %d\n", + master ? master->channel : 0, slave ? slave->channel : 0, nothingok); if (master && slave) { /* Stop any tones, or play ringtone as appropriate. If they're bridged in an active threeway call with a channel that is ringing, we should @@ -3447,11 +3513,13 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann p1->subs[SUB_REAL].owner && p1->subs[SUB_REAL].inthreeway && (p1->subs[SUB_REAL].owner->_state == AST_STATE_RINGING)) { - ast_log(LOG_DEBUG, "Playing ringback on %s since %s is in a ringing three-way\n", c0->name, c1->name); + if (option_debug) + ast_log(LOG_DEBUG, "Playing ringback on %s since %s is in a ringing three-way\n", c0->name, c1->name); tone_zone_play_tone(p0->subs[oi0].zfd, ZT_TONE_RINGTONE); os1 = p1->subs[SUB_REAL].owner->_state; } else { - ast_log(LOG_DEBUG, "Stopping tones on %d/%d talking to %d/%d\n", p0->channel, oi0, p1->channel, oi1); + if (option_debug) + ast_log(LOG_DEBUG, "Stopping tones on %d/%d talking to %d/%d\n", p0->channel, oi0, p1->channel, oi1); tone_zone_play_tone(p0->subs[oi0].zfd, -1); } if ((oi0 == SUB_THREEWAY) && @@ -3459,11 +3527,13 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann p0->subs[SUB_REAL].owner && p0->subs[SUB_REAL].inthreeway && (p0->subs[SUB_REAL].owner->_state == AST_STATE_RINGING)) { - ast_log(LOG_DEBUG, "Playing ringback on %s since %s is in a ringing three-way\n", c1->name, c0->name); + if (option_debug) + ast_log(LOG_DEBUG, "Playing ringback on %s since %s is in a ringing three-way\n", c1->name, c0->name); tone_zone_play_tone(p1->subs[oi1].zfd, ZT_TONE_RINGTONE); os0 = p0->subs[SUB_REAL].owner->_state; } else { - ast_log(LOG_DEBUG, "Stopping tones on %d/%d talking to %d/%d\n", p1->channel, oi1, p0->channel, oi0); + if (option_debug) + ast_log(LOG_DEBUG, "Stopping tones on %d/%d talking to %d/%d\n", p1->channel, oi1, p0->channel, oi0); tone_zone_play_tone(p1->subs[oi0].zfd, -1); } if ((oi0 == SUB_REAL) && (oi1 == SUB_REAL)) { @@ -3536,8 +3606,9 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann (t1 != p1->subs[SUB_REAL].inthreeway) || (oi0 != i0) || (oi1 != i1)) { - ast_log(LOG_DEBUG, "Something changed out on %d/%d to %d/%d, returning -3 to restart\n", - op0->channel, oi0, op1->channel, oi1); + if (option_debug) + ast_log(LOG_DEBUG, "Something changed out on %d/%d to %d/%d, returning -3 to restart\n", + op0->channel, oi0, op1->channel, oi1); res = AST_BRIDGE_RETRY; goto return_from_bridge; } @@ -3555,7 +3626,8 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann who = ast_waitfor_n(priority ? c0_priority : c1_priority, 2, &timeoutms); if (!who) { - ast_log(LOG_DEBUG, "Ooh, empty read...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Ooh, empty read...\n"); continue; } f = ast_read(who); @@ -3606,7 +3678,8 @@ static int zt_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) struct zt_pvt *p = newchan->tech_pvt; int x; ast_mutex_lock(&p->lock); - ast_log(LOG_DEBUG, "New owner for channel %d is %s\n", p->channel, newchan->name); + if (option_debug) + ast_log(LOG_DEBUG, "New owner for channel %d is %s\n", p->channel, newchan->name); if (p->owner == oldchan) { p->owner = newchan; } @@ -3718,8 +3791,9 @@ static int attempt_transfer(struct zt_pvt *p) /* Tell the caller not to hangup */ return 1; } else { - ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n", - p->subs[SUB_REAL].owner->name, p->subs[SUB_THREEWAY].owner->name); + if (option_debug) + ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n", + p->subs[SUB_REAL].owner->name, p->subs[SUB_THREEWAY].owner->name); p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; return -1; } @@ -3795,11 +3869,13 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) } else res = zt_get_event(p->subs[index].zfd); - ast_log(LOG_DEBUG, "Got event %s(%d) on channel %d (index %d)\n", event2str(res), res, p->channel, index); + if (option_debug) + ast_log(LOG_DEBUG, "Got event %s(%d) on channel %d (index %d)\n", event2str(res), res, p->channel, index); if (res & (ZT_EVENT_PULSEDIGIT | ZT_EVENT_DTMFUP)) { p->pulsedial = (res & ZT_EVENT_PULSEDIGIT) ? 1 : 0; - ast_log(LOG_DEBUG, "Detected %sdigit '%c'\n", p->pulsedial ? "pulse ": "", res & 0xff); + if (option_debug) + ast_log(LOG_DEBUG, "Detected %sdigit '%c'\n", p->pulsedial ? "pulse ": "", res & 0xff); #ifdef HAVE_PRI if (!p->proceeding && p->sig == SIG_PRI && p->pri && p->pri->overlapdial) { /* absorb event */ @@ -3816,7 +3892,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) } if (res & ZT_EVENT_DTMFDOWN) { - ast_log(LOG_DEBUG, "DTMF Down '%c'\n", res & 0xff); + if (option_debug) + ast_log(LOG_DEBUG, "DTMF Down '%c'\n", res & 0xff); /* Mute conference */ zt_confmute(p, 1); p->subs[index].f.frametype = AST_FRAME_DTMF_BEGIN; @@ -3843,7 +3920,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) if (p->inalarm) break; if ((p->radio || (p->oprmode < 0))) break; if (ioctl(p->subs[index].zfd,ZT_DIALING,&x) == -1) { - ast_log(LOG_DEBUG, "ZT_DIALING ioctl failed on %s\n",ast->name); + if (option_debug) + ast_log(LOG_DEBUG, "ZT_DIALING ioctl failed on %s\n",ast->name); return NULL; } if (!x) { /* if not still dialing in driver */ @@ -3870,7 +3948,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) } if (ast->_state == AST_STATE_DIALING) { if ((p->callprogress & 1) && CANPROGRESSDETECT(p) && p->dsp && p->outgoing) { - ast_log(LOG_DEBUG, "Done dialing, but waiting for progress detection before doing more...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Done dialing, but waiting for progress detection before doing more...\n"); } else if (p->confirmanswer || (!p->dialednone && ((mysig == SIG_EM) || (mysig == SIG_EM_E1) || (mysig == SIG_EMWINK) || (mysig == SIG_FEATD) || (mysig == SIG_FEATDMF_TA) || (mysig == SIG_FEATDMF) || (mysig == SIG_E911) || (mysig == SIG_FGC_CAMA) || (mysig == SIG_FGC_CAMAMF) || (mysig == SIG_FEATB) || (mysig == SIG_SF) || (mysig == SIG_SFWINK) || (mysig == SIG_SF_FEATD) || (mysig == SIG_SF_FEATDMF) || (mysig == SIG_SF_FEATB)))) { ast_setstate(ast, AST_STATE_RINGING); } else if (!p->answeronpolarityswitch) { @@ -3988,14 +4067,16 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) return NULL; } mssinceflash = ast_tvdiff_ms(ast_tvnow(), p->flashtime); - ast_log(LOG_DEBUG, "Last flash was %d ms ago\n", mssinceflash); + if (option_debug) + ast_log(LOG_DEBUG, "Last flash was %d ms ago\n", mssinceflash); if (mssinceflash < MIN_MS_SINCE_FLASH) { /* It hasn't been long enough since the last flashook. This is probably a bounce on hanging up. Hangup both channels now */ if (p->subs[SUB_THREEWAY].owner) ast_queue_hangup(p->subs[SUB_THREEWAY].owner); p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; - ast_log(LOG_DEBUG, "Looks like a bounced flash, hanging up both calls on %d\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Looks like a bounced flash, hanging up both calls on %d\n", p->channel); ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); } else if ((ast->pbx) || (ast->_state == AST_STATE_UP)) { if (p->transfer) { @@ -4103,7 +4184,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) p->subs[index].f.subclass = AST_CONTROL_ANSWER; /* Make sure it stops ringing */ zt_set_hook(p->subs[index].zfd, ZT_OFFHOOK); - ast_log(LOG_DEBUG, "channel %d answered\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "channel %d answered\n", p->channel); if (p->cidspill) { /* Cancel any running CallerID spill */ free(p->cidspill); @@ -4123,7 +4205,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) p->dop.dialstr[0] = '\0'; return NULL; } else { - ast_log(LOG_DEBUG, "Sent FXO deferred digit string: %s\n", p->dop.dialstr); + if (option_debug) + ast_log(LOG_DEBUG, "Sent FXO deferred digit string: %s\n", p->dop.dialstr); p->subs[index].f.frametype = AST_FRAME_NULL; p->subs[index].f.subclass = 0; p->dialing = 1; @@ -4138,7 +4221,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) ast->rings = 1; p->subs[index].f.frametype = AST_FRAME_CONTROL; p->subs[index].f.subclass = AST_CONTROL_OFFHOOK; - ast_log(LOG_DEBUG, "channel %d picked up\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "channel %d picked up\n", p->channel); return &p->subs[index].f; case AST_STATE_UP: /* Make sure it stops ringing */ @@ -4168,9 +4252,10 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) /* If we get a ring then we cannot be in * reversed polarity. So we reset to idle */ - ast_log(LOG_DEBUG, "Setting IDLE polarity due " - "to ring. Old polarity was %d\n", - p->polarity); + if (option_debug) + ast_log(LOG_DEBUG, "Setting IDLE polarity due " + "to ring. Old polarity was %d\n", + p->polarity); p->polarity = POLARITY_IDLE; /* Fall through */ @@ -4280,8 +4365,9 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) case SIG_FXOLS: case SIG_FXOGS: case SIG_FXOKS: - ast_log(LOG_DEBUG, "Winkflash, index: %d, normal: %d, callwait: %d, thirdcall: %d\n", - index, p->subs[SUB_REAL].zfd, p->subs[SUB_CALLWAIT].zfd, p->subs[SUB_THREEWAY].zfd); + if (option_debug) + ast_log(LOG_DEBUG, "Winkflash, index: %d, normal: %d, callwait: %d, thirdcall: %d\n", + index, p->subs[SUB_REAL].zfd, p->subs[SUB_CALLWAIT].zfd, p->subs[SUB_THREEWAY].zfd); p->callwaitcas = 0; if (index != SUB_REAL) { @@ -4294,7 +4380,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) swap_subs(p, SUB_REAL, SUB_CALLWAIT); tone_zone_play_tone(p->subs[SUB_REAL].zfd, -1); p->owner = p->subs[SUB_REAL].owner; - ast_log(LOG_DEBUG, "Making %s the new owner\n", p->owner->name); + if (option_debug) + ast_log(LOG_DEBUG, "Making %s the new owner\n", p->owner->name); if (p->owner->_state == AST_STATE_RINGING) { ast_setstate(p->owner, AST_STATE_UP); p->subs[SUB_REAL].needanswer = 1; @@ -4334,8 +4421,9 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) if (!((ast->pbx) || (ast->_state == AST_STATE_UP) || (ast->_state == AST_STATE_RING))) { - ast_log(LOG_DEBUG, "Flash when call not up or ringing\n"); - goto winkflashdone; + if (option_debug) + ast_log(LOG_DEBUG, "Flash when call not up or ringing\n"); + goto winkflashdone; } if (alloc_sub(p, SUB_THREEWAY)) { ast_log(LOG_WARNING, "Unable to allocate three-way subchannel\n"); @@ -4416,7 +4504,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) p->subs[otherindex].needunhold = 1; p->owner = p->subs[SUB_REAL].owner; if (ast->_state == AST_STATE_RINGING) { - ast_log(LOG_DEBUG, "Enabling ringtone on real and threeway\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Enabling ringtone on real and threeway\n"); res = tone_zone_play_tone(p->subs[SUB_REAL].zfd, ZT_TONE_RINGTONE); res = tone_zone_play_tone(p->subs[SUB_THREEWAY].zfd, ZT_TONE_RINGTONE); } @@ -4446,15 +4535,18 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) case SIG_SF_FEATD: case SIG_FXSLS: case SIG_FXSGS: - if (p->dialing) - ast_log(LOG_DEBUG, "Ignoring wink on channel %d\n", p->channel); - else - ast_log(LOG_DEBUG, "Got wink in weird state %d on channel %d\n", ast->_state, p->channel); + if (option_debug) { + if (p->dialing) + ast_log(LOG_DEBUG, "Ignoring wink on channel %d\n", p->channel); + else + ast_log(LOG_DEBUG, "Got wink in weird state %d on channel %d\n", ast->_state, p->channel); + } break; case SIG_FEATDMF_TA: switch (p->whichwink) { case 0: - ast_log(LOG_DEBUG, "ANI2 set to '%d' and ANI is '%s'\n", p->owner->cid.cid_ani2, p->owner->cid.cid_ani); + if (option_debug) + ast_log(LOG_DEBUG, "ANI2 set to '%d' and ANI is '%s'\n", p->owner->cid.cid_ani2, p->owner->cid.cid_ani); snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*%d%s#", p->owner->cid.cid_ani2, p->owner->cid.cid_ani); break; case 1: @@ -4480,8 +4572,10 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d\n", p->channel); p->dop.dialstr[0] = '\0'; return NULL; - } else - ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", p->dop.dialstr); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", p->dop.dialstr); + } p->dop.dialstr[0] = '\0'; break; default: @@ -4508,8 +4602,10 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d\n", p->channel); p->dop.dialstr[0] = '\0'; return NULL; - } else - ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", p->dop.dialstr); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", p->dop.dialstr); + } p->dop.dialstr[0] = '\0'; p->dop.op = ZT_DIAL_OP_REPLACE; break; @@ -4521,7 +4617,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) case SIG_FEATB: case SIG_SF_FEATDMF: case SIG_SF_FEATB: - ast_log(LOG_DEBUG, "Got hook complete in MF FGD, waiting for wink now on channel %d\n",p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Got hook complete in MF FGD, waiting for wink now on channel %d\n",p->channel); break; default: break; @@ -4539,13 +4636,16 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) if (p->answeronpolarityswitch && ((ast->_state == AST_STATE_DIALING) || (ast->_state == AST_STATE_RINGING))) { - ast_log(LOG_DEBUG, "Answering on polarity switch!\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Answering on polarity switch!\n"); ast_setstate(p->owner, AST_STATE_UP); if (p->hanguponpolarityswitch) { gettimeofday(&p->polaritydelaytv, NULL); } - } else - ast_log(LOG_DEBUG, "Ignore switch to REVERSED Polarity on channel %d, state %d\n", p->channel, ast->_state); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Ignore switch to REVERSED Polarity on channel %d, state %d\n", p->channel, ast->_state); + } } /* Removed else statement from here as it was preventing hangups from ever happening*/ /* Added AST_STATE_RING in if statement below to deal with calling party hangups that take place when ringing */ @@ -4554,24 +4654,30 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) (p->polarity == POLARITY_REV) && ((ast->_state == AST_STATE_UP) || (ast->_state == AST_STATE_RING)) ) { /* Added log_debug information below to provide a better indication of what is going on */ - ast_log(LOG_DEBUG, "Polarity Reversal event occured - DEBUG 1: channel %d, state %d, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %d\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) ); + if (option_debug) + ast_log(LOG_DEBUG, "Polarity Reversal event occured - DEBUG 1: channel %d, state %d, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %d\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) ); if (ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) > p->polarityonanswerdelay) { - ast_log(LOG_DEBUG, "Polarity Reversal detected and now Hanging up on channel %d\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Polarity Reversal detected and now Hanging up on channel %d\n", p->channel); ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT); p->polarity = POLARITY_IDLE; } else { - ast_log(LOG_DEBUG, "Polarity Reversal detected but NOT hanging up (too close to answer event) on channel %d, state %d\n", p->channel, ast->_state); + if (option_debug) + ast_log(LOG_DEBUG, "Polarity Reversal detected but NOT hanging up (too close to answer event) on channel %d, state %d\n", p->channel, ast->_state); } } else { p->polarity = POLARITY_IDLE; - ast_log(LOG_DEBUG, "Ignoring Polarity switch to IDLE on channel %d, state %d\n", p->channel, ast->_state); + if (option_debug) + ast_log(LOG_DEBUG, "Ignoring Polarity switch to IDLE on channel %d, state %d\n", p->channel, ast->_state); } /* Added more log_debug information below to provide a better indication of what is going on */ - ast_log(LOG_DEBUG, "Polarity Reversal event occured - DEBUG 2: channel %d, state %d, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %d\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) ); + if (option_debug) + ast_log(LOG_DEBUG, "Polarity Reversal event occured - DEBUG 2: channel %d, state %d, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %d\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) ); break; default: - ast_log(LOG_DEBUG, "Dunno what to do with event %d on channel %d\n", res, p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Dunno what to do with event %d on channel %d\n", res, p->channel); } return &p->subs[index].f; } @@ -4612,7 +4718,8 @@ static struct ast_frame *__zt_exception(struct ast_channel *ast) /* Switch to real if there is one and this isn't something really silly... */ if ((res != ZT_EVENT_RINGEROFF) && (res != ZT_EVENT_RINGERON) && (res != ZT_EVENT_HOOKCOMPLETE)) { - ast_log(LOG_DEBUG, "Restoring owner of channel %d on event %d\n", p->channel, res); + if (option_debug) + ast_log(LOG_DEBUG, "Restoring owner of channel %d on event %d\n", p->channel, res); p->owner = p->subs[SUB_REAL].owner; if (p->owner && ast_bridged_channel(p->owner)) ast_queue_control(p->owner, AST_CONTROL_UNHOLD); @@ -4671,7 +4778,10 @@ static struct ast_frame *__zt_exception(struct ast_channel *ast) f = &p->subs[index].f; return f; } - if (!(p->radio || (p->oprmode < 0))) ast_log(LOG_DEBUG, "Exception on %d, channel %d\n", ast->fds[0],p->channel); + if (!(p->radio || (p->oprmode < 0))) { + if (option_debug) + ast_log(LOG_DEBUG, "Exception on %d, channel %d\n", ast->fds[0],p->channel); + } /* If it's not us, return NULL immediately */ if (ast != p->owner) { ast_log(LOG_WARNING, "We're %s, not %s\n", ast->name, p->owner->name); @@ -4814,7 +4924,8 @@ static struct ast_frame *zt_read(struct ast_channel *ast) p->subs[index].f.frametype = AST_FRAME_CONTROL; p->subs[index].f.subclass = AST_CONTROL_HOLD; ast_mutex_unlock(&p->lock); - ast_log(LOG_DEBUG, "Sending hold on '%s'\n", ast->name); + if (option_debug) + ast_log(LOG_DEBUG, "Sending hold on '%s'\n", ast->name); return &p->subs[index].f; } @@ -4824,7 +4935,8 @@ static struct ast_frame *zt_read(struct ast_channel *ast) p->subs[index].f.frametype = AST_FRAME_CONTROL; p->subs[index].f.subclass = AST_CONTROL_UNHOLD; ast_mutex_unlock(&p->lock); - ast_log(LOG_DEBUG, "Sending unhold on '%s'\n", ast->name); + if (option_debug) + ast_log(LOG_DEBUG, "Sending unhold on '%s'\n", ast->name); return &p->subs[index].f; } @@ -4869,7 +4981,8 @@ static struct ast_frame *zt_read(struct ast_channel *ast) return f; } if (res != (p->subs[index].linear ? READ_SIZE * 2 : READ_SIZE)) { - ast_log(LOG_DEBUG, "Short read (%d/%d), must be an event...\n", res, p->subs[index].linear ? READ_SIZE * 2 : READ_SIZE); + if (option_debug) + ast_log(LOG_DEBUG, "Short read (%d/%d), must be an event...\n", res, p->subs[index].linear ? READ_SIZE * 2 : READ_SIZE); f = __zt_exception(ast); ast_mutex_unlock(&p->lock); return f; @@ -4879,7 +4992,8 @@ static struct ast_frame *zt_read(struct ast_channel *ast) c = tdd_feed(p->tdd,readbuf,READ_SIZE); if (c < 0) { - ast_log(LOG_DEBUG,"tdd_feed failed\n"); + if (option_debug) + ast_log(LOG_DEBUG,"tdd_feed failed\n"); ast_mutex_unlock(&p->lock); return NULL; } @@ -4927,7 +5041,8 @@ static struct ast_frame *zt_read(struct ast_channel *ast) p->subs[index].f.offset = AST_FRIENDLY_OFFSET; p->subs[index].f.data = p->subs[index].buffer + AST_FRIENDLY_OFFSET/2; #if 0 - ast_log(LOG_DEBUG, "Read %d of voice on %s\n", p->subs[index].f.datalen, ast->name); + if (option_debug) + ast_log(LOG_DEBUG, "Read %d of voice on %s\n", p->subs[index].f.datalen, ast->name); #endif if (p->dialing || /* Transmitting something */ (index && (ast->_state != AST_STATE_UP)) || /* Three-way or callwait that isn't up */ @@ -4968,9 +5083,11 @@ static struct ast_frame *zt_read(struct ast_channel *ast) } else f = &p->subs[index].f; if (f && (f->frametype == AST_FRAME_DTMF)) { - ast_log(LOG_DEBUG, "DTMF digit: %c on %s\n", f->subclass, ast->name); + if (option_debug) + ast_log(LOG_DEBUG, "DTMF digit: %c on %s\n", f->subclass, ast->name); if (p->confirmanswer) { - ast_log(LOG_DEBUG, "Confirm answer on %s!\n", ast->name); + if (option_debug) + ast_log(LOG_DEBUG, "Confirm answer on %s!\n", ast->name); /* Upon receiving a DTMF digit, consider this an answer confirmation instead of a DTMF digit */ p->subs[index].f.frametype = AST_FRAME_CONTROL; @@ -4980,7 +5097,8 @@ static struct ast_frame *zt_read(struct ast_channel *ast) p->confirmanswer = 0; } else if (p->callwaitcas) { if ((f->subclass == 'A') || (f->subclass == 'D')) { - ast_log(LOG_DEBUG, "Got some DTMF, but it's for the CAS\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Got some DTMF, but it's for the CAS\n"); if (p->cidspill) free(p->cidspill); send_cwcidspill(p); @@ -5006,10 +5124,14 @@ static struct ast_frame *zt_read(struct ast_channel *ast) ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast->name, target_context); } else ast_log(LOG_NOTICE, "Fax detected, but no fax extension\n"); - } else - ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n"); - } else - ast_log(LOG_DEBUG, "Fax already handled\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n"); + } + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Fax already handled\n"); + } zt_confmute(p, 0); p->subs[index].f.frametype = AST_FRAME_NULL; p->subs[index].f.subclass = 0; @@ -5157,7 +5279,8 @@ static int zt_indicate(struct ast_channel *chan, int condition, const void *data int func = ZT_FLASH; ast_mutex_lock(&p->lock); index = zt_get_index(chan, p, 0); - ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name); if (index == SUB_REAL) { switch (condition) { case AST_CONTROL_BUSY: @@ -5217,7 +5340,8 @@ static int zt_indicate(struct ast_channel *chan, int condition, const void *data } break; case AST_CONTROL_PROCEEDING: - ast_log(LOG_DEBUG,"Received AST_CONTROL_PROCEEDING on %s\n",chan->name); + if (option_debug) + ast_log(LOG_DEBUG,"Received AST_CONTROL_PROCEEDING on %s\n",chan->name); #ifdef HAVE_PRI if (!p->proceeding && p->sig==SIG_PRI && p->pri && !p->outgoing) { if (p->pri->pri) { @@ -5246,7 +5370,8 @@ static int zt_indicate(struct ast_channel *chan, int condition, const void *data res = 0; break; case AST_CONTROL_PROGRESS: - ast_log(LOG_DEBUG,"Received AST_CONTROL_PROGRESS on %s\n",chan->name); + if (option_debug) + ast_log(LOG_DEBUG,"Received AST_CONTROL_PROGRESS on %s\n",chan->name); #ifdef HAVE_PRI p->digital = 0; /* Digital-only calls isn't allows any inband progress messages */ if (!p->progress && p->sig==SIG_PRI && p->pri && !p->outgoing) { @@ -5422,7 +5547,8 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int #endif if (features) { if (i->dsp) { - ast_log(LOG_DEBUG, "Already have a dsp on %s?\n", tmp->name); + if (option_debug) + ast_log(LOG_DEBUG, "Already have a dsp on %s?\n", tmp->name); } else { if (i->channel != CHAN_PSEUDO) i->dsp = ast_dsp_new(); @@ -5619,7 +5745,8 @@ static void *ss_thread(void *data) timeout = gendigittimeout; res = ast_waitfordigit(chan, timeout); if (res < 0) { - ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); ast_hangup(chan); return NULL; } else if (res) { @@ -5647,7 +5774,8 @@ static void *ss_thread(void *data) 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); + if (option_debug) + ast_log(LOG_DEBUG, "No such possible extension '%s' in context '%s'\n", exten, chan->context); chan->hangupcause = AST_CAUSE_UNALLOCATED; ast_hangup(chan); p->exten[0] = '\0'; @@ -5766,7 +5894,8 @@ static void *ss_thread(void *data) } res = ast_waitfordigit(chan, timeout); if (res < 0) { - ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); ast_hangup(chan); return NULL; } else if (res) { @@ -5784,7 +5913,8 @@ static void *ss_thread(void *data) ast_hangup(chan); return NULL; } else if (res < 0) { - ast_log(LOG_DEBUG, "Got hung up before digits finished\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Got hung up before digits finished\n"); ast_hangup(chan); return NULL; } @@ -5941,7 +6071,8 @@ static void *ss_thread(void *data) res = ast_waitfordigit(chan, timeout); timeout = 0; if (res < 0) { - ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); res = tone_zone_play_tone(p->subs[index].zfd, -1); ast_hangup(chan); return NULL; @@ -5998,7 +6129,8 @@ static void *ss_thread(void *data) timeout = matchdigittimeout; } } else if (res == 0) { - ast_log(LOG_DEBUG, "not enough digits (and no ambiguous match)...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "not enough digits (and no ambiguous match)...\n"); res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION); zt_wait_event(p->subs[index].zfd); ast_hangup(chan); @@ -6034,7 +6166,8 @@ static void *ss_thread(void *data) } zt_enable_ec(p); if (ast_pickup_call(chan)) { - ast_log(LOG_DEBUG, "No call pickup possible...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "No call pickup possible...\n"); res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION); zt_wait_event(p->subs[index].zfd); } @@ -6222,7 +6355,8 @@ static void *ss_thread(void *data) res = 0; ast_frfree(f); if (res) { - ast_log(LOG_DEBUG, "Got ring!\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Got ring!\n"); res = 0; break; } @@ -6242,7 +6376,8 @@ static void *ss_thread(void *data) else if (smdi_msg->type == 'N') pbx_builtin_setvar_helper(chan, "_SMDI_VM_TYPE", "u"); - ast_log(LOG_DEBUG, "Recieved SMDI message on %s\n", chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Recieved SMDI message on %s\n", chan->name); } else { ast_log(LOG_WARNING, "SMDI enabled but no SMDI message present\n"); } @@ -6259,8 +6394,9 @@ static void *ss_thread(void *data) if (p->cid_signalling == CID_SIG_DTMF) { int i = 0; cs = NULL; - ast_log(LOG_DEBUG, "Receiving DTMF cid on " - "channel %s\n", chan->name); + if (option_debug) + ast_log(LOG_DEBUG, "Receiving DTMF cid on " + "channel %s\n", chan->name); zt_setlinear(p->subs[index].zfd, 0); res = 2000; for (;;) { @@ -6275,7 +6411,8 @@ static void *ss_thread(void *data) f = ast_read(chan); if (f->frametype == AST_FRAME_DTMF) { dtmfbuf[i++] = f->subclass; - ast_log(LOG_DEBUG, "CID got digit '%c'\n", f->subclass); + if (option_debug) + ast_log(LOG_DEBUG, "CID got digit '%c'\n", f->subclass); res = 2000; } ast_frfree(f); @@ -6286,10 +6423,12 @@ static void *ss_thread(void *data) dtmfbuf[i] = '\0'; zt_setlinear(p->subs[index].zfd, p->subs[index].linear); /* Got cid and ring. */ - ast_log(LOG_DEBUG, "CID got string '%s'\n", dtmfbuf); + if (option_debug) + ast_log(LOG_DEBUG, "CID got string '%s'\n", dtmfbuf); callerid_get_dtmf(dtmfbuf, dtmfcid, &flags); - ast_log(LOG_DEBUG, "CID is '%s', flags %d\n", - dtmfcid, flags); + if (option_debug) + ast_log(LOG_DEBUG, "CID is '%s', flags %d\n", + dtmfcid, flags); /* If first byte is NULL, we have no cid */ if (!ast_strlen_zero(dtmfcid)) number = dtmfcid; @@ -6906,7 +7045,8 @@ static void *do_monitor(void *data) ast_log(LOG_WARNING, "Unable to set cancel type to asynchronous\n"); return NULL; } - ast_log(LOG_DEBUG, "Monitor starting...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Monitor starting...\n"); #endif for (;;) { /* Lock the interface list */ @@ -6972,7 +7112,8 @@ static void *do_monitor(void *data) res = ast_app_has_voicemail(last->mailbox, NULL); if (last->msgstate != res) { int x; - ast_log(LOG_DEBUG, "Message status for %s changed from %d to %d on %d\n", last->mailbox, last->msgstate, res, last->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Message status for %s changed from %d to %d on %d\n", last->mailbox, last->msgstate, res, last->channel); x = ZT_FLUSH_BOTH; res2 = ioctl(last->subs[SUB_REAL].zfd, ZT_FLUSH, &x); if (res2) @@ -7800,7 +7941,8 @@ static inline int available(struct zt_pvt *p, int channelmatch, int groupmatch, return 1; #endif } else if (par.rxisoffhook) { - ast_log(LOG_DEBUG, "Channel %d off hook, can't use\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Channel %d off hook, can't use\n", p->channel); /* Not available when the other end is off hook */ return 0; } @@ -7884,8 +8026,9 @@ static int pri_find_empty_chan(struct zt_pri *pri, int backwards) if (!backwards && (x >= pri->numchans)) break; if (pri->pvts[x] && !pri->pvts[x]->inalarm && !pri->pvts[x]->owner) { - ast_log(LOG_DEBUG, "Found empty available channel %d/%d\n", - pri->pvts[x]->logicalspan, pri->pvts[x]->prioffset); + if (option_debug) + ast_log(LOG_DEBUG, "Found empty available channel %d/%d\n", + pri->pvts[x]->logicalspan, pri->pvts[x]->prioffset); return x; } if (backwards) @@ -8037,8 +8180,10 @@ static struct ast_channel *zt_request(const char *type, int format, void *data, ast_log(LOG_NOTICE, "Failed to allocate place holder pseudo channel!\n"); p = NULL; break; - } else - ast_log(LOG_DEBUG, "Allocated placeholder pseudo channel\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Allocated placeholder pseudo channel\n"); + } p->pri = pri; } } @@ -8672,9 +8817,10 @@ static int pri_fixup_principle(struct zt_pri *pri, int principle, q931_call *c) zt_close(crv->subs[SUB_REAL].zfd); pri->pvts[principle]->call = crv->call; pri_assign_bearer(crv, pri, pri->pvts[principle]); - ast_log(LOG_DEBUG, "Assigning bearer %d/%d to CRV %d:%d\n", - pri->pvts[principle]->logicalspan, pri->pvts[principle]->prioffset, - pri->trunkgroup, crv->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Assigning bearer %d/%d to CRV %d:%d\n", + pri->pvts[principle]->logicalspan, pri->pvts[principle]->prioffset, + pri->trunkgroup, crv->channel); wakeup_sub(crv, SUB_REAL, pri); } return principle; @@ -9412,7 +9558,8 @@ static void *pri_dchannel(void *vpri) pri_assign_bearer(crv, pri, pri->pvts[chanpos]); c = zt_new(crv, AST_STATE_RESERVED, 0, SUB_REAL, law, e->ring.ctype); pri->pvts[chanpos]->owner = &inuse; - ast_log(LOG_DEBUG, "Started up crv %d:%d on bearer channel %d\n", pri->trunkgroup, crv->channel, crv->bearer->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Started up crv %d:%d on bearer channel %d\n", pri->trunkgroup, crv->channel, crv->bearer->channel); } else { c = zt_new(pri->pvts[chanpos], AST_STATE_RESERVED, 0, SUB_REAL, law, e->ring.ctype); } @@ -9517,8 +9664,10 @@ static void *pri_dchannel(void *vpri) zt_enable_ec(pri->pvts[chanpos]); pri->pvts[chanpos]->subs[SUB_REAL].needringing = 1; pri->pvts[chanpos]->alerting = 1; - } else - ast_log(LOG_DEBUG, "Deferring ringing notification because of extra digits to dial...\n"); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Deferring ringing notification because of extra digits to dial...\n"); + } #ifdef PRI_PROGRESS_MASK if (e->ringing.progressmask & PRI_PROG_INBAND_AVAILABLE) { #else @@ -9570,8 +9719,9 @@ static void *pri_dchannel(void *vpri) } ast_mutex_lock(&pri->pvts[chanpos]->lock); - ast_log(LOG_DEBUG, "Queuing frame from PRI_EVENT_PROGRESS on channel %d/%d span %d\n", - pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset,pri->span); + if (option_debug) + ast_log(LOG_DEBUG, "Queuing frame from PRI_EVENT_PROGRESS on channel %d/%d span %d\n", + pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset,pri->span); zap_queue_frame(pri->pvts[chanpos], &f, pri); #ifdef PRI_PROGRESS_MASK if (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE) { @@ -9596,8 +9746,9 @@ static void *pri_dchannel(void *vpri) struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, }; ast_mutex_lock(&pri->pvts[chanpos]->lock); - ast_log(LOG_DEBUG, "Queuing frame from PRI_EVENT_PROCEEDING on channel %d/%d span %d\n", - pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset,pri->span); + if (option_debug) + ast_log(LOG_DEBUG, "Queuing frame from PRI_EVENT_PROCEEDING on channel %d/%d span %d\n", + pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset,pri->span); zap_queue_frame(pri->pvts[chanpos], &f, pri); #ifdef PRI_PROGRESS_MASK if (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE) { @@ -9661,7 +9812,8 @@ static void *pri_dchannel(void *vpri) pri->pvts[chanpos]->dsp_features = 0; } if (pri->pvts[chanpos]->realcall && (pri->pvts[chanpos]->realcall->sig == SIG_FXSKS)) { - ast_log(LOG_DEBUG, "Starting up GR-303 trunk now that we got CONNECT...\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Starting up GR-303 trunk now that we got CONNECT...\n"); x = ZT_START; res = ioctl(pri->pvts[chanpos]->subs[SUB_REAL].zfd, ZT_HOOK, &x); if (res < 0) { @@ -9676,11 +9828,14 @@ static void *pri_dchannel(void *vpri) if (res < 0) { ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d\n", pri->pvts[chanpos]->channel); pri->pvts[chanpos]->dop.dialstr[0] = '\0'; - } else - ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", pri->pvts[chanpos]->dop.dialstr); + } else { + if (option_debug) + ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", pri->pvts[chanpos]->dop.dialstr); + } pri->pvts[chanpos]->dop.dialstr[0] = '\0'; } else if (pri->pvts[chanpos]->confirmanswer) { - ast_log(LOG_DEBUG, "Waiting on answer confirmation on channel %d!\n", pri->pvts[chanpos]->channel); + if (option_debug) + ast_log(LOG_DEBUG, "Waiting on answer confirmation on channel %d!\n", pri->pvts[chanpos]->channel); } else { pri->pvts[chanpos]->subs[SUB_REAL].needanswer =1; /* Enable echo cancellation if it's not on already */ @@ -9862,8 +10017,9 @@ static void *pri_dchannel(void *vpri) if (pri->pvts[x] && pri->pvts[x]->resetting) { chanpos = x; ast_mutex_lock(&pri->pvts[chanpos]->lock); - ast_log(LOG_DEBUG, "Assuming restart ack is really for channel %d/%d span %d\n", pri->pvts[chanpos]->logicalspan, - pri->pvts[chanpos]->prioffset, pri->span); + if (option_debug) + ast_log(LOG_DEBUG, "Assuming restart ack is really for channel %d/%d span %d\n", pri->pvts[chanpos]->logicalspan, + pri->pvts[chanpos]->prioffset, pri->span); if (pri->pvts[chanpos]->realcall) pri_hangup_all(pri->pvts[chanpos]->realcall, pri); else if (pri->pvts[chanpos]->owner) { @@ -9917,7 +10073,8 @@ static void *pri_dchannel(void *vpri) pri->pvts[chanpos]->setup_ack = 1; /* Send any queued digits */ for (x = 0;x < strlen(pri->pvts[chanpos]->dialdest); x++) { - ast_log(LOG_DEBUG, "Sending pending digit '%c'\n", pri->pvts[chanpos]->dialdest[x]); + if (option_debug) + ast_log(LOG_DEBUG, "Sending pending digit '%c'\n", pri->pvts[chanpos]->dialdest[x]); pri_information(pri->pri, pri->pvts[chanpos]->call, pri->pvts[chanpos]->dialdest[x]); } @@ -9948,7 +10105,8 @@ static void *pri_dchannel(void *vpri) } break; default: - ast_log(LOG_DEBUG, "Event: %d\n", e->e); + if (option_debug) + ast_log(LOG_DEBUG, "Event: %d\n", e->e); } } ast_mutex_unlock(&pri->lock); @@ -12376,14 +12534,16 @@ static int zt_sendtext(struct ast_channel *c, const char *text) fds[0].revents = 0; res = poll(fds, 1, -1); if (!res) { - ast_log(LOG_DEBUG, "poll (for write) ret. 0 on channel %d\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "poll (for write) ret. 0 on channel %d\n", p->channel); continue; } /* if got exception */ if (fds[0].revents & POLLPRI) return -1; if (!(fds[0].revents & POLLOUT)) { - ast_log(LOG_DEBUG, "write fd not ready on channel %d\n", p->channel); + if (option_debug) + ast_log(LOG_DEBUG, "write fd not ready on channel %d\n", p->channel); continue; } res = write(fd, buf, size); diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index b6137a88b..acd7beda8 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -249,7 +249,7 @@ int iax_provision_version(unsigned int *version, const char *template, int force if (sscanf(tmp, "v%x", version) != 1) { if (strcmp(tmp, "u")) { ret = iax_provision_build(&ied, version, template, force); - if (ret) + if (ret && option_debug) ast_log(LOG_DEBUG, "Unable to create provisioning packet for '%s'\n", template); } else ret = -1; |