September 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9528 - freeswitch/trunk/scripts/socket/freepy
by Freeswitch SVN 11 Sep '08

11 Sep '08

Author: greenlizard Date: Thu Sep 11 17:12:43 2008 New Revision: 9528 Modified: freeswitch/trunk/scripts/socket/freepy/fseventlistener.py Log: set field so the protocol object can easily get factor instance. add ability to add observers for specific events and dispatch events to observers. still more work needed there, since there is no relation between observers and what events are subscribed from freeswitch Modified: freeswitch/trunk/scripts/socket/freepy/fseventlistener.py ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/fseventlistener.py (original) +++ freeswitch/trunk/scripts/socket/freepy/fseventlistener.py Thu Sep 11 17:12:43 2008 @@ -140,7 +140,7 @@ def eventReceived(self, event_xml_str): """ - should be overridden by subclasses + should be overridden by subclasses. """ raise Exception("This is an abstract class, should be overridden " "in a subclass") @@ -153,6 +153,9 @@ should be a subclass of a FreeswitchEventListener """ + # dictionary of observers. key: event name, value: list of observers + self.event2observer = {} + self.protoclass=protoclass if host: @@ -166,12 +169,33 @@ self.connection_deferred = None self.num_attempts = 0 + def addobserver(self, event_name, observer): + """ + @param event_name, eg "CHANNEL_ANSWER" + @param observer (instance of object that has an eventReceived() method + """ + observers = self.event2observer.get(event_name, []) + observers.append(observer) + self.event2observer[event_name] = observers + + def dispatch2observers(self, event_name, event_xml_str, event_dom): + """ + called back by the underlying protocol upon receiving an + event from freeswitch. Currently subclasses must explicitly + call this method from their eventReceived method for observers + to get the message. TODO: move this call to FreeswitchEventListener + and use observer pattern instead of any subclassing. + """ + observers = self.event2observer.get(event_name, []) + for observer in observers: + observer.eventReceived(event_name, event_xml_str, event_dom) + def reset(self): self.protocol = None self.connection_deferred = None def connect(self): - + if self.protocol: # if we have a protocol object, we are connected (since we always # null it upon any disconnection) @@ -191,6 +215,7 @@ def conncb(self, protocol): self.protocol = protocol + self.protocol.__dict__["factory"] = self deferred2callback = self.connection_deferred self.connection_deferred = None deferred2callback.callback(self.protocol)

1 0

[commit] r9527 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 11 Sep '08

11 Sep '08

Author: mikej Date: Thu Sep 11 15:56:57 2008 New Revision: 9527 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: fix shutdown crash Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Thu Sep 11 15:56:57 2008 @@ -342,7 +342,9 @@ { switch_log_unbind_logger(switch_console_logger); - switch_core_hash_destroy(&log_hash); + if (log_hash) { + switch_core_hash_destroy(&log_hash); + } RUNNING = 0; return SWITCH_STATUS_UNLOAD;

1 0

[commit] r9526 - freeswitch/trunk/src
by Freeswitch SVN 11 Sep '08

11 Sep '08

Author: anthm Date: Thu Sep 11 13:29:08 2008 New Revision: 9526 Modified: freeswitch/trunk/src/switch_core_io.c Log: add last_dtmf_duration variable Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Sep 11 13:29:08 2008 @@ -1028,6 +1028,7 @@ char *string; int i, argc; char *argv[256]; + int dur_total = 0; switch_assert(session != NULL); @@ -1078,10 +1079,17 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s send dtmf\ndigit=%c ms=%u samples=%u\n", switch_channel_get_name(session->channel), dtmf.digit, dur, dtmf.duration); sent++; + dur_total += dtmf.duration + 2000; /* account for 250ms pause */ } } } + if (dur_total) { + char tmp[32] = ""; + switch_snprintf(tmp, sizeof(tmp), "%d", dur_total / 8); + switch_channel_set_variable(session->channel, "last_dtmf_duration", tmp); + } + } return sent ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; }

1 0

[commit] r9525 - freeswitch/trunk/src/mod/applications/mod_stress
by Freeswitch SVN 11 Sep '08

11 Sep '08

Author: brian Date: Wed Sep 10 23:00:35 2008 New Revision: 9525 Modified: freeswitch/trunk/src/mod/applications/mod_stress/mod_stress.cpp Log: woops, thanks jason Modified: freeswitch/trunk/src/mod/applications/mod_stress/mod_stress.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_stress/mod_stress.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_stress/mod_stress.cpp Wed Sep 10 23:00:35 2008 @@ -170,7 +170,7 @@ if (sth->stress) { switch_event_t *event, *dup; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stress %0.2f\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stress %0.2f\n", sth->stress); if (switch_event_create(&event, SWITCH_EVENT_DETECTED_SPEECH) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Speech-Type", "stress-level");

1 0

[commit] r9524 - in freeswitch/trunk/src: . mod/applications/mod_voicemail
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: anthm Date: Wed Sep 10 17:55:33 2008 New Revision: 9524 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_ivr_play_say.c Log: tweak 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 Wed Sep 10 17:55:33 2008 @@ -1576,8 +1576,6 @@ timeout = profile->digit_timeout; attempts = profile->max_login_attempts; - args.buf = &global_buf; - args.buflen = sizeof(global_buf); status = switch_ivr_phrase_macro(session, VM_HELLO_MACRO, NULL, NULL, &args); *global_buf = '\0'; 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 Wed Sep 10 17:55:33 2008 @@ -265,7 +265,7 @@ } else { odata = expanded; } - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s:%s)\n", func, odata, chan_lang, module_name); if (!strcasecmp(func, "play-file")) { @@ -1234,7 +1234,7 @@ end: switch_safe_free(abuf); - switch_core_session_reset(session, SWITCH_TRUE); + switch_core_session_reset(session, SWITCH_FALSE); return status; } @@ -1881,7 +1881,7 @@ timer_name = switch_channel_get_variable(channel, "timer_name"); - switch_core_session_reset(session, SWITCH_TRUE); + switch_core_session_reset(session, SWITCH_FALSE); read_codec = switch_core_session_get_read_codec(session); rate = read_codec->implementation->actual_samples_per_second; @@ -1964,7 +1964,7 @@ } } - switch_core_session_reset(session, SWITCH_TRUE); + switch_core_session_reset(session, SWITCH_FALSE); return status; }

1 0

[commit] r9523 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: anthm Date: Wed Sep 10 17:18:51 2008 New Revision: 9523 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: update 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 Wed Sep 10 17:18:51 2008 @@ -1923,10 +1923,7 @@ } } - if (!(x_params = switch_xml_child(x_user, "params"))) { - auth++; - mypass = "OK"; - } + x_params = switch_xml_child(x_user, "params"); thepass = NULL; switch_snprintf(sql, sizeof(sql), "select * from voicemail_prefs where username='%s' and domain='%s'", myid, domain_name); @@ -1950,8 +1947,20 @@ switch_xml_free(x_domain_root); x_domain_root = NULL; - if (auth || !thepass || (thepass && mypass && !strcmp(thepass, mypass)) || - (!switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass))) { + if (!auth) { + if (switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass)) { + auth++; + } else if (!thepass) { + auth++; + } + + if (!auth && (thepass && mypass && !strcmp(thepass, mypass))) { + auth++; + } + } + + + if (auth) { if (!dir_path) { if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);

1 0

[commit] r9521 - freeswitch/trunk/src
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: anthm Date: Wed Sep 10 12:34:57 2008 New Revision: 9521 Modified: freeswitch/trunk/src/switch_channel.c Log: update Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Sep 10 12:34:57 2008 @@ -1482,7 +1482,6 @@ if (status == SWITCH_STATUS_SUCCESS) { switch_channel_perform_mark_pre_answered(channel, file, func, line); - status = switch_ivr_sleep(channel->session, 250, NULL); } else { switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } @@ -1599,7 +1598,6 @@ if (status == SWITCH_STATUS_SUCCESS) { switch_channel_perform_mark_answered(channel, file, func, line); - status = switch_ivr_sleep(channel->session, 250, NULL); } else { switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); }

1 0

[commit] r9520 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: mikej Date: Wed Sep 10 12:24:59 2008 New Revision: 9520 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Log: Wed Sep 10 12:10:57 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * check_session.c: added test cases for multiple INVITEs and INVITE glare Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Wed Sep 10 12:24:59 2008 @@ -1437,6 +1437,120 @@ } /* ====================================================================== */ +/* 2.6 - Re-INVITEs */ + +START_TEST(call_2_6_1) +{ + nua_handle_t *nh; + struct message *invite, *ack; + int i; + + s2_case("2.6.1", "Queued re-INVITEs", + "NUA receives INVITE, " + "sends re-INVITE twice, " + "sends BYE."); + + nh = invite_to_nua(TAG_END()); + + nua_invite(nh, TAG_END()); + nua_invite(nh, TAG_END()); + + for (i = 0; i < 2; i++) { + fail_unless(s2_check_callstate(nua_callstate_calling)); + + invite = s2_wait_for_request(SIP_METHOD_INVITE); + fail_if(!invite); + process_offer(invite); + respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); + s2_free_message(invite); + + ack = s2_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + s2_free_message(ack); + + fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless(s2_check_callstate(nua_callstate_ready)); + } + + bye_by_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST + +START_TEST(call_2_6_2) +{ + nua_handle_t *nh; + struct message *invite, *ack, *response; + + s2_case("2.6.2", "Re-INVITE glare", + "NUA sends re-INVITE and then receives re-INVITE, " + "sends BYE."); + + nh = invite_to_nua(TAG_END()); + + nua_invite(nh, TAG_END()); + fail_unless(s2_check_callstate(nua_callstate_calling)); + + soa_generate_offer(soa, 1, NULL); + request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); + + invite = s2_wait_for_request(SIP_METHOD_INVITE); + fail_if(!invite); + respond_with_sdp(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR, + SIPTAG_RETRY_AFTER_STR("8"), + TAG_END()); + s2_free_message(invite); + ack = s2_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + s2_free_message(ack); + + response = s2_wait_for_response(491, SIP_METHOD_INVITE); + fail_if(!response); + fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, + SIPTAG_VIA(sip_object(dialog->invite)->sip_via), + TAG_END())); + s2_free_message(response); + fail_if(soa_process_reject(soa, NULL) < 0); + + /* We get nua_r_invite with 100 trying (and 500 in sip->sip_status) */ + fail_unless(s2_check_event(nua_r_invite, 100)); + + s2_fast_forward(10); + + fail_unless(s2_check_callstate(nua_callstate_calling)); + + invite = s2_wait_for_request(SIP_METHOD_INVITE); + process_offer(invite); + + respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); + fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless(s2_check_callstate(nua_callstate_ready)); + ack = s2_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + s2_free_message(ack); + + bye_by_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST + + +TCase *invite_glare_tcase(void) +{ + TCase *tc = tcase_create("2.6 - INVITE glare"); + + tcase_add_checked_fixture(tc, call_setup, call_teardown); + { + tcase_add_test(tc, call_2_6_1); + tcase_add_test(tc, call_2_6_2); + } + return tc; +} + + +/* ====================================================================== */ /* 3.1 - Call error cases */ START_TEST(call_3_1_1) @@ -2859,6 +2973,7 @@ suite_add_tcase(suite, session_timer_tcase()); suite_add_tcase(suite, invite_100rel_tcase()); suite_add_tcase(suite, invite_precondition_tcase()); + suite_add_tcase(suite, invite_glare_tcase()); suite_add_tcase(suite, invite_error_tcase()); suite_add_tcase(suite, termination_tcase()); suite_add_tcase(suite, destroy_tcase());

1 0

[commit] r9519 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: mikej Date: Wed Sep 10 12:24:40 2008 New Revision: 9519 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: Wed Sep 10 12:08:47 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: always start next INVITE after ACK Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Sep 10 12:24:40 2008 @@ -1 +1 @@ -Wed Sep 10 12:23:38 EDT 2008 +Wed Sep 10 12:24:35 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Wed Sep 10 12:24:40 2008 @@ -1200,8 +1200,6 @@ nua_client_request_unref(cr); - nua_client_next_request(nh->nh_ds->ds_cr, 1); - return 0; } @@ -1750,7 +1748,8 @@ offer_sent = session_get_description(sip, NULL, NULL); } /* When 100rel response status was 183 do support for preconditions */ - else if (cri->cr_status == 183 && ss->ss_precondition) { + else if (ss->ss_precondition && cri->cr_status == 183 && + cri->cr_offer_sent && cri->cr_answer_recv) { if (soa_generate_offer(nh->nh_soa, 0, NULL) < 0 || session_include_description(nh->nh_soa, 1, msg, sip) < 0) { status = soa_error_as_sip_response(nh->nh_soa, &phrase); @@ -1805,6 +1804,7 @@ nua_handle_t *nh = cr->cr_owner; nua_dialog_usage_t *du = cr->cr_usage; nua_session_usage_t *ss = nua_dialog_usage_private(du); + int acked = 0; nua_stack_event(nh->nh_nua, nh, nta_outgoing_getresponse(orq), @@ -1826,19 +1826,26 @@ if (NH_PGET(nh, auto_ack) || /* Auto-ACK response to re-INVITE unless auto_ack is set to 0 */ (ss->ss_state == nua_callstate_ready && !NH_PISSET(nh, auto_ack))) { - /* No UPDATE with offer/answer if PRACK with offer/answer was ongoing! */ + /* There should be no UPDATE with offer/answer + if PRACK with offer/answer was ongoing! */ if (nua_invite_client_ack(du->du_cr, NULL) > 0) next_state = nua_callstate_ready; else next_state = nua_callstate_terminating; - nua_client_request_clean(du->du_cr); + + acked = 1; } } signal_call_state_change(nh, ss, status, phrase, next_state); } - if (ss->ss_update_needed && 200 <= status && status < 300 && + if (acked && + du->du_cr->cr_method == sip_method_invite && + nua_client_is_queued(du->du_cr)) { + /* New INVITE was queued - do not send UPDATE */ + } + else if (ss->ss_update_needed && 200 <= status && status < 300 && !SIP_IS_ALLOWED(NH_PGET(nh, appl_method), sip_method_update)) nua_client_create(nh, nua_r_update, &nua_update_client_methods, NULL); @@ -3942,6 +3949,7 @@ enum nua_callstate next_state) { enum nua_callstate ss_state = nua_callstate_init; + enum nua_callstate invite_state = next_state; char const *oa_recv = NULL; char const *oa_sent = NULL; @@ -4065,6 +4073,11 @@ nua_i_terminated, status, phrase, NULL); } + + if (invite_state == nua_callstate_ready) { + /* Start next INVITE request, if queued */ + nua_client_next_request(nh->nh_ds->ds_cr, 1); + } } /** @NUA_EVENT nua_i_active

1 0

[commit] r9518 - freeswitch/trunk/libs/sofia-sip/tests
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: mikej Date: Wed Sep 10 12:24:14 2008 New Revision: 9518 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c Log: Wed Sep 10 12:05:57 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_100rel.c: fixed timing problems with response to BYE Modified: freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c Wed Sep 10 12:24:14 2008 @@ -553,7 +553,7 @@ } int respond_483_to_prack(CONDITION_PARAMS); -static int prack_100rel(CONDITION_PARAMS); +static int prack_until_terminated(CONDITION_PARAMS); int test_183rel(struct context *ctx) { @@ -692,7 +692,7 @@ INVITE(a, a_call, a_call->nh, TAG_END()); - run_ab_until(ctx, -1, prack_100rel, -1, respond_483_to_prack); + run_ab_until(ctx, -1, prack_until_terminated, -1, respond_483_to_prack); /* Client transitions: INIT -(C1)-> CALLING: nua_invite(), nua_i_state @@ -797,8 +797,10 @@ END(); } -static int prack_100rel(CONDITION_PARAMS) +static int prack_until_terminated(CONDITION_PARAMS) { + static int terminated, bye_responded; + if (!check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR)) return 0; @@ -817,7 +819,13 @@ nua_prack(nh, SIPTAG_RACK(rack), TAG_END()); } - return event == nua_i_state && callstate(tags) == nua_callstate_terminated; + if (event == nua_i_state && callstate(tags) == nua_callstate_terminated) + terminated = 1; + + if (event == nua_r_bye && status >= 200) + bye_responded = 1; + + return terminated && bye_responded; } int respond_483_to_prack(CONDITION_PARAMS)

1 0