May 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8472 - freeswitch/trunk/src
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 15:39:20 2008 New Revision: 8472 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: handle allocation error. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon May 19 15:39:20 2008 @@ -270,6 +270,12 @@ status = SWITCH_STATUS_FALSE; cmd = switch_core_session_strdup(session, odata); + + if (!cmd) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Allocation error calling execute\n"); + break; + } + cmd_args = switch_separate_paren_args(cmd); if (!cmd_args ) {

1 0

[commit] r8471 - freeswitch/trunk/src
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 15:24:20 2008 New Revision: 8471 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: don't leak on switch_ivr_wait_for_answer when peer channel is already answered or pre-answered. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon May 19 15:24:20 2008 @@ -268,6 +268,10 @@ const char *var = switch_channel_get_variable(caller_channel, "call_timeout"); switch_time_t start = 0; + if ((switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA))) { + return SWITCH_STATUS_SUCCESS; + } + switch_zmalloc(write_frame.data, SWITCH_RECOMMENDED_BUFFER_SIZE); write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; @@ -281,10 +285,6 @@ timelimit *= 1000000; start = switch_timestamp_now(); - if ((switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA))) { - return SWITCH_STATUS_SUCCESS; - } - if (switch_channel_test_flag(caller_channel, CF_ANSWERED)) { ringback_data = switch_channel_get_variable(caller_channel, "transfer_ringback"); }

1 0

