August 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9261 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:00:18 2008 New Revision: 9261 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Log: Mon Jul 21 13:06:54 EDT 2008 Pekka.Pessi(a)nokia.com * outbound.c: destroy response to OPTIONS keepalive only when it is no more used Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Aug 12 13:00:18 2008 @@ -1 +1 @@ -Tue Jul 8 00:36:02 EDT 2008 +Tue Aug 12 13:00:08 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Tue Aug 12 13:00:18 2008 @@ -647,6 +647,11 @@ static int response_to_keepalive_options(outbound_t *ob, nta_outgoing_t *orq, sip_t const *sip); +static int process_response_to_keepalive_options(outbound_t *ob, + nta_outgoing_t *orq, + sip_t const *sip, + int status, + char const *phrase); static void keepalive_timer(su_root_magic_t *root_magic, su_timer_t *t, @@ -828,10 +833,6 @@ { int status = 408; char const *phrase = sip_408_Request_timeout; - int binding_check; - int challenged = 0, credentials = 0; - msg_t *_reqmsg = nta_outgoing_getrequest(orq); - sip_t *request = sip_object(_reqmsg); msg_destroy(_reqmsg); if (sip && sip->sip_status) { status = sip->sip_status->st_status; @@ -842,8 +843,26 @@ /* This probably means that we are in trouble. whattodo, whattodo */ } - if (status < 200) - return 0; + if (status >= 200) { + if (orq == ob->ob_keepalive.orq) + ob->ob_keepalive.orq = NULL; + process_response_to_keepalive_options(ob, orq, sip, status, phrase); + nta_outgoing_destroy(orq); + } + + return 0; +} + +static int process_response_to_keepalive_options(outbound_t *ob, + nta_outgoing_t *orq, + sip_t const *sip, + int status, + char const *phrase) +{ + int binding_check; + int challenged = 0, credentials = 0; + msg_t *_reqmsg = nta_outgoing_getrequest(orq); + sip_t *request = sip_object(_reqmsg); msg_destroy(_reqmsg); if (sip == NULL) { SU_DEBUG_3(("outbound(%p): keepalive %u %s\n", (void *)ob->ob_owner, @@ -870,10 +889,6 @@ binding_check = outbound_nat_detect(ob, request, sip); - if (orq == ob->ob_keepalive.orq) - ob->ob_keepalive.orq = NULL; - nta_outgoing_destroy(orq); - if (binding_check > 1) { /* Bindings have changed */ if (outbound_contacts_from_via(ob, sip->sip_via) == 0) {

1 0

[commit] r9260 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 12:59:56 2008 New Revision: 9260 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Log: Tue May 27 13:03:35 EDT 2008 Pekka.Pessi(a)nokia.com * check_session.c: added test case call_error_3_2_3 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 Tue Aug 12 12:59:56 2008 @@ -1120,6 +1120,34 @@ END_TEST +START_TEST(call_error_3_2_3) +{ + nua_handle_t *nh; + struct message *invite; + + s2_case("3.2.3", "Re-INVITE failure", "Re-INVITE fails with 491 response"); + nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), + TAG_END()); + + invite_by_nua(nh, TAG_END()); + + nua_invite(nh, TAG_END()); + + fail_unless(s2_check_callstate(nua_callstate_calling)); + + invite = s2_wait_for_request(SIP_METHOD_INVITE); + fail_if(!invite); + s2_respond_to(invite, NULL, SIP_491_REQUEST_PENDING, TAG_END()); + s2_free_message(invite); + fail_unless(s2_check_request(SIP_METHOD_ACK)); + fail_unless(s2_check_event(nua_r_invite, 491)); + /* Return to previous state */ + fail_unless(s2_check_callstate(nua_callstate_ready)); + + bye_by_nua(nh, TAG_END()); +} +END_TEST + TCase *invite_error_tcase(void) { TCase *tc = tcase_create("3 - Call Errors"); @@ -1129,6 +1157,7 @@ tcase_add_test(tc, too_many_retrys); tcase_add_test(tc, reinvite_forbidden); tcase_add_test(tc, reinvite_too_many_retrys); + tcase_add_test(tc, call_error_3_2_3); tcase_set_timeout(tc, 5); } return tc;

1 0

[commit] r9259 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 12:59:22 2008 New Revision: 9259 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Log: Tue May 13 08:55:11 EDT 2008 Pekka.Pessi(a)nokia.com * test_soa.c: added test for a=sendonly/a=inactive handling Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Tue Aug 12 12:59:22 2008 @@ -1188,6 +1188,109 @@ END(); } +int test_media_mode(struct context *ctx) +{ + BEGIN(); + int n; + + soa_session_t *a, *b; + + char const *offer = NONE, *answer = NONE; + isize_t offerlen = (isize_t)-1; + isize_t answerlen = (isize_t)-1; + + su_home_t home[1] = { SU_HOME_INIT(home) }; + + char const a_caps[] = "m=audio 5008 RTP/AVP 0 8\r\n"; + char const b_caps[] = "m=audio 5004 RTP/AVP 8 0\n"; + + TEST_1(a = soa_clone(ctx->a, ctx->root, ctx)); + TEST_1(b = soa_clone(ctx->b, ctx->root, ctx)); + + TEST(soa_set_user_sdp(a, 0, a_caps, -1), 1); + TEST(soa_set_user_sdp(b, 0, b_caps, -1), 1); + + n = soa_generate_offer(a, 1, test_completed); TEST(n, 0); + n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 1); + TEST_1(offer != NULL && offer != NONE); + + n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1); + n = soa_generate_answer(b, test_completed); TEST(n, 0); + TEST_1(soa_is_complete(b)); + TEST(soa_activate(b, NULL), 0); + + n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 1); + TEST_1(answer != NULL && answer != NONE); + + n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1); + n = soa_process_answer(a, test_completed); TEST(n, 0); + TEST_1(soa_is_complete(a)); + TEST(soa_activate(a, NULL), 0); + + TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV); + TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV); + + /* 'A' will put call on hold */ + offer = NONE; + TEST(soa_set_params(a, SOATAG_HOLD("*"), TAG_END()), 1); + TEST(soa_generate_offer(a, 1, test_completed), 0); + TEST(soa_get_local_sdp(a, NULL, &offer, &offerlen), 1); + TEST_1(offer != NULL && offer != NONE); + TEST_1(strstr(offer, "a=sendonly")); + + TEST(soa_set_user_sdp(b, 0, + "m=audio 5004 RTP/AVP 8 0\n" + "a=inactive\n", -1), 1); + TEST(soa_set_remote_sdp(b, 0, offer, offerlen), 1); + TEST(soa_generate_answer(b, test_completed), 0); + TEST_1(soa_is_complete(b)); + TEST(soa_activate(b, NULL), 0); + TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1); + TEST_1(answer != NULL && answer != NONE); + TEST_1(strstr(answer, "a=inactive")); + TEST(soa_set_remote_sdp(a, 0, answer, -1), 1); + TEST(soa_process_answer(a, test_completed), 0); + TEST(soa_activate(a, NULL), 0); + + TEST(soa_is_audio_active(a), SOA_ACTIVE_INACTIVE); + TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_INACTIVE); + + /* 'A' will retrieve call, 'B' will keep call on hold */ + offer = NONE; + TEST(soa_set_params(a, SOATAG_HOLD(NULL), TAG_END()), 1); + TEST(soa_generate_offer(a, 1, test_completed), 0); + TEST(soa_get_local_sdp(a, NULL, &offer, &offerlen), 1); + TEST_1(offer != NULL && offer != NONE); + TEST_1(!strstr(offer, "a=sendonly")); + + TEST(soa_set_user_sdp(b, 0, + "m=audio 5004 RTP/AVP 8 0\n" + "a=sendonly\n", -1), 1); + TEST(soa_set_remote_sdp(b, 0, offer, offerlen), 1); + TEST(soa_generate_answer(b, test_completed), 0); + TEST_1(soa_is_complete(b)); + TEST(soa_activate(b, NULL), 0); + TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1); + TEST_1(answer != NULL && answer != NONE); + TEST_1(strstr(answer, "a=sendonly")); + TEST(soa_set_remote_sdp(a, 0, answer, -1), 1); + TEST(soa_process_answer(a, test_completed), 0); + TEST(soa_activate(a, NULL), 0); + + TEST(soa_is_audio_active(a), SOA_ACTIVE_RECVONLY); + TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_RECVONLY); + + TEST_VOID(soa_terminate(a, NULL)); + TEST_VOID(soa_terminate(b, NULL)); + + TEST_VOID(soa_destroy(a)); + TEST_VOID(soa_destroy(b)); + + su_home_deinit(home); + + END(); +} + int test_media_replace(struct context *ctx) { BEGIN(); @@ -1875,7 +1978,6 @@ retval |= test_soa_tags(ctx); SINGLE_FAILURE_CHECK(); retval |= test_init(ctx, argv + i); SINGLE_FAILURE_CHECK(); if (retval == 0) { - retval |= test_media_replace2(ctx); SINGLE_FAILURE_CHECK(); retval |= test_params(ctx); SINGLE_FAILURE_CHECK(); retval |= test_static_offer_answer(ctx); SINGLE_FAILURE_CHECK(); @@ -1883,6 +1985,8 @@ retval |= test_media_replace(ctx); SINGLE_FAILURE_CHECK(); retval |= test_media_removal(ctx); SINGLE_FAILURE_CHECK(); retval |= test_media_reject(ctx); SINGLE_FAILURE_CHECK(); + retval |= test_media_replace2(ctx); SINGLE_FAILURE_CHECK(); + retval |= test_media_mode(ctx); SINGLE_FAILURE_CHECK(); retval |= test_asynch_offer_answer(ctx); SINGLE_FAILURE_CHECK(); }

1 0

[commit] r9258 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 11:34:25 2008 New Revision: 9258 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: perpetual sound does not auto-mute, you can do that yourself if you want it Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Aug 12 11:34:25 2008 @@ -5026,11 +5026,10 @@ if (!switch_strlen_zero(perpetual_sound)) { conference->perpetual_sound = switch_core_strdup(conference->pool, perpetual_sound); - conference->mflags = MFLAG_CAN_HEAR; - } else { - conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; } + conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; + if (!switch_strlen_zero(moh_sound) && switch_is_moh(moh_sound)) { conference->moh_sound = switch_core_strdup(conference->pool, moh_sound); }

1 0

[commit] r9257 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 11:16:33 2008 New Revision: 9257 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: set flag to avoid race on transfer -both Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Aug 12 11:16:33 2008 @@ -881,6 +881,9 @@ } } else if (!strcasecmp(arg, "both")) { if (uuid && (other_session = switch_core_session_locate(uuid))) { + switch_channel_t *other_channel = switch_core_session_get_channel(other_session); + switch_channel_set_flag(other_channel, CF_TRANSFER); + switch_channel_set_flag(channel, CF_TRANSFER); switch_ivr_session_transfer(other_session, dest, dp, context); switch_core_session_rwunlock(other_session); }

1 0

[commit] r9256 - freeswitch/trunk/scripts
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: brian Date: Mon Aug 11 23:00:14 2008 New Revision: 9256 Modified: freeswitch/trunk/scripts/mklm Log: w00t Modified: freeswitch/trunk/scripts/mklm ============================================================================== --- freeswitch/trunk/scripts/mklm (original) +++ freeswitch/trunk/scripts/mklm Mon Aug 11 23:00:14 2008 @@ -44,6 +44,7 @@ $line =~ s/<(.*?)>//gi;; $line =~ s/^\s*//; $line =~ s/\s*$//; + $line =~ s/_/ /g; @tmp = split(' ', $line); foreach $tmp (@tmp) { push(@in, uc($tmp));

1 0

[commit] r9255 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: brian Date: Mon Aug 11 20:04:30 2008 New Revision: 9255 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: no bull Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Aug 11 20:04:30 2008 @@ -51,7 +51,7 @@    -  +  </params> <variables>

1 0

[commit] r9254 - freeswitch/trunk/debian
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: cypromis Date: Mon Aug 11 20:00:19 2008 New Revision: 9254 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: read before you type and don't try to be samrt at 2am Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Aug 11 20:00:19 2008 @@ -11,7 +11,6 @@ /opt/freeswitch/conf/dialplan/features.xml /opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml /opt/freeswitch/conf/dialplan/extensions/99999_enum.xml -/opt/freeswitch/conf/dialplan/extensions/default.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml /opt/freeswitch/conf/sip_profiles/nat/example.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Aug 11 20:00:19 2008 @@ -47,7 +47,6 @@ opt/freeswitch/conf/dialplan/features.xml opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml opt/freeswitch/conf/dialplan/extensions/99999_enum.xml -opt/freeswitch/conf/dialplan/extensions/default.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml opt/freeswitch/conf/sip_profiles/nat/example.xml

1 0

[commit] r9253 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 19:58:42 2008 New Revision: 9253 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Aug 11 19:58:42 2008 @@ -2024,7 +2024,7 @@ if (!strcasecmp(var, "text/plain")) { holder.http = NULL; } - } else { + } else if (holder.http) { stream->write_function(stream, "%s", "Content-Type: text/html\n\n"); }

1 0

[commit] r9252 - freeswitch/trunk/debian
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: cypromis Date: Mon Aug 11 19:44:39 2008 New Revision: 9252 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: I should get new glasses ... aain conffiles in debian debuild. Typo, its 99999_enum.xml and not 00000_enum.xml Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Aug 11 19:44:39 2008 @@ -10,7 +10,7 @@ /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/dialplan/features.xml /opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml -/opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +/opt/freeswitch/conf/dialplan/extensions/99999_enum.xml /opt/freeswitch/conf/dialplan/extensions/default.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Aug 11 19:44:39 2008 @@ -46,7 +46,7 @@ opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml -opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +opt/freeswitch/conf/dialplan/extensions/99999_enum.xml opt/freeswitch/conf/dialplan/extensions/default.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml

1 0