April 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4950 - in freeswitch/trunk/src: . mod/endpoints/mod_wanpipe
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: anthm Date: Mon Apr 16 16:51:19 2007 New Revision: 4950 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/switch_core_session.c Log: ... Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Mon Apr 16 16:51:19 2007 @@ -1433,7 +1433,7 @@ static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent) { char name[128]; - switch_core_session_t *session; + switch_core_session_t *session = NULL; switch_channel_t *channel; struct channel_map *chanmap; int ret = 0; @@ -1441,7 +1441,7 @@ switch_mutex_lock(globals.channel_mutex); chanmap = spri->private_info; - if (switch_core_session_locate(chanmap->map[pevent->ring.channel])) { + if ((session = switch_core_session_locate(chanmap->map[pevent->ring.channel]))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "--Duplicate Ring on channel s%dc%d (ignored)\n", spri->span, pevent->ring.channel); switch_core_session_rwunlock(session); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Apr 16 16:51:19 2007 @@ -225,22 +225,24 @@ } } - if ((cause = endpoint_interface->io_routines->outgoing_channel(session, outgoing_profile, new_session, pool)) == SWITCH_CAUSE_SUCCESS) { - if (session) { - for (ptr = session->event_hooks.outgoing_channel; ptr; ptr = ptr->next) { - if ((status = ptr->outgoing_channel(session, caller_profile, *new_session)) != SWITCH_STATUS_SUCCESS) { - break; - } + if ((cause = endpoint_interface->io_routines->outgoing_channel(session, outgoing_profile, new_session, pool)) != SWITCH_CAUSE_SUCCESS) { + return cause; + } + + if (session) { + for (ptr = session->event_hooks.outgoing_channel; ptr; ptr = ptr->next) { + if ((status = ptr->outgoing_channel(session, caller_profile, *new_session)) != SWITCH_STATUS_SUCCESS) { + break; } } - } else { - return cause; } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate outgoing channel interface for %s\n", endpoint_name); return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED; } + assert(*new_session != NULL); + if (*new_session) { switch_caller_profile_t *profile = NULL, *peer_profile = NULL, *cloned_profile = NULL; switch_event_t *event;

1 0

[commit] r4949 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: anthm Date: Mon Apr 16 16:26:21 2007 New Revision: 4949 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: ... Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Mon Apr 16 16:26:21 2007 @@ -306,7 +306,7 @@ } -static wpsock_t *wp_open(private_object_t *tech_pvt, int span, int chan) +static wpsock_t *wp_open(int span, int chan) { sng_fd_t fd; wpsock_t *sock; @@ -1110,7 +1110,7 @@ int chan, span; if (sangoma_span_chan_fromif(bchan, &span, &chan)) { - if (!wp_open(tech_pvt, span, chan)) { + if (!(tech_pvt->wpsock = wp_open(span, chan))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd for s%dc%d! [%s]\n", span, chan, strerror(errno)); switch_core_session_destroy(new_session); cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; @@ -1206,7 +1206,7 @@ goto error; } - if (!wp_open(tech_pvt, spri->span, callno)) { + if (!(tech_pvt->wpsock = wp_open(spri->span, callno))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd!\n"); switch_core_session_destroy(new_session); pri_sr_free(sr); @@ -1511,7 +1511,7 @@ tech_pvt->callno = pevent->ring.channel; tech_pvt->span = spri->span; - if (!wp_open(tech_pvt, spri->span, pevent->ring.channel)) { + if (!(tech_pvt->wpsock = wp_open(spri->span, pevent->ring.channel))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd!\n"); } @@ -1801,7 +1801,7 @@ tech_pvt->boost_chan_number = event->chan; tech_pvt->boost_pres = event->calling_number_presentation; - if (!wp_open(tech_pvt, event->span+1, event->chan+1)) { + if (!(tech_pvt->wpsock = wp_open(event->span+1, event->chan+1))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open channel %d:%d\n", event->span+1, event->chan+1); goto fail; } @@ -1879,7 +1879,7 @@ if (!tech_pvt->wpsock) { - if (!wp_open(tech_pvt, tech_pvt->boost_span_number+1, tech_pvt->boost_chan_number+1)) { + if (!(tech_pvt->wpsock = wp_open(tech_pvt->boost_span_number+1, tech_pvt->boost_chan_number+1))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd for s%dc%d! [%s]\n", tech_pvt->boost_span_number+1, tech_pvt->boost_chan_number+1, strerror(errno)); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -1922,7 +1922,7 @@ assert(tech_pvt != NULL); if (!tech_pvt->wpsock) { - if (!wp_open(tech_pvt, tech_pvt->boost_span_number+1, tech_pvt->boost_chan_number+1)) { + if (!(tech_pvt->wpsock=wp_open(tech_pvt->boost_span_number+1, tech_pvt->boost_chan_number+1))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd for s%dc%d! [%s]\n", tech_pvt->boost_span_number+1, tech_pvt->boost_chan_number+1, strerror(errno)); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -2247,7 +2247,7 @@ continue; } - if (!(sock = wp_open(NULL, span, chan))) { + if (!(sock = wp_open(span, chan))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot open device '%s' (%s)\n", c_dev, strerror(errno)); continue; }

1 0

[commit] r4948 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: anthm Date: Mon Apr 16 16:20:24 2007 New Revision: 4948 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: ... Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Mon Apr 16 16:20:24 2007 @@ -134,7 +134,6 @@ struct wpsock { sng_fd_t fd; char *name; - struct private_object *tech_pvt; }; typedef struct wpsock wpsock_t; @@ -307,20 +306,6 @@ } -static int wp_close(private_object_t *tech_pvt) -{ - int ret = 0; - - switch_mutex_lock(globals.hash_mutex); - if (tech_pvt->wpsock && tech_pvt->wpsock->tech_pvt == tech_pvt) { - tech_pvt->wpsock->tech_pvt = NULL; - ret = 1; - } - switch_mutex_unlock(globals.hash_mutex); - - return ret; -} - static wpsock_t *wp_open(private_object_t *tech_pvt, int span, int chan) { sng_fd_t fd; @@ -343,17 +328,6 @@ } } - if (sock && tech_pvt) { - if (sock->tech_pvt) { - if (tech_pvt->session) { - switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - } - } - sock->tech_pvt = tech_pvt; - tech_pvt->wpsock = sock; - } - switch_mutex_unlock(globals.hash_mutex); return sock; @@ -640,10 +614,6 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - - - wp_close(tech_pvt); - switch_core_codec_destroy(&tech_pvt->read_codec); switch_core_codec_destroy(&tech_pvt->write_codec); @@ -962,8 +932,6 @@ default: break; } - //sangoma_socket_close(&tech_pvt->wpsock->fd); - //wp_close(tech_pvt); return SWITCH_STATUS_SUCCESS; @@ -1366,21 +1334,17 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); - - if (!tech_pvt->call) { - tech_pvt->call = pevent->hangup.call; - } + if (switch_channel_get_state(channel) < CS_HANGUP) { + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); - tech_pvt->cause = pevent->hangup.cause; - switch_set_flag_locked(tech_pvt, TFLAG_BYE); - switch_channel_hangup(channel, tech_pvt->cause); - - switch_mutex_lock(globals.channel_mutex); - *chanmap->map[pevent->hangup.channel] = '\0'; - switch_mutex_unlock(globals.channel_mutex); + if (!tech_pvt->call) { + tech_pvt->call = pevent->hangup.call; + } + tech_pvt->cause = pevent->hangup.cause; + switch_channel_hangup(channel, tech_pvt->cause); + } switch_core_session_rwunlock(session); }

1 0

[commit] r4947 - freeswitch/trunk/src
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: anthm Date: Mon Apr 16 15:41:33 2007 New Revision: 4947 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: ... Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Apr 16 15:41:33 2007 @@ -535,7 +535,7 @@ continue; } - switch_core_session_read_lock(peer_sessions[i]); + switch_core_session_read_lock(new_session); pool = NULL; caller_profiles[i] = new_profile;

1 0

[commit] r4946 - freeswitch/trunk/src
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: anthm Date: Mon Apr 16 15:39:07 2007 New Revision: 4946 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: ... Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Apr 16 15:39:07 2007 @@ -486,7 +486,7 @@ NULL, caller_caller_profile->rdnis, caller_caller_profile->source, caller_caller_profile->context, chan_data); - caller_profiles[i]->flags = caller_caller_profile->flags; + new_profile->flags = caller_caller_profile->flags; pool = NULL; } else { if (!cid_name_override) {

1 0

[commit] r4945 - in freeswitch/trunk/src: . mod/endpoints/mod_wanpipe
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: anthm Date: Mon Apr 16 15:32:08 2007 New Revision: 4945 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Log: ... Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Mon Apr 16 15:32:08 2007 @@ -1016,7 +1016,15 @@ char *protocol = NULL; char *dest; int ready = 0, is_pri = 0, is_boost = 0, is_raw = 0; - switch_call_cause_t cause = SWITCH_CAUSE_SUCCESS; + switch_call_cause_t cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + private_object_t *tech_pvt; + switch_channel_t *channel; + switch_caller_profile_t *caller_profile = NULL; + int callno = 0; + struct sangoma_pri *spri; + int span = 0, autospan = 0, autochan = 0; + char *num, *p; + struct channel_map *chanmap = NULL; if (!outbound_profile) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n"); @@ -1025,6 +1033,7 @@ } protocol = strdup(outbound_profile->destination_number); + assert(protocol != NULL); if (!(dest = strchr(protocol, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error No protocol specified!\n"); @@ -1059,225 +1068,219 @@ outbound_profile->destination_number = dest; - if ((*new_session = switch_core_session_request(&wanpipe_endpoint_interface, pool))) { - private_object_t *tech_pvt; - switch_channel_t *channel; - switch_caller_profile_t *caller_profile = NULL; - int callno = 0; - struct sangoma_pri *spri; - int span = 0, autospan = 0, autochan = 0; - char *num, *p; - struct channel_map *chanmap = NULL; - + if (!(*new_session = switch_core_session_request(&wanpipe_endpoint_interface, pool))) { + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + goto error; + } - switch_core_session_add_stream(*new_session, NULL); - if ((tech_pvt = (private_object_t *) switch_core_session_alloc(*new_session, sizeof(private_object_t)))) { - memset(tech_pvt, 0, sizeof(*tech_pvt)); - switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); - channel = switch_core_session_get_channel(*new_session); - switch_core_session_set_private(*new_session, tech_pvt); - tech_pvt->session = *new_session; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - switch_core_session_destroy(new_session); - cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - goto error; - } + switch_core_session_add_stream(*new_session, NULL); + if ((tech_pvt = (private_object_t *) switch_core_session_alloc(*new_session, sizeof(private_object_t)))) { + memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); + channel = switch_core_session_get_channel(*new_session); + switch_core_session_set_private(*new_session, tech_pvt); + tech_pvt->session = *new_session; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + switch_core_session_destroy(new_session); + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + goto error; + } - caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); + caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); - if (is_pri) { - num = caller_profile->destination_number; + if (is_pri) { + num = caller_profile->destination_number; + if ((p = strchr(num, '/'))) { + *p++ = '\0'; + + if (*num == 'a') { + span = 1; + autospan = 1; + } else if (*num == 'A') { + span = MAX_SPANS - 1; + autospan = -1; + } else { + if (num && *num > 47 && *num < 58) { + span = atoi(num); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invlid Syntax\n"); + switch_core_session_destroy(new_session); + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + goto error; + } + } + num = p; if ((p = strchr(num, '/'))) { *p++ = '\0'; - if (*num == 'a') { - span = 1; - autospan = 1; + autochan = 1; } else if (*num == 'A') { - span = MAX_SPANS - 1; - autospan = -1; - } else { - if (num && *num > 47 && *num < 58) { - span = atoi(num); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invlid Syntax\n"); - switch_core_session_destroy(new_session); - cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - goto error; - } - } - num = p; - if ((p = strchr(num, '/'))) { - *p++ = '\0'; - if (*num == 'a') { - autochan = 1; - } else if (*num == 'A') { - autochan = -1; - } else if (num && *num > 47 && *num < 58) { - callno = atoi(num); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invlid Syntax\n"); - switch_core_session_destroy(new_session); - cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - goto error; - } - caller_profile->destination_number = p; + autochan = -1; + } else if (num && *num > 47 && *num < 58) { + callno = atoi(num); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invlid Syntax\n"); switch_core_session_destroy(new_session); cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; goto error; } + caller_profile->destination_number = p; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invlid Syntax\n"); + switch_core_session_destroy(new_session); + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + goto error; } } + } - tech_pvt->caller_profile = caller_profile; + tech_pvt->caller_profile = caller_profile; - if (is_raw) { - int chan, span; + if (is_raw) { + int chan, span; - if (sangoma_span_chan_fromif(bchan, &span, &chan)) { - if (!wp_open(tech_pvt, span, chan)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd for s%dc%d! [%s]\n", span, chan, strerror(errno)); - switch_core_session_destroy(new_session); - cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - goto error; - } - switch_set_flag_locked(tech_pvt, TFLAG_NOSIG); - snprintf(name, sizeof(name), "wanpipe/%s/nosig", bchan); - switch_channel_set_name(channel, name); - switch_channel_set_caller_profile(channel, caller_profile); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid address\n"); + if (sangoma_span_chan_fromif(bchan, &span, &chan)) { + if (!wp_open(tech_pvt, span, chan)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd for s%dc%d! [%s]\n", span, chan, strerror(errno)); switch_core_session_destroy(new_session); - cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL; + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; goto error; } - } else if (is_pri) { - switch_mutex_lock(globals.channel_mutex); - callno = 0; - while (!callno) { - if (autospan > 0 && span == MAX_SPANS - 1) { - break; - } + switch_set_flag_locked(tech_pvt, TFLAG_NOSIG); + snprintf(name, sizeof(name), "wanpipe/%s/nosig", bchan); + switch_channel_set_name(channel, name); + switch_channel_set_caller_profile(channel, caller_profile); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid address\n"); + switch_core_session_destroy(new_session); + cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL; + goto error; + } + } else if (is_pri) { + switch_mutex_lock(globals.channel_mutex); + callno = 0; + while (!callno) { + if (autospan > 0 && span == MAX_SPANS - 1) { + break; + } - if (autospan < 0 && span == 0) { - break; - } + if (autospan < 0 && span == 0) { + break; + } - if (SPANS[span] && (spri = &SPANS[span]->spri) && switch_test_flag(spri, SANGOMA_PRI_READY)) { - chanmap = spri->private_info; + if (SPANS[span] && (spri = &SPANS[span]->spri) && switch_test_flag(spri, SANGOMA_PRI_READY)) { + chanmap = spri->private_info; - if (autochan > 0) { - for(callno = 1; callno < SANGOMA_MAX_CHAN_PER_SPAN; callno++) { - if ((SPANS[span]->bchans & (1 << callno)) && ! *chanmap->map[callno]) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel s%dc%d\n", span, callno); - goto done; - } + if (autochan > 0) { + for(callno = 1; callno < SANGOMA_MAX_CHAN_PER_SPAN; callno++) { + if ((SPANS[span]->bchans & (1 << callno)) && ! *chanmap->map[callno]) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel s%dc%d\n", span, callno); + goto done; } - callno = 0; - } else if (autochan < 0) { - for(callno = SANGOMA_MAX_CHAN_PER_SPAN; callno > 0; callno--) { - if ((SPANS[span]->bchans & (1 << callno)) && ! *chanmap->map[callno]) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel s%dc%d\n", span, callno); - goto done; - } + } + callno = 0; + } else if (autochan < 0) { + for(callno = SANGOMA_MAX_CHAN_PER_SPAN; callno > 0; callno--) { + if ((SPANS[span]->bchans & (1 << callno)) && ! *chanmap->map[callno]) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel s%dc%d\n", span, callno); + goto done; } - callno = 0; } - } - - if (autospan > 0) { - span++; - } else if (autospan < 0) { - span--; + callno = 0; } } - done: - switch_mutex_unlock(globals.channel_mutex); - if (!spri || callno == 0 || callno == (SANGOMA_MAX_CHAN_PER_SPAN)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No Free Channels!\n"); - switch_core_session_destroy(new_session); - cause = SWITCH_CAUSE_SWITCH_CONGESTION; - goto error; + if (autospan > 0) { + span++; + } else if (autospan < 0) { + span--; } + } + done: + switch_mutex_unlock(globals.channel_mutex); + + if (!spri || callno == 0 || callno == (SANGOMA_MAX_CHAN_PER_SPAN)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No Free Channels!\n"); + switch_core_session_destroy(new_session); + cause = SWITCH_CAUSE_SWITCH_CONGESTION; + goto error; + } - tech_pvt->callno = callno; + tech_pvt->callno = callno; - if (spri && (tech_pvt->call = pri_new_call(spri->pri))) { - struct pri_sr *sr; + if (spri && (tech_pvt->call = pri_new_call(spri->pri))) { + struct pri_sr *sr; - snprintf(name, sizeof(name), "wanpipe/pri/s%dc%d/%s", spri->span, callno, caller_profile->destination_number); - switch_channel_set_name(channel, name); - switch_channel_set_caller_profile(channel, caller_profile); - sr = pri_sr_new(); - pri_sr_set_channel(sr, callno, 0, 0); - pri_sr_set_bearer(sr, 0, SPANS[span]->l1); - pri_sr_set_called(sr, caller_profile->destination_number, SPANS[span]->dp, 1); - pri_sr_set_caller(sr, - caller_profile->caller_id_number, - caller_profile->caller_id_name, - SPANS[span]->dp, - PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN); - pri_sr_set_redirecting(sr, - caller_profile->caller_id_number, - SPANS[span]->dp, - PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, - PRI_REDIR_UNCONDITIONAL); + snprintf(name, sizeof(name), "wanpipe/pri/s%dc%d/%s", spri->span, callno, caller_profile->destination_number); + switch_channel_set_name(channel, name); + switch_channel_set_caller_profile(channel, caller_profile); + sr = pri_sr_new(); + pri_sr_set_channel(sr, callno, 0, 0); + pri_sr_set_bearer(sr, 0, SPANS[span]->l1); + pri_sr_set_called(sr, caller_profile->destination_number, SPANS[span]->dp, 1); + pri_sr_set_caller(sr, + caller_profile->caller_id_number, + caller_profile->caller_id_name, + SPANS[span]->dp, + PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN); + pri_sr_set_redirecting(sr, + caller_profile->caller_id_number, + SPANS[span]->dp, + PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, + PRI_REDIR_UNCONDITIONAL); - if (pri_setup(spri->pri, tech_pvt->call , sr)) { - switch_core_session_destroy(new_session); - pri_sr_free(sr); - cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - goto error; - } - - if (!wp_open(tech_pvt, spri->span, callno)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd!\n"); - switch_core_session_destroy(new_session); - pri_sr_free(sr); - cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - goto error; - } + if (pri_setup(spri->pri, tech_pvt->call , sr)) { + switch_core_session_destroy(new_session); pri_sr_free(sr); - switch_copy_string(chanmap->map[callno], - switch_core_session_get_uuid(*new_session), - sizeof(chanmap->map[callno])); - tech_pvt->spri = spri; + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + goto error; } - } else if (is_boost) { - char *p; - if ((p = strchr(caller_profile->destination_number, '/'))) { - char *grp = caller_profile->destination_number; - *p = '\0'; - caller_profile->destination_number = p+1; - tech_pvt->boost_trunk_group = atoi(grp+1) - 1; - if (tech_pvt->boost_trunk_group < 0) { - tech_pvt->boost_trunk_group = 0; - } + if (!wp_open(tech_pvt, spri->span, callno)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd!\n"); + switch_core_session_destroy(new_session); + pri_sr_free(sr); + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + goto error; } - sprintf(name, "wanpipe/ss7boost/%s", caller_profile->destination_number); - switch_channel_set_name(channel, name); - tech_pvt->ss7boost_handle = globals.ss7boost_handle; + pri_sr_free(sr); + switch_copy_string(chanmap->map[callno], + switch_core_session_get_uuid(*new_session), + sizeof(chanmap->map[callno])); + tech_pvt->spri = spri; + } + } else if (is_boost) { + char *p; - if (session && switch_core_session_compare(session, *new_session)) { - private_object_t *otech_pvt = switch_core_session_get_private(session); - tech_pvt->boost_pres = otech_pvt->boost_pres; + if ((p = strchr(caller_profile->destination_number, '/'))) { + char *grp = caller_profile->destination_number; + *p = '\0'; + caller_profile->destination_number = p+1; + tech_pvt->boost_trunk_group = atoi(grp+1) - 1; + if (tech_pvt->boost_trunk_group < 0) { + tech_pvt->boost_trunk_group = 0; } + } + sprintf(name, "wanpipe/ss7boost/%s", caller_profile->destination_number); + switch_channel_set_name(channel, name); + tech_pvt->ss7boost_handle = globals.ss7boost_handle; + if (session && switch_core_session_compare(session, *new_session)) { + private_object_t *otech_pvt = switch_core_session_get_private(session); + tech_pvt->boost_pres = otech_pvt->boost_pres; } - tech_pvt->caller_profile = caller_profile; - switch_channel_set_flag(channel, CF_OUTBOUND); - switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); - switch_channel_set_state(channel, CS_INIT); - cause = SWITCH_CAUSE_SUCCESS; } + tech_pvt->caller_profile = caller_profile; + switch_channel_set_flag(channel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + switch_channel_set_state(channel, CS_INIT); + cause = SWITCH_CAUSE_SUCCESS; + + error: switch_safe_free(protocol); return cause; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Apr 16 15:32:08 2007 @@ -81,18 +81,13 @@ switch_channel_state_t b_state; switch_status_t status; switch_event_t *event; - + /* if you really want to make sure it's not ready, test it twice because it might be just a break */ if (!switch_channel_ready(chan_a) && !switch_channel_ready(chan_a)) { break; } - b_state = switch_channel_get_state(chan_b); - - switch (b_state) { - case CS_HANGUP: - case CS_DONE: - default: + if ((b_state = switch_channel_get_state(chan_b)) >= CS_HANGUP) { break; } @@ -181,11 +176,11 @@ } } - switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); msg.string_arg = data->b_uuid; msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE; msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); + switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Apr 16 15:32:08 2007 @@ -246,8 +246,8 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; switch_channel_t *caller_channel = NULL; char *peer_names[MAX_PEERS] = { 0 }; - switch_core_session_t *peer_session, *peer_sessions[MAX_PEERS] = { 0 }; - switch_caller_profile_t *caller_profiles[MAX_PEERS] = { 0 }, *caller_caller_profile; + switch_core_session_t *new_session = NULL, *peer_session, *peer_sessions[MAX_PEERS] = { 0 }; + switch_caller_profile_t *new_profile = NULL, *caller_profiles[MAX_PEERS] = { 0 }, *caller_caller_profile; char *chan_type = NULL, *chan_data; switch_channel_t *peer_channel = NULL, *peer_channels[MAX_PEERS] = { 0 }; ringback_t ringback = { 0 }; @@ -427,6 +427,8 @@ memset(peer_sessions, 0, sizeof(peer_sessions)); memset(peer_channels, 0, sizeof(peer_channels)); memset(caller_profiles, 0, sizeof(caller_profiles)); + new_profile = NULL; + new_session = NULL; chan_type = NULL; chan_data = NULL; peer_channel = NULL; @@ -474,16 +476,16 @@ cid_num_override = caller_caller_profile->caller_id_number; } - caller_profiles[i] = switch_caller_profile_new(switch_core_session_get_pool(session), - caller_caller_profile->username, - caller_caller_profile->dialplan, - cid_name_override, - cid_num_override, - caller_caller_profile->network_addr, - NULL, - NULL, - caller_caller_profile->rdnis, - caller_caller_profile->source, caller_caller_profile->context, chan_data); + new_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + caller_caller_profile->username, + caller_caller_profile->dialplan, + cid_name_override, + cid_num_override, + caller_caller_profile->network_addr, + NULL, + NULL, + caller_caller_profile->rdnis, + caller_caller_profile->source, caller_caller_profile->context, chan_data); caller_profiles[i]->flags = caller_caller_profile->flags; pool = NULL; } else { @@ -501,42 +503,44 @@ } if (caller_profile_override) { - caller_profiles[i] = switch_caller_profile_new(pool, - caller_profile_override->username, - caller_profile_override->dialplan, - caller_profile_override->caller_id_name, - caller_profile_override->caller_id_number, - caller_profile_override->network_addr, - caller_profile_override->ani, - caller_profile_override->aniii, - caller_profile_override->rdnis, - caller_profile_override->source, caller_profile_override->context, chan_data); + new_profile = switch_caller_profile_new(pool, + caller_profile_override->username, + caller_profile_override->dialplan, + caller_profile_override->caller_id_name, + caller_profile_override->caller_id_number, + caller_profile_override->network_addr, + caller_profile_override->ani, + caller_profile_override->aniii, + caller_profile_override->rdnis, + caller_profile_override->source, caller_profile_override->context, chan_data); } else { - caller_profiles[i] = switch_caller_profile_new(pool, - NULL, - NULL, - cid_name_override, cid_num_override, NULL, NULL, NULL, NULL, __FILE__, NULL, - chan_data); + new_profile = switch_caller_profile_new(pool, + NULL, + NULL, + cid_name_override, cid_num_override, NULL, NULL, NULL, NULL, __FILE__, NULL, + chan_data); } } - - if ((reason = - switch_core_session_outgoing_channel(session, chan_type, caller_profiles[i], &peer_sessions[i], &pool)) != SWITCH_CAUSE_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! cause: %s\n", - switch_channel_cause2str(reason)); + + caller_profiles[i] = NULL; + peer_channels[i] = NULL; + peer_sessions[i] = NULL; + new_session = NULL; + + if ((reason = switch_core_session_outgoing_channel(session, chan_type, new_profile, &new_session, &pool)) != SWITCH_CAUSE_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! cause: %s\n", switch_channel_cause2str(reason)); if (pool) { switch_core_destroy_memory_pool(&pool); } - caller_profiles[i] = NULL; - peer_channels[i] = NULL; - peer_sessions[i] = NULL; continue; } switch_core_session_read_lock(peer_sessions[i]); pool = NULL; - peer_channels[i] = switch_core_session_get_channel(peer_sessions[i]); + caller_profiles[i] = new_profile; + peer_sessions[i] = new_session; + peer_channels[i] = switch_core_session_get_channel(new_session); assert(peer_channels[i] != NULL); if (!table) {

1 0

[commit] r4944 - in freeswitch/trunk/src: . include mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/endpoints/mod_wanpipe mod/endpoints/mod_woomera
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: anthm Date: Mon Apr 16 12:53:30 2007 New Revision: 4944 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_core_event_hook.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_event_hook.c freeswitch/trunk/src/switch_core_session.c Log: <refactor> Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Apr 16 12:53:30 2007 @@ -527,6 +527,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_queue_message(switch_core_session_t *session, switch_core_session_message_t *message); /*! + \brief pass an indication message on a session + \param session the session to pass the message across + \param indication the indication message to pass + \return SWITCH_STATUS_SUCCESS if the message was passed +*/ +SWITCH_DECLARE(switch_status_t) switch_core_session_pass_indication(switch_core_session_t *session, switch_core_session_message_types_t indication); + +/*! \brief Queue an indication message on a session \param session the session to queue the message to \param indication the indication message to queue @@ -640,13 +648,6 @@ switch_core_session_t **new_session, switch_memory_pool_t **pool); /*! - \brief Answer the channel of a given session - \param session the session to answer the channel of - \return SWITCH_STATUS_SUCCESS if the channel was answered -*/ -SWITCH_DECLARE(switch_status_t) switch_core_session_answer_channel(switch_core_session_t *session); - -/*! \brief Receive a message on a given session \param session the session to receive the message from \param message the message to recieve Modified: freeswitch/trunk/src/include/switch_core_event_hook.h ============================================================================== --- freeswitch/trunk/src/include/switch_core_event_hook.h (original) +++ freeswitch/trunk/src/include/switch_core_event_hook.h Mon Apr 16 12:53:30 2007 @@ -35,7 +35,6 @@ SWITCH_BEGIN_EXTERN_C typedef struct switch_io_event_hooks switch_io_event_hooks_t; typedef struct switch_io_event_hook_outgoing_channel switch_io_event_hook_outgoing_channel_t; -typedef struct switch_io_event_hook_answer_channel switch_io_event_hook_answer_channel_t; typedef struct switch_io_event_hook_receive_message switch_io_event_hook_receive_message_t; typedef struct switch_io_event_hook_receive_event switch_io_event_hook_receive_event_t; typedef struct switch_io_event_hook_read_frame switch_io_event_hook_read_frame_t; @@ -48,7 +47,6 @@ typedef switch_status_t (*switch_outgoing_channel_hook_t) (switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t *); -typedef switch_status_t (*switch_answer_channel_hook_t) (switch_core_session_t *); typedef switch_status_t (*switch_receive_message_hook_t) (switch_core_session_t *, switch_core_session_message_t *); typedef switch_status_t (*switch_receive_event_hook_t) (switch_core_session_t *, switch_event_t *); typedef switch_status_t (*switch_read_frame_hook_t) (switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int); @@ -67,23 +65,16 @@ struct switch_io_event_hook_outgoing_channel *next; }; -/*! \brief Node in which to store custom answer channel callback hooks */ -struct switch_io_event_hook_answer_channel { - /*! the answer channel callback hook */ - switch_answer_channel_hook_t answer_channel; - struct switch_io_event_hook_answer_channel *next; -}; - /*! \brief Node in which to store custom receive message callback hooks */ struct switch_io_event_hook_receive_message { - /*! the answer channel callback hook */ + /*! the message callback hook */ switch_receive_message_hook_t receive_message; struct switch_io_event_hook_receive_message *next; }; /*! \brief Node in which to store custom receive message callback hooks */ struct switch_io_event_hook_receive_event { - /*! the answer channel callback hook */ + /*! the event callback hook */ switch_receive_event_hook_t receive_event; struct switch_io_event_hook_receive_event *next; }; @@ -141,8 +132,6 @@ struct switch_io_event_hooks { /*! a list of outgoing channel hooks */ switch_io_event_hook_outgoing_channel_t *outgoing_channel; - /*! a list of answer channel hooks */ - switch_io_event_hook_answer_channel_t *answer_channel; /*! a list of receive message hooks */ switch_io_event_hook_receive_message_t *receive_message; /*! a list of queue message hooks */ @@ -181,14 +170,6 @@ switch_outgoing_channel_hook_t outgoing_channel); /*! - \brief Add an event hook to be executed when a session answers a channel - \param session session to bind hook to - \param answer_channel hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_answer_channel(switch_core_session_t *session, switch_answer_channel_hook_t answer_channel); - -/*! \brief Add an event hook to be executed when a session sends a message \param session session to bind hook to \param receive_message hook to bind @@ -250,7 +231,7 @@ \param state_change hook to bind \return SWITCH_STATUS_SUCCESS on suceess */ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_state_change(switch_core_session_t *session, switch_answer_channel_hook_t state_change); +SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_state_change(switch_core_session_t *session, switch_state_change_hook_t state_change); ///\} SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Mon Apr 16 12:53:30 2007 @@ -81,8 +81,6 @@ struct switch_io_routines { /*! creates an outgoing session from given session, caller profile */ switch_call_cause_t (*outgoing_channel) (switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t **, switch_memory_pool_t **); - /*! answers the given session's channel */ - switch_status_t (*answer_channel) (switch_core_session_t *); /*! read a frame from a session */ switch_status_t (*read_frame) (switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int); /*! write a frame to a session */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Apr 16 12:53:30 2007 @@ -349,6 +349,7 @@ <pre> SWITCH_MESSAGE_REDIRECT_AUDIO - Indication to redirect audio to another location if possible SWITCH_MESSAGE_TRANSMIT_TEXT - A text message + SWITCH_MESSAGE_INDICATE_ANSWER - indicate answer SWITCH_MESSAGE_INDICATE_PROGRESS - indicate progress SWITCH_MESSAGE_INDICATE_BRIDGE - indicate a bridge starting SWITCH_MESSAGE_INDICATE_UNBRIDGE - indicate a bridge ending @@ -363,6 +364,7 @@ typedef enum { SWITCH_MESSAGE_REDIRECT_AUDIO, SWITCH_MESSAGE_TRANSMIT_TEXT, + SWITCH_MESSAGE_INDICATE_ANSWER, SWITCH_MESSAGE_INDICATE_PROGRESS, SWITCH_MESSAGE_INDICATE_BRIDGE, SWITCH_MESSAGE_INDICATE_UNBRIDGE, Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Apr 16 12:53:30 2007 @@ -1513,6 +1513,9 @@ assert(tech_pvt != NULL); switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_ANSWER: + channel_answer_channel(session); + break; case SWITCH_MESSAGE_INDICATE_BRIDGE: if (tech_pvt->rtp_session && switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) { switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER); @@ -1571,7 +1574,6 @@ static const switch_io_routines_t channel_io_routines = { /*.outgoing_channel */ channel_outgoing_channel, - /*.answer_channel */ channel_answer_channel, /*.read_frame */ channel_read_frame, /*.write_frame */ channel_write_frame, /*.kill_channel */ channel_kill_channel, Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Apr 16 12:53:30 2007 @@ -747,6 +747,29 @@ return SWITCH_STATUS_SUCCESS; } + +static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = (private_t *) switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_ANSWER: + channel_answer_channel(session); + break; + default: + break; + } + + return SWITCH_STATUS_SUCCESS; +} + static const switch_state_handler_table_t channel_event_handlers = { /*.on_init */ channel_on_init, /*.on_ring */ channel_on_ring, @@ -758,13 +781,13 @@ static const switch_io_routines_t channel_io_routines = { /*.outgoing_channel */ channel_outgoing_channel, - /*.answer_channel */ channel_answer_channel, /*.read_frame */ channel_read_frame, /*.write_frame */ channel_write_frame, /*.kill_channel */ channel_kill_channel, /*.waitfor_read */ channel_waitfor_read, /*.waitfor_write */ channel_waitfor_write, - /*.send_dtmf */ channel_send_dtmf + /*.send_dtmf */ channel_send_dtmf, + /*.receive_message*/ channel_receive_message }; static const switch_endpoint_interface_t channel_endpoint_interface = { Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Apr 16 12:53:30 2007 @@ -718,6 +718,9 @@ switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_ANSWER: + channel_answer_channel(session); + break; case SWITCH_MESSAGE_INDICATE_PROGRESS: { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Engage Early Media\n"); @@ -788,7 +791,6 @@ static const switch_io_routines_t channel_io_routines = { /*.outgoing_channel */ channel_outgoing_channel, - /*.answer_channel */ channel_answer_channel, /*.read_frame */ channel_read_frame, /*.write_frame */ channel_write_frame, /*.kill_channel */ channel_kill_channel, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Apr 16 12:53:30 2007 @@ -675,9 +675,14 @@ break; case SWITCH_MESSAGE_INDICATE_RINGING: nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); + switch_channel_mark_ring_ready(channel); + break; + case SWITCH_MESSAGE_INDICATE_ANSWER: + sofia_answer_channel(session); break; case SWITCH_MESSAGE_INDICATE_PROGRESS:{ if (!switch_test_flag(tech_pvt, TFLAG_ANS)) { + switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from); @@ -708,7 +713,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ring SDP:\n%s\n", tech_pvt->local_sdp_str); } } - + switch_channel_mark_pre_answered(channel); nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SIPTAG_CONTACT_STR(tech_pvt->profile->url), @@ -754,7 +759,6 @@ static const switch_io_routines_t sofia_io_routines = { /*.outgoing_channel */ sofia_outgoing_channel, - /*.answer_channel */ sofia_answer_channel, /*.read_frame */ sofia_read_frame, /*.write_frame */ sofia_write_frame, /*.kill_channel */ sofia_kill_channel, Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Mon Apr 16 12:53:30 2007 @@ -930,6 +930,9 @@ break; case SWITCH_MESSAGE_INDICATE_REDIRECT: break; + case SWITCH_MESSAGE_INDICATE_ANSWER: + wanpipe_answer_channel(session); + break; case SWITCH_MESSAGE_INDICATE_PROGRESS: break; case SWITCH_MESSAGE_INDICATE_RINGING: @@ -969,7 +972,6 @@ static const switch_io_routines_t wanpipe_io_routines = { /*.outgoing_channel */ wanpipe_outgoing_channel, - /*.answer_channel */ wanpipe_answer_channel, /*.read_frame */ wanpipe_read_frame, /*.write_frame */ wanpipe_write_frame, /*.kill_channel */ wanpipe_kill_channel, @@ -1422,16 +1424,8 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - if ((msg = malloc(sizeof(*msg)))) { - memset(msg, 0, sizeof(*msg)); - msg->message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; - msg->from = __FILE__; - switch_core_session_queue_message(session, msg); - switch_set_flag(msg, SCSMF_DYNAMIC); - switch_channel_mark_pre_answered(channel); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - } + switch_core_session_pass_indication(session, SWITCH_MESSAGE_INDICATE_PROGRESS); + switch_channel_mark_pre_answered(channel); switch_core_session_rwunlock(session); } else { @@ -1457,7 +1451,7 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_core_session_pass_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); switch_channel_mark_ring_ready(channel); switch_core_session_rwunlock(session); Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Mon Apr 16 12:53:30 2007 @@ -447,7 +447,6 @@ static const switch_io_routines_t woomera_io_routines = { /*.outgoing_channel */ woomera_outgoing_channel, - /*.answer_channel */ NULL, /*.read_frame */ woomera_read_frame, /*.write_frame */ woomera_write_frame, /*.kill_channel */ woomera_kill_channel, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Apr 16 12:53:30 2007 @@ -1080,7 +1080,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel, const char *file, const char *func, int line) { switch_core_session_message_t msg; - char *uuid = switch_core_session_get_uuid(channel->session); switch_status_t status; assert(channel != NULL); @@ -1099,7 +1098,7 @@ msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; msg.from = channel->name; - status = switch_core_session_message_send(uuid, &msg); + status = switch_core_session_receive_message(channel->session, &msg); if (status == SWITCH_STATUS_SUCCESS) { status = switch_channel_perform_mark_pre_answered(channel, file, func, line); @@ -1111,7 +1110,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_ring_ready(switch_channel_t *channel, const char *file, const char *func, int line) { switch_core_session_message_t msg; - char *uuid = switch_core_session_get_uuid(channel->session); switch_status_t status; assert(channel != NULL); @@ -1130,7 +1128,7 @@ msg.message_id = SWITCH_MESSAGE_INDICATE_RINGING; msg.from = channel->name; - status = switch_core_session_message_send(uuid, &msg); + status = switch_core_session_receive_message(channel->session, &msg); if (status == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_NOTICE, "Ring Ready %s!\n", channel->name); @@ -1185,6 +1183,9 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *channel, const char *file, const char *func, int line) { + switch_core_session_message_t msg; + switch_status_t status; + assert(channel != NULL); if (channel->hangup_cause || channel->state >= CS_HANGUP) { @@ -1195,7 +1196,12 @@ return SWITCH_STATUS_SUCCESS; } - if (switch_core_session_answer_channel(channel->session) == SWITCH_STATUS_SUCCESS) { + + msg.message_id = SWITCH_MESSAGE_INDICATE_ANSWER; + msg.from = channel->name; + status = switch_core_session_receive_message(channel->session, &msg); + + if (status == SWITCH_STATUS_SUCCESS) { return switch_channel_perform_mark_answered(channel, file, func, line); } Modified: freeswitch/trunk/src/switch_core_event_hook.c ============================================================================== --- freeswitch/trunk/src/switch_core_event_hook.c (original) +++ freeswitch/trunk/src/switch_core_event_hook.c Mon Apr 16 12:53:30 2007 @@ -52,29 +52,7 @@ return SWITCH_STATUS_MEMERR; } -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_answer_channel(switch_core_session_t *session, switch_answer_channel_hook_t answer_channel) -{ - switch_io_event_hook_answer_channel_t *hook, *ptr; - - assert(answer_channel != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->answer_channel = answer_channel; - if (!session->event_hooks.answer_channel) { - session->event_hooks.answer_channel = hook; - } else { - for (ptr = session->event_hooks.answer_channel; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_state_change(switch_core_session_t *session, switch_answer_channel_hook_t state_change) +SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_state_change(switch_core_session_t *session, switch_state_change_hook_t state_change) { switch_io_event_hook_state_change_t *hook, *ptr; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Apr 16 12:53:30 2007 @@ -320,50 +320,52 @@ return cause; } -SWITCH_DECLARE(switch_status_t) switch_core_session_answer_channel(switch_core_session_t *session) +SWITCH_DECLARE(switch_status_t) switch_core_session_receive_message(switch_core_session_t *session, switch_core_session_message_t *message) { - switch_io_event_hook_answer_channel_t *ptr; + switch_io_event_hook_receive_message_t *ptr; switch_status_t status = SWITCH_STATUS_SUCCESS; assert(session != NULL); - if (session->endpoint_interface->io_routines->answer_channel) { - status = session->endpoint_interface->io_routines->answer_channel(session); + if (session->endpoint_interface->io_routines->receive_message) { + status = session->endpoint_interface->io_routines->receive_message(session, message); + } if (status == SWITCH_STATUS_SUCCESS) { - for (ptr = session->event_hooks.answer_channel; ptr; ptr = ptr->next) { - if ((status = ptr->answer_channel(session)) != SWITCH_STATUS_SUCCESS) { + for (ptr = session->event_hooks.receive_message; ptr; ptr = ptr->next) { + if ((status = ptr->receive_message(session, message)) != SWITCH_STATUS_SUCCESS) { break; } } } - + switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); return status; } -SWITCH_DECLARE(switch_status_t) switch_core_session_receive_message(switch_core_session_t *session, switch_core_session_message_t *message) +SWITCH_DECLARE(switch_status_t) switch_core_session_pass_indication(switch_core_session_t *session, switch_core_session_message_types_t indication) { - switch_io_event_hook_receive_message_t *ptr; + switch_core_session_message_t msg = {0}; + switch_core_session_t *other_session; + char *uuid; + switch_channel_t *channel; switch_status_t status = SWITCH_STATUS_SUCCESS; assert(session != NULL); + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); - if (session->endpoint_interface->io_routines->receive_message) { - status = session->endpoint_interface->io_routines->receive_message(session, message); - - } - - if (status == SWITCH_STATUS_SUCCESS) { - for (ptr = session->event_hooks.receive_message; ptr; ptr = ptr->next) { - if ((status = ptr->receive_message(session, message)) != SWITCH_STATUS_SUCCESS) { - break; - } - } + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + msg.message_id = indication; + msg.from = __FILE__; + status = switch_core_session_receive_message(other_session, &msg); + switch_core_session_rwunlock(other_session); + } else { + status = SWITCH_STATUS_FALSE; } - switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); return status; } @@ -375,8 +377,8 @@ memset(msg, 0, sizeof(*msg)); msg->message_id = indication; msg->from = __FILE__; - switch_core_session_queue_message(session, msg); switch_set_flag(msg, SCSMF_DYNAMIC); + switch_core_session_queue_message(session, msg); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r4943 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: anthm Date: Mon Apr 16 11:39:06 2007 New Revision: 4943 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: setup dingaling caller profile earlier so that we have information in cdr's for failed calls Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Apr 16 11:39:06 2007 @@ -2593,6 +2593,12 @@ if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { + char *exten; + char *context; + char *cid_name; + char *cid_num; + char *tmp, *t, *them = NULL; + memset(tech_pvt, 0, sizeof(*tech_pvt)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); tech_pvt->flags |= globals.flags; @@ -2605,6 +2611,89 @@ tech_pvt->local_port = switch_rtp_request_port(); switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); tech_pvt->recip = switch_core_session_strdup(session, from); + if (!(exten = ldl_session_get_value(dlsession, "dnis"))) { + exten = profile->exten; + /* if it's _auto_ set the extension to match the username portion of the called address */ + if (!strcmp(exten, "_auto_")) { + if ((t = ldl_session_get_callee(dlsession))) { + if ((them = strdup(t))) { + char *a, *b, *p; + if ((p = strchr(them, '/'))) { + *p = '\0'; + } + + if ((a = strchr(them, '+')) && (b = strrchr(them, '+')) && a != b) { + *b++ = '\0'; + switch_channel_set_variable(channel, "dl_user", them); + switch_channel_set_variable(channel, "dl_host", b); + } + exten = them; + } + } + } + } + + if (!(context = ldl_session_get_value(dlsession, "context"))) { + context = profile->context; + } + + if (!(cid_name = ldl_session_get_value(dlsession, "caller_id_name"))) { + cid_name = tech_pvt->recip; + } + + if (!(cid_num = ldl_session_get_value(dlsession, "caller_id_number"))) { + cid_num = tech_pvt->recip; + } + + /* context of "_auto_" means set it to the domain */ + if (profile->context && !strcmp(profile->context, "_auto_")) { + context = profile->name; + } + + tech_pvt->them = switch_core_session_strdup(session, ldl_session_get_callee(dlsession)); + tech_pvt->us = switch_core_session_strdup(session, ldl_session_get_caller(dlsession)); + + if ((tmp = strdup(tech_pvt->us))) { + char *p, *q; + + if ((p = strchr(tmp, '@'))) { + *p++ = '\0'; + if ((q = strchr(p, '/'))) { + *q = '\0'; + } + switch_channel_set_variable(channel, "dl_from_user", tmp); + switch_channel_set_variable(channel, "dl_from_host", p); + } + + switch_safe_free(tmp); + } + + if (!tech_pvt->caller_profile) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "Creating an identity for %s %s <%s> %s\n", ldl_session_get_id(dlsession), cid_name, cid_num, exten); + + if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + ldl_handle_get_login(profile->handle), + profile->dialplan, + cid_name, + cid_num, + ldl_session_get_ip(dlsession), + ldl_session_get_value(dlsession, + "ani"), + ldl_session_get_value(dlsession, + "aniii"), + ldl_session_get_value(dlsession, + "rdnis"), (char *) modname, context, + exten)) != 0) { + char name[128]; + snprintf(name, sizeof(name), "DingaLing/%s", tech_pvt->caller_profile->destination_number); + switch_channel_set_name(channel, name); + switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); + } + } + + switch_safe_free(them); + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hey where is my memory pool?\n"); @@ -2789,11 +2878,6 @@ 8) ))) { ldl_payload_t payloads[5]; - char *exten; - char *context; - char *cid_name; - char *cid_num; - char *tmp, *t, *them = NULL; memset(payloads, 0, sizeof(payloads)); @@ -2804,89 +2888,6 @@ ldl_session_accept_candidate(dlsession, &candidates[x]); } - if (!(exten = ldl_session_get_value(dlsession, "dnis"))) { - exten = profile->exten; - /* if it's _auto_ set the extension to match the username portion of the called address */ - if (!strcmp(exten, "_auto_")) { - if ((t = ldl_session_get_callee(dlsession))) { - if ((them = strdup(t))) { - char *a, *b, *p; - if ((p = strchr(them, '/'))) { - *p = '\0'; - } - - if ((a = strchr(them, '+')) && (b = strrchr(them, '+')) && a != b) { - *b++ = '\0'; - switch_channel_set_variable(channel, "dl_user", them); - switch_channel_set_variable(channel, "dl_host", b); - } - exten = them; - } - } - } - } - - if (!(context = ldl_session_get_value(dlsession, "context"))) { - context = profile->context; - } - - if (!(cid_name = ldl_session_get_value(dlsession, "caller_id_name"))) { - cid_name = tech_pvt->recip; - } - - if (!(cid_num = ldl_session_get_value(dlsession, "caller_id_number"))) { - cid_num = tech_pvt->recip; - } - - /* context of "_auto_" means set it to the domain */ - if (profile->context && !strcmp(profile->context, "_auto_")) { - context = profile->name; - } - - tech_pvt->them = switch_core_session_strdup(session, ldl_session_get_callee(dlsession)); - tech_pvt->us = switch_core_session_strdup(session, ldl_session_get_caller(dlsession)); - - if ((tmp = strdup(tech_pvt->us))) { - char *p, *q; - - if ((p = strchr(tmp, '@'))) { - *p++ = '\0'; - if ((q = strchr(p, '/'))) { - *q = '\0'; - } - switch_channel_set_variable(channel, "dl_from_user", tmp); - switch_channel_set_variable(channel, "dl_from_host", p); - } - - switch_safe_free(tmp); - } - - if (!tech_pvt->caller_profile) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "Creating an identity for %s %s <%s> %s\n", ldl_session_get_id(dlsession), cid_name, cid_num, exten); - - if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - ldl_handle_get_login(profile->handle), - profile->dialplan, - cid_name, - cid_num, - ldl_session_get_ip(dlsession), - ldl_session_get_value(dlsession, - "ani"), - ldl_session_get_value(dlsession, - "aniii"), - ldl_session_get_value(dlsession, - "rdnis"), (char *) modname, context, - exten)) != 0) { - char name[128]; - snprintf(name, sizeof(name), "DingaLing/%s", tech_pvt->caller_profile->destination_number); - switch_channel_set_name(channel, name); - switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); - } - } - - switch_safe_free(them); - if (lanaddr) { switch_set_flag_locked(tech_pvt, TFLAG_LANADDR); }

1 0

[commit] r4942 - freeswitch/trunk/libs/udns
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: mikej Date: Mon Apr 16 10:00:59 2007 New Revision: 4942 Modified: freeswitch/trunk/libs/udns/udns_resolver.c Log: silence windows warning. Modified: freeswitch/trunk/libs/udns/udns_resolver.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_resolver.c (original) +++ freeswitch/trunk/libs/udns/udns_resolver.c Mon Apr 16 10:00:59 2007 @@ -23,6 +23,7 @@ #ifdef WIN32 #ifdef _MSC_VER +#pragma warning(disable:4133) #if (_MSC_VER >= 1400) // VC8+ #ifndef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE

1 0

[commit] r4941 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 16 Apr '07

16 Apr '07

Author: mikej Date: Mon Apr 16 09:33:45 2007 New Revision: 4941 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h Log: tweak some var types to silence warnings. Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Mon Apr 16 09:33:45 2007 @@ -733,7 +733,7 @@ assert(ap != NULL); memset(ap, 0, sizeof(*ap)); ldl_random_string(hash, sizeof(hash) -1, NULL); - sha1_hash(ap->hash, hash, strlen(hash)); + sha1_hash(ap->hash, hash, (unsigned)strlen(hash)); ap->path = strdup(path); key = ldl_handle_strdup(handle, from); @@ -1051,7 +1051,7 @@ char handshake[512] = ""; snprintf(secret, sizeof(secret), "%s%s", pak->id, handle->password); - sha1_hash(hash, secret, strlen(secret)); + sha1_hash(hash, secret, (unsigned)strlen(secret)); snprintf(handshake, sizeof(handshake), "<handshake>%s</handshake>", hash); iks_send_raw(handle->parser, handshake); handle->state = CS_START; @@ -1862,10 +1862,8 @@ iks *pres, *msg; char *lid = NULL, *low_id = NULL; struct ldl_buffer buffer; - time_t started; - unsigned int elapsed; + time_t started, elapsed, next = 0; char *notice = "Call Me!"; - int next = 0; buffer.buf = buf; buffer.len = len; Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Mon Apr 16 09:33:45 2007 @@ -191,13 +191,15 @@ { char *id_a_host, *id_b_host, *id_a_r, *id_b_r; - if ((id_a_host = strchr(id_a, '@'))) { + id_a_host = strchr(id_a, '@'); + if (id_a_host) { id_a_host++; } else { id_a_host = id_a; } - if ((id_b_host = strchr(id_b, '@'))) { + id_b_host = strchr(id_b, '@'); + if (id_b_host) { id_b_host++; } else { id_b_host = id_b; @@ -206,13 +208,15 @@ if (id_a_host && id_b_host) { size_t id_a_len = 0, id_b_len = 0, len = 0; - if ((id_a_r = strchr(id_a_host, '/'))) { + id_a_r = strchr(id_a_host, '/'); + if (id_a_r) { id_a_len = id_a_r - id_a_host; } else { id_a_len = strlen(id_a_host); } - if ((id_b_r = strchr(id_b_host, '/'))) { + id_b_r = strchr(id_b_host, '/'); + if (id_b_r) { id_b_len = id_b_r - id_b_host; } else { id_b_len = strlen(id_b_host);

1 0