[commit] r8470 - freeswitch/trunk/src
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 15:08:03 2008 New Revision: 8470 Modified: freeswitch/trunk/src/switch_ivr_menu.c Log: refactor, cleanup, eliminate un-needed checks. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Mon May 19 15:08:03 2008 @@ -268,80 +268,77 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_input_args_t args = { 0 }; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "sound=[%s]\n", sound); + if (!session || !menu || switch_strlen_zero(sound)) { + return status; + } - if (session != NULL && menu != NULL && !switch_strlen_zero(sound)) { - memset(menu->buf, 0, menu->inlen + 1); - menu->ptr = menu->buf; + memset(menu->buf, 0, menu->inlen + 1); + menu->ptr = menu->buf; - if (!need) { - len = 1; - ptr = NULL; - } else { - len = (uint32_t) menu->inlen + 1; - ptr = menu->ptr; - } - args.buf = ptr; - args.buflen = len; + if (!need) { + len = 1; + ptr = NULL; + } else { + len = (uint32_t) menu->inlen + 1; + ptr = menu->ptr; + } + args.buf = ptr; + args.buflen = len; - status = switch_ivr_play_file(session, NULL, sound, &args); + status = switch_ivr_play_file(session, NULL, sound, &args); - - if (need) { + if (!need) { + return status; + } - menu->ptr += strlen(menu->buf); - if (strlen(menu->buf) < need) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "waiting for %u/%u digits t/o %d\n", - (uint32_t)(menu->inlen - strlen(menu->buf)), (uint32_t)need, menu->inter_timeout); - status = switch_ivr_collect_digits_count(session, menu->ptr, menu->inlen - strlen(menu->buf), - need, "#", &terminator, menu->inter_timeout, 0, 0); - } + menu->ptr += strlen(menu->buf); + if (strlen(menu->buf) < need) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "waiting for %u/%u digits t/o %d\n", + (uint32_t)(menu->inlen - strlen(menu->buf)), (uint32_t)need, menu->inter_timeout); + status = switch_ivr_collect_digits_count(session, menu->ptr, menu->inlen - strlen(menu->buf), + need, "#", &terminator, menu->inter_timeout, 0, 0); + } - - if (menu->confirm_macro && status == SWITCH_STATUS_SUCCESS && !switch_strlen_zero(menu->buf)) { - switch_input_args_t confirm_args = { 0 }, *ap = NULL; - char buf[10] = ""; - char terminator_key; - int att = menu->confirm_attempts; + if (menu->confirm_macro && status == SWITCH_STATUS_SUCCESS && *menu->buf != '\0') { + switch_input_args_t confirm_args = { 0 }, *ap = NULL; + char buf[10] = ""; + char terminator_key; + int att = menu->confirm_attempts; - - while (att) { - confirm_args.buf = buf; - confirm_args.buflen = sizeof(buf); - memset(buf, 0, confirm_args.buflen); + while (att) { + confirm_args.buf = buf; + confirm_args.buflen = sizeof(buf); + memset(buf, 0, confirm_args.buflen); - if (menu->confirm_key) { - ap = &confirm_args; - } - - switch_ivr_phrase_macro(session, menu->confirm_macro, menu->buf, NULL, ap); + if (menu->confirm_key) { + ap = &confirm_args; + } + + switch_ivr_phrase_macro(session, menu->confirm_macro, menu->buf, NULL, ap); - if (menu->confirm_key && *buf == '\0') { - switch_ivr_collect_digits_count(session, buf, sizeof(buf), 1, "#", &terminator_key, menu->timeout, 0, 0); - } + if (menu->confirm_key && *buf == '\0') { + switch_ivr_collect_digits_count(session, buf, sizeof(buf), 1, "#", &terminator_key, menu->timeout, 0, 0); + } - if (menu->confirm_key && *buf != '\0') { - if (*menu->confirm_key == *buf) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "approving digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key); - break; - } else { - att = 0; - break; - } - } - att--; - } - if (!att) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rejecting digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key); - *menu->buf = '\0'; + if (menu->confirm_key && *buf != '\0') { + if (*menu->confirm_key == *buf) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "approving digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key); + break; + } else { + att = 0; + break; } } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "digits '%s'\n", menu->buf); + att--; + } + if (!att) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rejecting digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key); + *menu->buf = '\0'; } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "returning [%d]\n", status); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "digits '%s'\n", menu->buf); return status; } @@ -357,7 +354,7 @@ switch_channel_t *channel; switch_status_t status = SWITCH_STATUS_SUCCESS; - if (session == NULL || stack == NULL || switch_strlen_zero(name)) { + if (!session || !stack || switch_strlen_zero(name)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid menu context\n"); return SWITCH_STATUS_FALSE; } @@ -395,8 +392,7 @@ memset(menu->buf, 0, menu->inlen + 1); status = play_and_collect(session, menu, greeting_sound, menu->inlen); - if (!switch_strlen_zero(menu->buf)) { - + if (*menu->buf != '\0') { for (ap = menu->actions; ap; ap = ap->next) { int ok = 0; @@ -485,7 +481,6 @@ } } - if (switch_test_flag(menu, SWITCH_IVR_MENU_FLAG_STACK)) { // top level if (switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_FALLTOMAIN)) { // catch the fallback and recover switch_clear_flag(stack, SWITCH_IVR_MENU_FLAG_FALLTOMAIN);

1 0

[commit] r8469 - freeswitch/trunk/src
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 14:53:32 2008 New Revision: 8469 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: handle allocation error. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon May 19 14:53:32 2008 @@ -1848,6 +1848,11 @@ mypath = strdup(path); + if (!mypath) { + switch_core_session_rwunlock(session); + return SWITCH_STATUS_MEMERR; + } + if ((nomedia = switch_channel_test_flag(channel, CF_PROXY_MODE))) { switch_ivr_media(uuid, SMF_REBRIDGE); }

1 0

[commit] r8468 - freeswitch/trunk/src
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 14:43:01 2008 New Revision: 8468 Modified: freeswitch/trunk/src/switch_utils.c Log: don't deref NULL. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon May 19 14:43:01 2008 @@ -568,12 +568,16 @@ const char *sp = str; char *p, *s = NULL; - while(sp && *sp && *sp == ' ') { + if (!sp) return NULL; + + while(*sp == ' ') { sp++; } s = strdup(sp); + if (!s) return NULL; + p = s + (strlen(s) - 1); while(*p == ' ') {

1 0

[commit] r8467 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 12:56:40 2008 New Revision: 8467 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Mon May 19 11:31:45 EDT 2008 Pekka.Pessi(a)nokia.com * nua_stack.c: include Allow-Events in requests initiating dialog, too The Allow-Events header is now alwats included with NOTIFY requests, and initial INVITE, SUBSCRIBE, REFER, and OPTIONS requests. Thanks to Jerry Richards for pointing out the problem. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon May 19 12:56:40 2008 @@ -1 +1 @@ -Mon May 19 12:55:48 EDT 2008 +Mon May 19 12:56:22 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Mon May 19 12:56:40 2008 @@ -2541,8 +2541,9 @@ /** * Next, values previously set with nua_set_params() or nua_set_hparams() - * are used: @Allow, @Supported, @Organization, and @UserAgent headers are - * added to the request if they are not already set. + * are used: @Allow, @Supported, @Organization, @UserAgent and + * @AllowEvents headers are added to the request if they are not already + * set. */ if (!sip->sip_allow) sip_add_dup(msg, sip, (sip_header_t*)NH_PGET(nh, allow)); @@ -2561,6 +2562,20 @@ if (!sip->sip_user_agent && NH_PGET(nh, user_agent)) sip_add_make(msg, sip, sip_user_agent_class, NH_PGET(nh, user_agent)); + /** Any node implementing one or more event packages SHOULD include an + * appropriate @AllowEvents header indicating all supported events in + * all methods which initiate dialogs and their responses (such as + * INVITE) and OPTIONS responses. + */ + if (!sip->sip_allow_events && + NH_PGET(nh, allow_events) && + (method == sip_method_notify || /* Always in NOTIFY */ + (!ds->ds_remote_tag && /* And in initial requests */ + (method == sip_method_subscribe || method == sip_method_refer || + method == sip_method_options || + method == sip_method_invite)))) + sip_add_dup(msg, sip, (void *)NH_PGET(nh, allow_events)); + /** * Next, the stack generates a @Contact header for the request (unless * the application already gave a @Contact header or it does not want to

1 0

[commit] r8466 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 12:55:53 2008 New Revision: 8466 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Log: Fri May 16 05:06:09 EDT 2008 Pekka.Pessi(a)nokia.com * nua_register.c: nr->nr_tport was used even if nr was NULL Problem detected by Klocwork. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon May 19 12:55:53 2008 @@ -1 +1 @@ -Mon May 19 12:55:08 EDT 2008 +Mon May 19 12:55:48 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Mon May 19 12:55:53 2008 @@ -715,6 +715,7 @@ sip_contact_t *m, *contacts = sip->sip_contact; char const *min_expires = NULL; int unreg; + tport_t *tport = NULL; (void)nh; @@ -758,6 +759,8 @@ if (previous) sip_add_dup(msg, sip, (sip_header_t *)previous); } + + tport = nr->nr_tport; } for (m = sip->sip_contact; m; m = m->m_next) { @@ -792,7 +795,7 @@ TAG_IF(unreg, NTATAG_SIGCOMP_CLOSE(1)), TAG_IF(!unreg, NTATAG_COMP("sigcomp")), #endif - NTATAG_TPORT(nr->nr_tport), + NTATAG_TPORT(tport), TAG_NEXT(tags)); }

1 0

[commit] r8465 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 12:55:15 2008 New Revision: 8465 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c Log: Fri May 16 10:44:06 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_s2.c: cope if test nua uses default port Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon May 19 12:55:15 2008 @@ -1 +1 @@ -Mon May 19 12:54:40 EDT 2008 +Mon May 19 12:55:08 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c Mon May 19 12:55:15 2008 @@ -583,8 +583,12 @@ assert(tport); *tpn = *tport_name(tport); - tpn->tpn_host = d->target->m_url->url_host; - tpn->tpn_port = d->target->m_url->url_port; + if (tport_is_udp(tport)) { + tpn->tpn_host = d->target->m_url->url_host; + tpn->tpn_port = url_port(d->target->m_url); + if (!tpn->tpn_port || !tpn->tpn_port[0]) + tpn->tpn_port = url_port_default(d->target->m_url->url_type); + } magic = tport_magic(tport); assert(magic != NULL); @@ -778,7 +782,6 @@ _s2case = number; } - /* ---------------------------------------------------------------------- */ /* tport interface */ static void

1 0

[commit] r8464 - in freeswitch/trunk/libs/sofia-sip: . tests
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 12:54:45 2008 New Revision: 8464 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c Log: Fri May 16 10:30:29 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_nua_api.c: fixed crash in check_sofia Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon May 19 12:54:45 2008 @@ -1 +1 @@ -Mon May 19 12:54:07 EDT 2008 +Mon May 19 12:54:40 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c Mon May 19 12:54:45 2008 @@ -450,6 +450,8 @@ TEST_VOID(nua_destroy(a->nua)); + a->nua = NULL; + su_root_destroy(ctx->root), ctx->root = NULL; if (print_headings)

1 0

[commit] r8463 - in freeswitch/trunk/libs/sofia-sip: . tests
by Freeswitch SVN 19 May '08

19 May '08

Author: mikej Date: Mon May 19 12:54:14 2008 New Revision: 8463 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/tests/test_simple.c Log: Fri May 16 10:29:20 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_simple.c: fixed test case for SUBSCRIBE Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon May 19 12:54:14 2008 @@ -1 +1 @@ -Wed May 14 14:21:05 EDT 2008 +Mon May 19 12:54:07 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_simple.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_simple.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_simple.c Mon May 19 12:54:14 2008 @@ -641,8 +641,6 @@ switch (event) { case nua_i_subscribe: if (status < 200) { - int fetch = sip->sip_expires && sip->sip_expires->ex_delta == 0; - RESPOND(ep, call, nh, SIP_202_ACCEPTED, NUTAG_WITH(with), SIPTAG_EXPIRES_STR("360"), @@ -653,11 +651,8 @@ SIPTAG_EVENT(sip->sip_event), SIPTAG_CONTENT_TYPE_STR("application/pidf+xml"), SIPTAG_PAYLOAD_STR(presence_closed), - NUTAG_SUBSTATE(fetch - ? nua_substate_pending - : nua_substate_terminated), + NUTAG_SUBSTATE(nua_substate_pending), TAG_END()); - } return 0; @@ -1020,6 +1015,10 @@ if (print_headings) printf("TEST NUA-11.5.1: establishing subscription\n"); + nua_set_params(b->nua, NUTAG_APPL_METHOD("NOTIFY"), + TAG_END()); + run_b_until(ctx, nua_r_set_params, until_final_response); + TEST_1(a_call->nh = nua_handle(a->nua, a_call, SIPTAG_TO(b->to), TAG_END())); SUBSCRIBE(a, a_call, a_call->nh, NUTAG_URL(b->contact->m_url), @@ -2092,8 +2091,8 @@ || test_publish(ctx) || test_subscribe_notify(ctx) || test_event_fetch(ctx) - || test_subscribe_notify_graceful(ctx) || test_newsub_notify(ctx) + || test_subscribe_notify_graceful(ctx) || test_subscription_timeout(ctx) ; }

1 0