From d94d016cef8c72810c31895985ad2f1b2f976aa1 Mon Sep 17 00:00:00 2001 From: Moises Silva Date: Wed, 2 Dec 2009 19:10:15 +0000 Subject: [PATCH] debug msgs git-svn-id: http://svn.openzap.org/svn/openzap/branches/sangoma_boost@922 a93c3328-9c30-0410-af19-c9cd2b2d52af --- .../ozmod_sangoma_boost/ozmod_sangoma_boost.c | 8 +++++++- .../sangoma_boost_client.c | 20 +++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c index 99df5c27cb..8706a1b401 100644 --- a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c +++ b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c @@ -369,6 +369,7 @@ static ZIO_CHANNEL_REQUEST_FUNCTION(sangoma_boost_channel_request) event.calling_number_screening_ind = caller_data->screen; event.calling_number_presentation = caller_data->pres; if (sangoma_boost_data->sigmod) { + /* boost sigmods only know about physical spans, give them that and let them hunt there */ event.span = (uint8_t)span->channels[1]->physical_span_id; } @@ -777,6 +778,11 @@ static void handle_call_start(zap_span_t *span, sangomabc_connection_t *mcon, sa goto error; } + zap_log(ZAP_LOG_DEBUG, "Got call start from s%dc%d mapped to openzap logical s%dc%d, physical s%dc%d\n", + event->span, event->chan, + zchan->span_id, zchan->chan_id, + zchan->physical_span_id, zchan->physical_chan_id); + zchan->sflags = 0; zap_set_string(zchan->caller_data.cid_num.digits, (char *)event->calling_number_digits); zap_set_string(zchan->caller_data.cid_name, (char *)event->calling_number_digits); @@ -812,7 +818,7 @@ static void handle_call_start(zap_span_t *span, sangomabc_connection_t *mcon, sa error: - zap_log(ZAP_LOG_CRIT, "START CANT FIND A CHAN %d:%d\n", event->span+1,event->chan+1); + zap_log(ZAP_LOG_CRIT, "START CANT FIND A CHAN %d:%d\n", event->span,event->chan); sangomabc_exec_command(mcon, event->span, diff --git a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c index 5d9eea5f36..111fab6288 100644 --- a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c +++ b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/sangoma_boost_client.c @@ -76,12 +76,12 @@ static void sangomabc_print_event_call(sangomabc_connection_t *mcon, sangomabc_e { if (event->event_id == SIGBOOST_EVENT_HEARTBEAT) return; - zap_log(file, func, line, ZAP_LOG_LEVEL_WARNING, "%s EVENT: %s:(%X) [w%dg%d] CSid=%i Seq=%i Cn=[%s] Cd=[%s] Ci=[%s] Rdnis=[%s]\n", + zap_log(file, func, line, ZAP_LOG_LEVEL_DEBUG, "%s EVENT: %s:(%X) [s%dc%d] CSid=%i Seq=%i Cn=[%s] Cd=[%s] Ci=[%s] Rdnis=[%s]\n", dir ? "TX":"RX", sangomabc_event_id_name(event->event_id), event->event_id, - event->span+1, - event->chan+1, + event->span, + event->chan, event->call_setup_id, event->fseqno, strlen(event->calling_name)?event->calling_name:"N/A", @@ -94,13 +94,13 @@ static void sangomabc_print_event_short(sangomabc_connection_t *mcon, sangomabc_ { if (event->event_id == SIGBOOST_EVENT_HEARTBEAT) return; - zap_log(file, func, line, ZAP_LOG_LEVEL_DEBUG, "%s EVENT (%s): %s:(%X) [w%dg%d] Rc=%i CSid=%i Seq=%i \n", + zap_log(file, func, line, ZAP_LOG_LEVEL_DEBUG, "%s EVENT (%s): %s:(%X) [s%dc%d] Rc=%i CSid=%i Seq=%i \n", dir ? "TX":"RX", priority ? "P":"N", sangomabc_event_id_name(event->event_id), event->event_id, - event->span+1, - event->chan+1, + event->span, + event->chan, event->release_cause, event->call_setup_id, event->fseqno); @@ -240,10 +240,10 @@ int sangomabc_exec_command(sangomabc_connection_t *mcon, int span, int chan, int while (sangomabc_connection_write(mcon, (sangomabc_event_t*)&oevent) <= 0) { if (--retry <= 0) { - zap_log(ZAP_LOG_CRIT, "Failed to tx on ISUP socket: %s\n", strerror(errno)); + zap_log(ZAP_LOG_CRIT, "Failed to tx on boost socket: %s\n", strerror(errno)); return -1; } else { - zap_log(ZAP_LOG_WARNING, "Failed to tx on ISUP socket: %s :retry %i\n", strerror(errno), retry); + zap_log(ZAP_LOG_WARNING, "Failed to tx on boost socket: %s :retry %i\n", strerror(errno), retry); zap_sleep(1); } } @@ -266,10 +266,10 @@ int sangomabc_exec_commandp(sangomabc_connection_t *pcon, int span, int chan, in while (sangomabc_connection_writep(pcon, (sangomabc_event_t*)&oevent) <= 0) { if (--retry <= 0) { - zap_log(ZAP_LOG_CRIT, "Failed to tx on ISUP socket: %s\n", strerror(errno)); + zap_log(ZAP_LOG_CRIT, "Failed to tx on boost socket: %s\n", strerror(errno)); return -1; } else { - zap_log(ZAP_LOG_WARNING, "Failed to tx on ISUP socket: %s :retry %i\n", strerror(errno), retry); + zap_log(ZAP_LOG_WARNING, "Failed to tx on boost socket: %s :retry %i\n", strerror(errno), retry); zap_sleep(1); } }