June 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r13964 - in freeswitch/trunk: libs/esl src
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: brian Date: Thu Jun 25 14:29:34 2009 New Revision: 13964 Log: FSCORE-389 Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/src/switch_console.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Thu Jun 25 14:29:34 2009 @@ -720,6 +720,7 @@ el_set(el, EL_HIST, history, myhistory); history(myhistory, &ev, H_LOAD, hfile); + el_source(el, NULL); #endif #ifdef WIN32 Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Thu Jun 25 14:29:34 2009 @@ -802,6 +802,8 @@ el_set(el, EL_HIST, history, myhistory); history(myhistory, &ev, H_LOAD, hfile); + el_source(el, NULL); + switch_threadattr_create(&thd_attr, pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);

1 0

[Freeswitch-svn] [commit] r13963 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Thu Jun 25 13:56:37 2009 New Revision: 13963 Log: unhold before media timeout Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Thu Jun 25 13:56:37 2009 @@ -385,7 +385,7 @@ } else { switch_snprintf(reason, sizeof(reason), "FreeSWITCH;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); } - + if (switch_channel_test_flag(channel, CF_ANSWERED)) { if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); @@ -620,6 +620,10 @@ status = switch_rtp_zerocopy_read_frame(tech_pvt->video_rtp_session, &tech_pvt->video_read_frame, flags); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { if (status == SWITCH_STATUS_TIMEOUT) { + if (sofia_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + sofia_glue_toggle_hold(tech_pvt, 0); + sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + } switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT); } return status; @@ -728,6 +732,12 @@ if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { if (status == SWITCH_STATUS_TIMEOUT) { + + if (sofia_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + sofia_glue_toggle_hold(tech_pvt, 0); + sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + } + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT); } return status;

1 0

[Freeswitch-svn] [commit] r13962 - freeswitch/trunk/contrib/jmesquita/mod_khomp
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: raulfragoso Date: Thu Jun 25 13:54:28 2009 New Revision: 13962 Log: removed the (unnecessary) check for the VOICE flag when reading frames Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Thu Jun 25 13:54:28 2009 @@ -364,8 +364,8 @@ return SWITCH_STATUS_FALSE; } - if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { - switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + //if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { + // switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); if (!tech_pvt->read_frame.datalen) { continue; } @@ -376,7 +376,7 @@ } #endif return SWITCH_STATUS_SUCCESS; - } + //} switch_cond_next(); }

1 0

[Freeswitch-svn] [commit] r13961 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: mikej Date: Thu Jun 25 13:47:15 2009 New Revision: 13961 Log: Thu Jun 25 12:35:25 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: test for 200 response to BYE left unreplied by application Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jun 25 13:47:15 2009 @@ -1 +1 @@ -Thu Jun 25 13:44:49 CDT 2009 +Thu Jun 25 13:46:21 CDT 2009 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 Thu Jun 25 13:47:15 2009 @@ -2414,7 +2414,7 @@ fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); - fail_unless(s2_sip_check_response(500, SIP_METHOD_BYE)); + fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE)); } END_TEST

1 0

