- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r8462 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 19 May '08

19 May '08

Author: anthm Date: Mon May 19 12:26:50 2008 New Revision: 8462 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: fix possible memory overload during error condition Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon May 19 12:26:50 2008 @@ -569,7 +569,11 @@ switch_core_session_flush_private_events(session); if (moh) { - switch_ivr_play_file(session, NULL, moh, &args); + switch_status_t status = switch_ivr_play_file(session, NULL, moh, &args); + if (!SWITCH_READ_ACCEPTABLE(status)) { + aborted = 1; + goto abort; + } } else { switch_ivr_collect_digits_callback(session, &args, 0); } @@ -736,10 +740,15 @@ pop = NULL; if (moh && do_wait) { + switch_status_t status = switch_ivr_play_file(session, NULL, moh, &args); memset(&args, 0, sizeof(args)); args.read_frame_callback = consumer_read_frame_callback; args.user_data = node_list; switch_ivr_play_file(session, NULL, moh, &args); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } } for(i = 0; i < node_count; i++) {

1 0

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

19 May '08

Author: anthm Date: Mon May 19 10:30:39 2008 New Revision: 8461 Modified: freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c Log: fix small att_xfer issue from mailing list Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon May 19 10:30:39 2008 @@ -279,8 +279,9 @@ if (lead_frames) { switch_frame_t *read_frame; int frame_count = atoi(lead_frames); - - while(frame_count > 0) { + int max_frames = frame_count * 2; + + while(frame_count > 0 && --max_frames > 0) { status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { goto done; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon May 19 10:30:39 2008 @@ -648,7 +648,8 @@ switch_channel_state_t state; switch_event_t *event; int br = 0; - + int nosuspend = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE); + switch_channel_set_flag(caller_channel, CF_ORIGINATOR); switch_channel_clear_flag(caller_channel, CF_TRANSFER); switch_channel_clear_flag(peer_channel, CF_TRANSFER); @@ -785,9 +786,6 @@ done: - switch_channel_clear_flag(caller_channel, CF_INNER_BRIDGE); - switch_channel_clear_flag(peer_channel, CF_INNER_BRIDGE); - if (br && switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(caller_channel, event); switch_event_fire(&event); @@ -795,7 +793,7 @@ state = switch_channel_get_state(caller_channel); - if (!switch_channel_test_flag(caller_channel, CF_TRANSFER)) { + if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && !nosuspend) { if ((state != CS_EXECUTE && state != CS_PARK && state != CS_ROUTING) || (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP && switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE)))) {

1 0

[commit] r8460 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 17 May '08

17 May '08

Author: anthm Date: Sat May 17 11:48:18 2008 New Revision: 8460 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: doh Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Sat May 17 11:48:18 2008 @@ -2237,7 +2237,7 @@ id = dup; if (!strncasecmp(account, "sip:", 4)) { - dup += 4; + id += 4; } if (!id) {

1 0

[commit] r8459 - freeswitch/trunk
by Freeswitch SVN 17 May '08

17 May '08

Author: anthm Date: Sat May 17 11:42:28 2008 New Revision: 8459 Modified: freeswitch/trunk/Makefile.am Log: add sofia-reconf targer Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sat May 17 11:42:28 2008 @@ -341,6 +341,11 @@ cd libs/sofia-sip && $(MAKE) -j $(MAKE) -j modules +sofia-reconf: + cd libs/sofia-sip && $(MAKE) clean + cd libs/sofia-sip && autoreconf -fi + cd libs/sofia-sip && ./configure --prefix=$(PREFIX) --with-pic --with-glib=no --disable-shared + current: update-clean svn update $(MAKE) all

1 0

[commit] r8458 - freeswitch/trunk/conf/jingle_profiles
by Freeswitch SVN 17 May '08

17 May '08

Author: anthm Date: Fri May 16 22:01:22 2008 New Revision: 8458 Modified: freeswitch/trunk/conf/jingle_profiles/client.xml freeswitch/trunk/conf/jingle_profiles/server.xml Log: forgot to tell ppl to take x- away in the example Modified: freeswitch/trunk/conf/jingle_profiles/client.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/client.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/client.xml Fri May 16 22:01:22 2008 @@ -1,5 +1,6 @@ <include>  +  <x-profile type="client"> <param name="name" value="$${xmpp_client_profile}"/> <param name="login" value="myjid(a)myserver.com/talk"/> Modified: freeswitch/trunk/conf/jingle_profiles/server.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/server.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/server.xml Fri May 16 22:01:22 2008 @@ -1,5 +1,6 @@ <include>  +  <x-profile type="component"> <param name="name" value="$${xmpp_server_profile}"/> <param name="password" value="secret"/>

1 0

[commit] r8457 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 17 May '08

17 May '08

Author: anthm Date: Fri May 16 20:33:34 2008 New Revision: 8457 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add vm_boxcount api func Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri May 16 20:33:34 2008 @@ -2153,11 +2153,75 @@ } } -static void message_query_handler(switch_event_t *event) +#define BOXCOUNT_SYNTAX "<user>@<domain>[|[new|saved|new-urgent|saved-urgent|all]]" +SWITCH_STANDARD_API(boxcount_api_function) +{ + char *dup; + char *how = "new"; + int total_new_messages = 0; + int total_saved_messages = 0; + int total_new_urgent_messages = 0; + int total_saved_urgent_messages = 0; + + if (cmd) { + switch_hash_index_t *hi; + void *val; + vm_profile_t *profile; + char *id, *domain, *p; + + dup = strdup(cmd); + id = dup; + + if (!strncasecmp(cmd, "sip:", 4)) { + id += 4; + } + + if (!id) { + stream->write_function(stream, "%d", 0); + free(dup); + return SWITCH_STATUS_SUCCESS; + } + + if ((domain = strchr(id, '@'))) { + *domain++ = '\0'; + if ((p = strchr(domain, '|'))) { + *p++ = '\0'; + how = p; + } + + for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + profile = (vm_profile_t *) val; + total_new_messages = total_saved_messages = 0; + message_count(profile, id, domain, "inbox", &total_new_messages, &total_saved_messages, + &total_new_urgent_messages, &total_saved_urgent_messages); + } + } + + switch_safe_free(id); + } + + if (!strcasecmp(how, "saved")) { + stream->write_function(stream, "%d", total_saved_messages); + } else if (!strcasecmp(how, "new-urgent")) { + stream->write_function(stream, "%d", total_new_urgent_messages); + } else if (!strcasecmp(how, "new-saved")) { + stream->write_function(stream, "%d", total_saved_urgent_messages); + } else if (!strcasecmp(how, "all")) { + stream->write_function(stream, "%d:%d:%d:%d", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); + } else { + stream->write_function(stream, "%d", total_new_messages); + } + + return SWITCH_STATUS_SUCCESS; +} + +static void message_query_handler(switch_event_t *event) { char *account = switch_event_get_header(event, "message-account"); int created = 0; switch_event_t *new_event = NULL; + char *dup = NULL; if (account) { switch_hash_index_t *hi; @@ -2169,12 +2233,17 @@ vm_profile_t *profile; char *id, *domain; + dup = strdup(account); + id = dup; + if (!strncasecmp(account, "sip:", 4)) { - id = strdup(account + 4); - } else { - id = strdup(account); + dup += 4; + } + + if (!id) { + free(dup); + return; } - switch_assert(id); if ((domain = strchr(id, '@'))) { *domain++ = '\0'; @@ -2200,7 +2269,7 @@ } } - switch_safe_free(id); + switch_safe_free(dup); } @@ -2784,7 +2853,8 @@ } SWITCH_ADD_API(commands_api_interface, "voicemail", "voicemail", voicemail_api_function, VOICEMAIL_SYNTAX); - + SWITCH_ADD_API(commands_api_interface, "vm_boxcount", "vm_boxcount", boxcount_api_function, BOXCOUNT_SYNTAX); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD; }

1 0