kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ftmod_misdn: Improve debug log messages. 

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
This commit is contained in:
Stefan Knoblich 2012-03-23 00:46:46 +01:00
parent 28ed1b5076
commit c85271aaf5
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c
View File

@ -458,8 +458,9 @@ static ftdm_status_t misdn_activate_channel(ftdm_channel_t *chan, int activate)
return FTDM_FAIL; return FTDM_FAIL;
} }
//#ifdef MISDN_DEBUG_EVENTS //#ifdef MISDN_DEBUG_EVENTS
ftdm_log_chan(chan, FTDM_LOG_DEBUG, "mISDN got event '%s (%#x)' while waiting for %s confirmation\n", ftdm_log_chan(chan, FTDM_LOG_DEBUG, "mISDN got event '%s (%#x)', id %#x, while waiting for %s confirmation on %c-channel\n",
misdn_event2str(hh->prim), hh->prim, (activate) ? "activation" : "deactivation"); misdn_event2str(hh->prim), hh->prim, hh->id, (activate) ? "activation" : "deactivation",
ftdm_channel_get_type(chan) == FTDM_CHAN_TYPE_B ? 'B' : 'D');
//#endif //#endif
switch (hh->prim) { switch (hh->prim) {
case PH_ACTIVATE_IND: /* success (or not): save last response, */ case PH_ACTIVATE_IND: /* success (or not): save last response, */
@ -478,13 +479,11 @@ static ftdm_status_t misdn_activate_channel(ftdm_channel_t *chan, int activate)
misdn_event2str(hh->prim), (activate) ? "activation" : "deactivation", hh->id); misdn_event2str(hh->prim), (activate) ? "activation" : "deactivation", hh->id);
break; break;
case MPH_INFORMATION_IND: case MPH_INFORMATION_IND:
ftdm_log_chan(chan, FTDM_LOG_DEBUG, "mISDN ignoring event '%s (%#x)' while waiting for %s confirmation\n",
misdn_event2str(hh->prim), hh->prim, (activate) ? "activation" : "deactivation");
misdn_handle_mph_information_ind(chan, hh, MISDN_MSG_DATA(buf), retval - MISDN_HEADER_LEN); misdn_handle_mph_information_ind(chan, hh, MISDN_MSG_DATA(buf), retval - MISDN_HEADER_LEN);
break; break;
default: /* other messages, ignore */ default: /* other messages, ignore */
ftdm_log_chan(chan, FTDM_LOG_DEBUG, "mISDN ignoring event '%s (%#x)' while waiting for %s confirmation\n", ftdm_log_chan(chan, FTDM_LOG_DEBUG, "mISDN ignoring event '%s (%#x)', id %#x, while waiting for %s confirmation\n",
misdn_event2str(hh->prim), hh->prim, (activate) ? "activation" : "deactivation"); misdn_event2str(hh->prim), hh->prim, hh->id, (activate) ? "activation" : "deactivation");
break; break;
} }
} }
@ -911,6 +910,9 @@ static FIO_CLOSE_FUNCTION(misdn_close)
assert(chan_priv); assert(chan_priv);
ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "mISDN trying to close %c-channel\n",
ftdm_channel_get_type(ftdmchan) == FTDM_CHAN_TYPE_B ? 'B' : 'D');
/* deactivate b-channels on close */ /* deactivate b-channels on close */
if (ftdm_channel_get_type(ftdmchan) == FTDM_CHAN_TYPE_B) { if (ftdm_channel_get_type(ftdmchan) == FTDM_CHAN_TYPE_B) {
/* /*
@ -926,11 +928,13 @@ static FIO_CLOSE_FUNCTION(misdn_close)
*/ */
ret = misdn_activate_channel(ftdmchan, 0); ret = misdn_activate_channel(ftdmchan, 0);
if (ret != FTDM_SUCCESS) { if (ret != FTDM_SUCCESS) {
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Failed to deactivate channel\n"); ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Failed to deactivate %c-channel\n",
ftdm_channel_get_type(ftdmchan) == FTDM_CHAN_TYPE_B ? 'B' : 'D');
return FTDM_FAIL; return FTDM_FAIL;
} }
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_INFO, "mISDN channel deactivated\n"); ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "mISDN %c-channel deactivated\n",
ftdm_channel_get_type(ftdmchan) == FTDM_CHAN_TYPE_B ? 'B' : 'D');
chan_priv->state = MISDN_CHAN_STATE_CLOSED; chan_priv->state = MISDN_CHAN_STATE_CLOSED;
} }
@ -989,8 +993,8 @@ static FIO_COMMAND_FUNCTION(misdn_command)
case FTDM_COMMAND_GET_INTERVAL: case FTDM_COMMAND_GET_INTERVAL:
FTDM_COMMAND_OBJ_INT = ftdm_channel_get_io_interval(ftdmchan); FTDM_COMMAND_OBJ_INT = ftdm_channel_get_io_interval(ftdmchan);
ftdm_log(FTDM_LOG_NOTICE, "Interval %d ms [%d:%d]\n", ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Interval %d ms\n",
ftdm_channel_get_io_interval(ftdmchan), ftdm_channel_get_span_id(ftdmchan), ftdm_channel_get_id(ftdmchan)); ftdm_channel_get_io_interval(ftdmchan));
break; break;
default: default:
@ -1169,6 +1173,7 @@ static FIO_READ_FUNCTION(misdn_read)
int retval; int retval;
if (priv->state == MISDN_CHAN_STATE_CLOSED) { if (priv->state == MISDN_CHAN_STATE_CLOSED) {
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "mISDN ignoring read on closed channel\n");
/* ignore */ /* ignore */
*datalen = 0; *datalen = 0;
return FTDM_SUCCESS; return FTDM_SUCCESS;
@ -1200,7 +1205,7 @@ static FIO_READ_FUNCTION(misdn_read)
if (*datalen > 0) { if (*datalen > 0) {
char hbuf[MAX_DATA_MEM] = { 0 }; char hbuf[MAX_DATA_MEM] = { 0 };
print_hex_bytes(data, *datalen, hbuf, sizeof(hbuf)); print_hex_bytes(data, *datalen, hbuf, sizeof(hbuf));
ftdm_log(FTDM_LOG_DEBUG, "mISDN read data: %s\n", hbuf); ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "mISDN read data: %s\n", hbuf);
} }
#endif #endif
return FTDM_SUCCESS; return FTDM_SUCCESS;
@ -1210,6 +1215,10 @@ static FIO_READ_FUNCTION(misdn_read)
misdn_handle_incoming(ftdmchan, rbuf, retval); misdn_handle_incoming(ftdmchan, rbuf, retval);
} }
} }
#ifdef MISDN_DEBUG_IO
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "mISDN nothing received on %c-channel\n",
ftdm_channel_get_type(ftdmchan) == FTDM_CHAN_TYPE_B ? 'B' : 'D');
#endif
return FTDM_SUCCESS; return FTDM_SUCCESS;
} }
@ -1250,21 +1259,16 @@ static FIO_WRITE_FUNCTION(misdn_write)
size += MISDN_HEADER_LEN; size += MISDN_HEADER_LEN;
#ifdef MISDN_DEBUG_IO #ifdef MISDN_DEBUG_IO
ftdm_log(FTDM_LOG_DEBUG, "mISDN writing %d bytes to channel %d:%d socket %d\n", ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "mISDN writing %d bytes to channel socket %d [dev.ch: %d.%d]\n",
size, ftdm_channel_get_span_id(ftdmchan), ftdm_channel_get_id(ftdmchan), ftdmchan->sockfd); size, ftdmchan->sockfd, priv->addr.dev, priv->addr.channel);
#endif #endif
if ((retval = sendto(ftdmchan->sockfd, wbuf, size, 0, NULL, 0)) != size) { if ((retval = sendto(ftdmchan->sockfd, wbuf, size, 0, NULL, 0)) != size) {
ftdm_log(FTDM_LOG_ERROR, "mISDN channel %d:%d socket write error: %s\n", ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "mISDN channel socket write error: %s\n",
ftdm_channel_get_span_id(ftdmchan), ftdm_channel_get_id(ftdmchan),
strerror(errno)); strerror(errno));
return FTDM_FAIL; return FTDM_FAIL;
} }
*datalen = retval; *datalen = retval;
// if (priv->debugfd >= 0) {
// write(priv->debugfd, wbuf + MISDN_HEADER_LEN, size - MISDN_HEADER_LEN);
// }
priv->tx_cnt++; priv->tx_cnt++;
return FTDM_SUCCESS; return FTDM_SUCCESS;
} }