[Freeswitch-svn] [commit] r13960 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: mikej Date: Thu Jun 25 13:46:14 2009 New Revision: 13960 Log: Thu Jun 25 12:25:56 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: check correct non-support for 100rel Thu Jun 25 12:26:46 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: if 100rel is not supported by nua, do not Require it in response Thu Jun 25 12:33:45 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: cleaned test for SFSIP-125 Fixes SFSIP-125 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jun 25 13:46:14 2009 @@ -1 +1 @@ -Thu Jun 25 13:43:44 CDT 2009 +Thu Jun 25 13:44:49 CDT 2009 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 Thu Jun 25 13:46:14 2009 @@ -1408,6 +1408,95 @@ } END_TEST +START_TEST(call_2_4_3) +{ + struct message *response; + + S2_CASE("2.4.3", "Call without 100rel", + "NUA receives INVITE with Required: 100rel, " + "rejects it with 420"); + + nua_set_params(s2->nua, + SIPTAG_SUPPORTED(SIP_NONE), + SIPTAG_SUPPORTED_STR("timer"), + TAG_END()); + fail_unless_event(nua_r_set_params, 200); + + soa_generate_offer(soa, 1, NULL); + request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, + SIPTAG_REQUIRE_STR("100rel"), + TAG_END()); + + response = s2_sip_wait_for_response(420, SIP_METHOD_INVITE); + fail_if(!response); + fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); +} +END_TEST + +START_TEST(call_2_4_4) +{ + nua_handle_t *nh; + struct event *invite; + struct message *response; + + S2_CASE("2.4.3", "Call without 100rel", + "NUA receives INVITE with Supported: 100rel, " + "proceeds normally"); + + nua_set_params(s2->nua, + SIPTAG_SUPPORTED(SIP_NONE), + SIPTAG_SUPPORTED_STR("timer"), + TAG_END()); + fail_unless_event(nua_r_set_params, 200); + + soa_generate_offer(soa, 1, NULL); + request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, + SIPTAG_SUPPORTED_STR("100rel"), + TAG_END()); + + invite = s2_wait_for_event(nua_i_invite, 100); fail_unless(invite != NULL); + fail_unless(s2_check_callstate(nua_callstate_received)); + + nh = invite->nh; fail_if(!nh); + + s2_free_event(invite); + + response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE); + fail_if(!response); + + nua_respond(nh, SIP_183_SESSION_PROGRESS, + SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"), + TAG_END()); + fail_unless(s2_check_callstate(nua_callstate_early)); + + response = s2_sip_wait_for_response(183, SIP_METHOD_INVITE); + fail_if(!response); + fail_if(response->sip->sip_require); + s2_sip_update_dialog(dialog, response); + process_answer(response); + s2_sip_free_message(response); + + nua_respond(nh, SIP_200_OK, TAG_END()); + + fail_unless(s2_check_callstate(nua_callstate_completed)); + + response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE); + fail_if(!response); + s2_sip_update_dialog(dialog, response); + s2_sip_free_message(response); + + fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); + + fail_unless_event(nua_i_ack, 200); + fail_unless(s2_check_callstate(nua_callstate_ready)); + + bye_to_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST + + TCase *invite_100rel_tcase(int threading) { TCase *tc = tcase_create("2.4 - INVITE with 100rel"); @@ -1415,6 +1504,8 @@ { tcase_add_test(tc, call_2_4_1); tcase_add_test(tc, call_2_4_2); + tcase_add_test(tc, call_2_4_3); + tcase_add_test(tc, call_2_4_4); } return tc; } 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 Thu Jun 25 13:46:14 2009 @@ -2409,6 +2409,8 @@ if (require == NULL && supported == NULL) return 0; + if (!sip_has_feature(NH_PGET(nh, supported), "100rel")) + return 0; if (sip_has_feature(require, "100rel")) return 1; if (!sip_has_feature(supported, "100rel"))

1 0

[Freeswitch-svn] [commit] r13959 - freeswitch/trunk/contrib/jmesquita/mod_khomp
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: raulfragoso Date: Thu Jun 25 13:46:01 2009 New Revision: 13959 Log: white space test Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Thu Jun 25 13:46:01 2009 @@ -29,7 +29,7 @@ * mod_khomp.c -- Khomp board Endpoint Module * */ - + #define KHOMP_SYNTAX "khomp show [info|links|channels]" /* Our includes */

1 0

[Freeswitch-svn] [commit] r13958 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: andrew Date: Thu Jun 25 13:44:43 2009 New Revision: 13958 Log: Clear out the pre shared key on a config reload properly Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Thu Jun 25 13:44:43 2009 @@ -224,6 +224,10 @@ switch_mutex_lock(globals.mutex); switch_core_hash_destroy(&globals.event_hash); globals.event_hash = NULL; + if (globals.psk) { + switch_safe_free(globals.psk); + globals.psk = NULL; + } switch_core_hash_init(&globals.event_hash, module_pool); memset(globals.event_list, 0, SWITCH_EVENT_ALL + 1); if (load_config() != SWITCH_STATUS_SUCCESS) {

1 0

[Freeswitch-svn] [commit] r13957 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: mikej Date: Thu Jun 25 13:44:31 2009 New Revision: 13957 Log: Thu Jun 25 12:13:32 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_nta_client.c: silenced check for bug #2531152 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jun 25 13:44:31 2009 @@ -1 +1 @@ -Thu Jun 25 13:42:28 CDT 2009 +Thu Jun 25 13:43:44 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c Thu Jun 25 13:44:31 2009 @@ -407,8 +407,6 @@ s2_nta_setup("NTA", NULL, TAG_END()); - s2_nta_setup_logs(7); - fail_unless(s2sip->udp.contact != NULL); if (s2sip->udp.contact->m_url->url_port == NULL ||

1 0

[Freeswitch-svn] [commit] r13956 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: mikej Date: Thu Jun 25 13:43:54 2009 New Revision: 13956 Log: Wed Jun 3 12:25:19 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport_type_udp.c: added field names to tport_vtable_t initialization Wed Jun 3 12:25:52 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport_type_tcp.c: added field names to tport_vtable_t initialization Wed Jun 3 12:29:13 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport_threadpool.c: added field names to tport_vtable_t initialization Wed Jun 3 12:29:41 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport_type_connect.c: added field names to tport_vtable_t initialization Wed Jun 3 12:30:01 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport_type_stun.c: added field names to tport_vtable_t initialization Wed Jun 3 12:30:17 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport_type_sctp.c: added field names to tport_vtable_t initialization Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_threadpool.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_connect.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jun 25 13:43:54 2009 @@ -1 +1 @@ -Tue Jun 23 14:48:51 CDT 2009 +Thu Jun 25 13:42:28 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_threadpool.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_threadpool.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_threadpool.c Thu Jun 25 13:43:54 2009 @@ -129,22 +129,27 @@ tport_vtable_t const tport_threadpool_vtable = { - "udp", tport_type_local, - sizeof (tport_threadpool_t), - tport_threadpool_init_primary, - tport_threadpool_deinit_primary, - NULL, - NULL, - 0, /* No secondary transports! */ - NULL, - NULL, - NULL, - NULL, - NULL, - tport_recv_dgram, - tport_send_dgram, - NULL, - tport_thread_send + /* vtp_name */ "udp", + /* vtp_public */ tport_type_local, + /* vtp_pri_size */ sizeof (tport_threadpool_t), + /* vtp_init_primary */ tport_threadpool_init_primary, + /* vtp_deinit_primary */ tport_threadpool_deinit_primary, + /* vtp_wakeup_pri */ NULL, + /* vtp_connect */ NULL, + /* vtp_secondary_size */ 0, /* No secondary transports! */ + /* vtp_init_secondary */ NULL, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_dgram, + /* vtp_send */ tport_send_dgram, + /* vtp_deliver */ NULL, + /* vtp_prepare */ tport_thread_send, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ NULL, + /* vtp_secondary_timer */ NULL, }; static int thrp_udp_init(su_root_t *, threadpool_t *); @@ -809,4 +814,5 @@ tport_error_report(tp, tpd->tpd_errorcode, msg_addr(tpd->tpd_msg)); msg_ref_destroy(tpd->tpd_msg); + } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_connect.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_connect.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_connect.c Thu Jun 25 13:43:54 2009 @@ -76,21 +76,27 @@ tport_vtable_t const tport_http_connect_vtable = { - "TCP", tport_type_connect, - sizeof (tport_http_connect_t), - tport_http_connect_init_primary, - tport_http_connect_deinit_primary, - NULL, - tport_http_connect, - sizeof (tport_http_connect_instance_t), - NULL, - NULL, - NULL, - NULL, - NULL, - tport_recv_stream, - tport_send_stream, - tport_http_deliver, + /* vtp_name */ "TCP", + /* vtp_public */ tport_type_connect, + /* vtp_pri_size */ sizeof (tport_http_connect_t), + /* vtp_init_primary */ tport_http_connect_init_primary, + /* vtp_deinit_primary */ tport_http_connect_deinit_primary, + /* vtp_wakeup_pri */ NULL, + /* vtp_connect */ tport_http_connect, + /* vtp_secondary_size */ sizeof (tport_http_connect_instance_t), + /* vtp_init_secondary */ NULL, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_stream, + /* vtp_send */ tport_send_stream, + /* vtp_deliver */ tport_http_deliver, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ NULL, + /* vtp_secondary_timer */ NULL, }; static int tport_http_connect_init_primary(tport_primary_t *pri, Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c Thu Jun 25 13:43:54 2009 @@ -102,50 +102,52 @@ tport_vtable_t const tport_sctp_client_vtable = { - "sctp", tport_type_client, - sizeof (tport_primary_t), - tport_sctp_init_client, - NULL, - tport_accept, - NULL, - sizeof (tport_t), - tport_sctp_init_secondary, - NULL, - NULL, - NULL, - NULL, - tport_recv_sctp, - tport_send_sctp, - NULL, - NULL, - NULL, - NULL, - tport_sctp_next_timer, - tport_sctp_timer, + /* vtp_name */ "sctp", + /* vtp_public */ tport_type_client, + /* vtp_pri_size */ sizeof (tport_primary_t), + /* vtp_init_primary */ tport_sctp_init_client, + /* vtp_deinit_primary */ NULL, + /* vtp_wakeup_pri */ tport_accept, + /* vtp_connect */ NULL, + /* vtp_secondary_size */ sizeof (tport_t), + /* vtp_init_secondary */ tport_sctp_init_secondary, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_sctp, + /* vtp_send */ tport_send_sctp, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ tport_sctp_next_timer, + /* vtp_secondary_timer */ tport_sctp_timer, }; tport_vtable_t const tport_sctp_vtable = { - "sctp", tport_type_local, - sizeof (tport_primary_t), - tport_sctp_init_primary, - NULL, - tport_accept, - NULL, - sizeof (tport_t), - tport_sctp_init_secondary, - NULL, - NULL, - NULL, - NULL, - tport_recv_sctp, - tport_send_sctp, - NULL, - NULL, - NULL, - NULL, - tport_sctp_next_timer, - tport_sctp_timer, + /* vtp_name */ "sctp", + /* vtp_public */ tport_type_local, + /* vtp_pri_size */ sizeof (tport_primary_t), + /* vtp_init_primary */ tport_sctp_init_primary, + /* vtp_deinit_primary */ NULL, + /* vtp_wakeup_pri */ tport_accept, + /* vtp_connect */ NULL, + /* vtp_secondary_size */ sizeof (tport_t), + /* vtp_init_secondary */ tport_sctp_init_secondary, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_sctp, + /* vtp_send */ tport_send_sctp, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ tport_sctp_next_timer, + /* vtp_secondary_timer */ tport_sctp_timer, }; static int tport_sctp_init_primary(tport_primary_t *pri, Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c Thu Jun 25 13:43:54 2009 @@ -77,24 +77,27 @@ tport_vtable_t const tport_stun_vtable = { - "UDP", tport_type_stun, - sizeof (tport_primary_t), - tport_udp_init_stun, - tport_udp_deinit_stun, - NULL, - NULL, - sizeof (tport_t), - NULL, - NULL, - NULL, - NULL, - NULL, - tport_recv_dgram, - tport_send_dgram, - NULL, - NULL, - tport_stun_keepalive, - tport_stun_response + /* vtp_name */ "UDP", + /* vtp_public */ tport_type_stun, + /* vtp_pri_size */ sizeof (tport_primary_t), + /* vtp_init_primary */ tport_udp_init_stun, + /* vtp_deinit_primary */ tport_udp_deinit_stun, + /* vtp_wakeup_pri */ NULL, + /* vtp_connect */ NULL, + /* vtp_secondary_size */ sizeof (tport_t), + /* vtp_init_secondary */ NULL, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_dgram, + /* vtp_send */ tport_send_dgram, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ tport_stun_keepalive, + /* vtp_stun_response */ tport_stun_response, + /* vtp_next_secondary_timer*/ NULL, + /* vtp_secondary_timer */ NULL, }; static int tport_udp_init_stun(tport_primary_t *pri, Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c Thu Jun 25 13:43:54 2009 @@ -63,50 +63,52 @@ tport_vtable_t const tport_tcp_vtable = { - "tcp", tport_type_local, - sizeof (tport_primary_t), - tport_tcp_init_primary, - NULL, - tport_accept, - NULL, - sizeof (tport_t), - tport_tcp_init_secondary, - NULL, - NULL, - NULL, - NULL, - tport_recv_stream, - tport_send_stream, - NULL, - NULL, - NULL, - NULL, - tport_tcp_next_timer, - tport_tcp_timer, + /* vtp_name */ "tcp", + /* vtp_public */ tport_type_local, + /* vtp_pri_size */ sizeof (tport_primary_t), + /* vtp_init_primary */ tport_tcp_init_primary, + /* vtp_deinit_primary */ NULL, + /* vtp_wakeup_pri */ tport_accept, + /* vtp_connect */ NULL, + /* vtp_secondary_size */ sizeof (tport_t), + /* vtp_init_secondary */ tport_tcp_init_secondary, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_stream, + /* vtp_send */ tport_send_stream, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ tport_tcp_next_timer, + /* vtp_secondary_timer */ tport_tcp_timer, }; tport_vtable_t const tport_tcp_client_vtable = { - "tcp", tport_type_client, - sizeof (tport_primary_t), - tport_tcp_init_client, - NULL, - NULL, - NULL, - sizeof (tport_t), - tport_tcp_init_secondary, - NULL, - NULL, - NULL, - NULL, - tport_recv_stream, - tport_send_stream, - NULL, - NULL, - NULL, - NULL, - tport_tcp_next_timer, - tport_tcp_timer, + /* vtp_name */ "tcp", + /* vtp_public */ tport_type_client, + /* vtp_pri_size */ sizeof (tport_primary_t), + /* vtp_init_primary */ tport_tcp_init_client, + /* vtp_deinit_primary */ NULL, + /* vtp_wakeup_pri */ NULL, + /* vtp_connect */ NULL, + /* vtp_secondary_size */ sizeof (tport_t), + /* vtp_init_secondary */ tport_tcp_init_secondary, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_stream, + /* vtp_send */ tport_send_stream, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ tport_tcp_next_timer, + /* vtp_secondary_timer */ tport_tcp_timer, }; static int tport_tcp_setsndbuf(int socket, int atleast); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Thu Jun 25 13:43:54 2009 @@ -69,38 +69,52 @@ tport_vtable_t const tport_udp_client_vtable = { - "udp", tport_type_client, - sizeof (tport_primary_t), - tport_udp_init_client, - NULL, - NULL, - NULL, - sizeof (tport_t), - NULL, - NULL, - NULL, - NULL, - NULL, - tport_recv_dgram, - tport_send_dgram, + /* vtp_name */ "udp", + /* vtp_public */ tport_type_client, + /* vtp_pri_size */ sizeof (tport_primary_t), + /* vtp_init_primary */ tport_udp_init_client, + /* vtp_deinit_primary */ NULL, + /* vtp_wakeup_pri */ NULL, + /* vtp_connect */ NULL, + /* vtp_secondary_size */ sizeof (tport_t), + /* vtp_init_secondary */ NULL, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_dgram, + /* vtp_send */ tport_send_dgram, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ NULL, + /* vtp_secondary_timer */ NULL, }; tport_vtable_t const tport_udp_vtable = { - "udp", tport_type_local, - sizeof (tport_primary_t), - tport_udp_init_primary, - NULL, - NULL, - NULL, - sizeof (tport_t), - NULL, - NULL, - NULL, - NULL, - NULL, - tport_recv_dgram, - tport_send_dgram, + /* vtp_name */ "udp", + /* vtp_public */ tport_type_local, + /* vtp_pri_size */ sizeof (tport_primary_t), + /* vtp_init_primary */ tport_udp_init_primary, + /* vtp_deinit_primary */ NULL, + /* vtp_wakeup_pri */ NULL, + /* vtp_connect */ NULL, + /* vtp_secondary_size */ sizeof (tport_t), + /* vtp_init_secondary */ NULL, + /* vtp_deinit_secondary */ NULL, + /* vtp_shutdown */ NULL, + /* vtp_set_events */ NULL, + /* vtp_wakeup */ NULL, + /* vtp_recv */ tport_recv_dgram, + /* vtp_send */ tport_send_dgram, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ NULL, + /* vtp_secondary_timer */ NULL, }; static void tport_check_trunc(tport_t *tp, su_addrinfo_t *ai);

1 0

[Freeswitch-svn] [commit] r13955 - in freeswitch/trunk: contrib scripts/contrib
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: intralanman Date: Thu Jun 25 13:22:16 2009 New Revision: 13955 Log: CAUTION: janitor at work... wet floors Added: freeswitch/trunk/contrib/ (props changed) - copied from r13954, /freeswitch/trunk/scripts/contrib/ Removed: freeswitch/trunk/scripts/contrib/

1 0