- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8591 - freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sat May 24 23:04:36 2008 New Revision: 8591 Modified: freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj Log: Mon May 19 11:54:03 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * win32/tests/test_nua: updated test_nua.dsp and test_nua.vcproj Modified: freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp (original) +++ freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp Sat May 24 23:04:36 2008 @@ -89,39 +89,39 @@ # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_100rel.c" +SOURCE="..\..\..\tests\test_100rel.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_basic_call.c" +SOURCE="..\..\..\tests\test_basic_call.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_call_hold.c" +SOURCE="..\..\..\tests\test_call_hold.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_call_reject.c" +SOURCE="..\..\..\tests\test_call_reject.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_cancel_bye.c" +SOURCE="..\..\..\tests\test_cancel_bye.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_extension.c" +SOURCE="..\..\..\tests\test_extension.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_init.c" +SOURCE="..\..\..\tests\test_init.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_nat.c" +SOURCE="..\..\..\tests\test_nat.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_nat.h" +SOURCE="..\..\..\tests\test_nat.h" # End Source File # Begin Source File @@ -129,55 +129,55 @@ # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua.c" +SOURCE="..\..\..\tests\test_nua.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua.h" +SOURCE="..\..\..\tests\test_nua.h" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua_api.c" +SOURCE="..\..\..\tests\test_nua_api.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua_params.c" +SOURCE="..\..\..\tests\test_nua_params.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_offer_answer.c" +SOURCE="..\..\..\tests\test_offer_answer.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_ops.c" +SOURCE="..\..\..\tests\test_ops.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_proxy.c" +SOURCE="..\..\..\tests\test_proxy.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_proxy.h" +SOURCE="..\..\..\tests\test_proxy.h" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_refer.c" +SOURCE="..\..\..\tests\test_refer.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_register.c" +SOURCE="..\..\..\tests\test_register.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_session_timer.c" +SOURCE="..\..\..\tests\test_session_timer.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_simple.c" +SOURCE="..\..\..\tests\test_simple.c" # End Source File # Begin Source File -SOURCE="..\..\..\libsofia-sip-ua\nua\test_sip_events.c" +SOURCE="..\..\..\tests\test_sip_events.c" # End Source File # Begin Source File Modified: freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj (original) +++ freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj Sat May 24 23:04:36 2008 @@ -234,7 +234,7 @@ > </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_100rel.c" + RelativePath="..\..\..\tests\test_100rel.c" > <FileConfiguration Name="Debug|Win32" @@ -256,7 +256,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_basic_call.c" + RelativePath="..\..\..\tests\test_basic_call.c" > <FileConfiguration Name="Debug|Win32" @@ -278,7 +278,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_call_hold.c" + RelativePath="..\..\..\tests\test_call_hold.c" > <FileConfiguration Name="Debug|Win32" @@ -300,7 +300,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_call_reject.c" + RelativePath="..\..\..\tests\test_call_reject.c" > <FileConfiguration Name="Debug|Win32" @@ -322,7 +322,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_cancel_bye.c" + RelativePath="..\..\..\tests\test_cancel_bye.c" > <FileConfiguration Name="Debug|Win32" @@ -344,7 +344,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_extension.c" + RelativePath="..\..\..\tests\test_extension.c" > <FileConfiguration Name="Debug|Win32" @@ -366,7 +366,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_init.c" + RelativePath="..\..\..\tests\test_init.c" > <FileConfiguration Name="Debug|Win32" @@ -388,7 +388,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_nat.c" + RelativePath="..\..\..\tests\test_nat.c" > <FileConfiguration Name="Debug|Win32" @@ -410,7 +410,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_nat.h" + RelativePath="..\..\..\tests\test_nat.h" > </File> <File @@ -436,7 +436,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua.c" + RelativePath="..\..\..\tests\test_nua.c" > <FileConfiguration Name="Debug|Win32" @@ -458,11 +458,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua.h" + RelativePath="..\..\..\tests\test_nua.h" > </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua_api.c" + RelativePath="..\..\..\tests\test_nua_api.c" > <FileConfiguration Name="Debug|Win32" @@ -484,7 +484,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua_params.c" + RelativePath="..\..\..\tests\test_nua_params.c" > <FileConfiguration Name="Debug|Win32" @@ -506,11 +506,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_offer_answer.c" + RelativePath="..\..\..\tests\test_offer_answer.c" > </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_ops.c" + RelativePath="..\..\..\tests\test_ops.c" > <FileConfiguration Name="Debug|Win32" @@ -532,7 +532,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_proxy.c" + RelativePath="..\..\..\tests\test_proxy.c" > <FileConfiguration Name="Debug|Win32" @@ -554,11 +554,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_proxy.h" + RelativePath="..\..\..\tests\test_proxy.h" > </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_refer.c" + RelativePath="..\..\..\tests\test_refer.c" > <FileConfiguration Name="Debug|Win32" @@ -580,7 +580,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_register.c" + RelativePath="..\..\..\tests\test_register.c" > <FileConfiguration Name="Debug|Win32" @@ -602,7 +602,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_session_timer.c" + RelativePath="..\..\..\tests\test_session_timer.c" > <FileConfiguration Name="Debug|Win32" @@ -624,7 +624,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_simple.c" + RelativePath="..\..\..\tests\test_simple.c" > <FileConfiguration Name="Debug|Win32" @@ -646,7 +646,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\..\libsofia-sip-ua\nua\test_sip_events.c" + RelativePath="..\..\..\tests\test_sip_events.c" > <FileConfiguration Name="Debug|Win32"

1 0

[commit] r8590 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sat May 24 23:03:58 2008 New Revision: 8590 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c Log: Mon May 19 11:53:23 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * tport_type_tcp.c: report EPIPE when transport gets closed after ping-pong timeout Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sat May 24 23:03:58 2008 @@ -1 +1 @@ -Wed May 21 00:25:55 CEST 2008 +Sat May 24 23:03:50 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c Sat May 24 23:03:58 2008 @@ -226,7 +226,7 @@ * If true, respond with PONG to PING. Default value is 0 (false). * * If set, the ping-pong protocol is used on TCP connections. If a ping (at - * least 4 whitespace characters) is received within messages, a pong + * least 4 whitespace characters) is received between messages, a pong * (CR-LF) is sent in response. * * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), 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 Sat May 24 23:03:58 2008 @@ -277,7 +277,8 @@ if (n <= 0) return (int)n; - SU_DEBUG_7(("%s(%p): received keepalive\n", __func__, (void *)self)); + SU_DEBUG_7(("%s(%p): received keepalive (total %u)\n", __func__, + (void *)self, self->tp_ping)); N -= n, self->tp_ping += n; @@ -449,7 +450,9 @@ __func__, (void *)self, "closing connection", TPN_ARGS(self->tp_name), " because of PONG timeout")); - tport_close(self); + tport_error_report(self, EPIPE, NULL); + if (!self->tp_closed) + tport_close(self); return; } }

1 0

[commit] r8589 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sat May 24 23:00:54 2008 New Revision: 8589 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Un-revert the following: Tue Feb 26 11:09:37 EST 2008 Pekka.Pessi(a)nokia.com * nua: initial fix for sf.net bug #1827511 BYE can now be challenged. Add the fixes to segfault issue caused by this patch: Wed May 21 10:40:06 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_client_request: keep own reference to nua handle Mon May 12 18:58:38 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: sanitized BYE handling Terminate or cancel other session-related transactions when session gets terminated. Fri May 16 10:28:26 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: fix crash if session was terminated while INVITE was in progress Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c Sat May 24 23:00:54 2008 @@ -379,8 +379,12 @@ /* Destroy saved client request */ if (cr0 != du->du_cr && nua_client_is_bound(du->du_cr)) { nua_client_bind(cr = du->du_cr, NULL); - if (!nua_client_is_queued(cr) && - !nua_client_is_reporting(cr)) + + if (nua_client_is_queued(cr)) + nua_client_request_complete(cr); + else if (nua_client_is_reporting(cr)) + ; + else nua_client_request_destroy(cr); } 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 Sat May 24 23:00:54 2008 @@ -245,10 +245,12 @@ { nua_session_usage_t *ss = nua_dialog_usage_private(du); nua_client_request_t *cr, *cr_next; + nua_server_request_t *sr; cr = du->du_cr; - if (cr != cr0 && cr && cr->cr_orq && cr->cr_status >= 200) { + if (cr != cr0 && cr && cr->cr_orq && cr->cr_status >= 200 && + cr->cr_method == sip_method_invite) { ss->ss_reporting = 1; nua_invite_client_ack(cr, NULL); ss->ss_reporting = 0; @@ -267,11 +269,13 @@ if (cr == du->du_cr && cr->cr_orq) continue; - nua_stack_event(nh->nh_nua, nh, - NULL, - cr->cr_event, - SIP_481_NO_TRANSACTION, - NULL); + if (cr->cr_status < 200) { + nua_stack_event(nh->nh_nua, nh, + NULL, + cr->cr_event, + SIP_481_NO_TRANSACTION, + NULL); + } nua_client_request_destroy(cr); @@ -291,6 +295,12 @@ signal_call_state_change(nh, ss, status, phrase, nua_callstate_terminated); } + /* Application can respond to BYE after the session usage has terminated */ + for (sr = ds->ds_sr; sr; sr = sr->sr_next) { + if (sr->sr_usage == du && sr->sr_method == sip_method_bye) + sr->sr_usage = NULL; + } + ds->ds_has_session = 0; nh->nh_has_invite = 0; nh->nh_active_call = 0; @@ -724,10 +734,15 @@ if (!du) return -1; + ss = nua_dialog_usage_private(du); + + if (ss->ss_state >= nua_callstate_terminating) + return nua_client_return(cr, 900, "Session is terminating", msg); + if (nua_client_bind(cr, du) < 0) return nua_client_return(cr, 900, "INVITE already in progress", msg); - ss = nua_dialog_usage_private(du); + cr->cr_neutral = 0; session_timer_preferences(ss->ss_timer, sip, @@ -737,8 +752,6 @@ NH_PGET(nh, refresher), NH_PGET(nh, min_se)); - cr->cr_neutral = 0; - return 0; } @@ -755,6 +768,9 @@ if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); + if (ss->ss_state >= nua_callstate_terminating) + return nua_client_return(cr, 900, "Session is terminating", msg); + assert(ss); invite_timeout = NH_PGET(nh, invite_timeout); @@ -1167,7 +1183,7 @@ if (error < 0) { if (ss->ss_reason == NULL) ss->ss_reason = "SIP;cause=500;text=\"Internal Error\""; - ss->ss_reporting = 1; /* We report state here if BYE fails */ + ss->ss_reporting = 1; /* We report terminated state here if BYE fails */ error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL); ss->ss_reporting = 0; signal_call_state_change(nh, ss, 500, "Internal Error", @@ -1212,6 +1228,7 @@ char const *invite_branch; assert(cr->cr_orq); + assert(cr->cr_method == sip_method_invite); if (!ds->ds_leg) { @@ -1675,6 +1692,8 @@ if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); assert(ss); + if (ss->ss_state >= nua_callstate_terminating) + return nua_client_return(cr, 900, "Session is terminating", msg); cri = du->du_cr; @@ -2465,7 +2484,7 @@ nua_stack_event(nh->nh_nua, nh, NULL, nua_i_media_error, status, phrase, NULL); - ss->ss_reporting = 1; /* We report state here if BYE fails */ + ss->ss_reporting = 1; /* We report terminated state here if BYE fails */ error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL); ss->ss_reporting = 0; @@ -2562,7 +2581,7 @@ /* send BYE, too, if 200 OK (or 183 to re-INVITE) timeouts */ ss->ss_reason = reason; - ss->ss_reporting = 1; /* We report state here if BYE fails */ + ss->ss_reporting = 1; /* We report terminated state here if BYE fails */ error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL); ss->ss_reporting = 0; @@ -3134,6 +3153,8 @@ if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); assert(ss); + if (ss->ss_state >= nua_callstate_terminating) + return nua_client_return(cr, 900, "Session is terminating", msg); cri = du->du_cr; @@ -3592,7 +3613,9 @@ if (nh->nh_soa) soa_terminate(nh->nh_soa, 0); - cr->cr_usage = du; + + du->du_cr = NULL; + nua_client_bind(cr, du); return 0; } @@ -3605,15 +3628,34 @@ nua_session_usage_t *ss; char const *reason = NULL; + int error; + nua_server_request_t *sr; + if (du == NULL) return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); ss = nua_dialog_usage_private(du); reason = ss->ss_reason; - return nua_base_client_trequest(cr, msg, sip, - SIPTAG_REASON_STR(reason), - TAG_NEXT(tags)); + error = nua_base_client_trequest(cr, msg, sip, + SIPTAG_REASON_STR(reason), + TAG_NEXT(tags)); + + if (error == 0) { + nua_dialog_usage_reset_refresh(du); + ss->ss_timer->timer_set = 0; + + /* Terminate server transactions associated with session, too. */ + for (sr = du->du_dialog->ds_sr; sr; sr = sr->sr_next) { + if (sr->sr_usage == du && nua_server_request_is_pending(sr) && + sr->sr_method != sip_method_bye) { + sr_status(sr, SIP_486_BUSY_HERE); + nua_server_respond(sr, 0); + } + } + } + + return error; } /** @NUA_EVENT nua_r_bye @@ -3663,18 +3705,28 @@ } else { nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_client_request_t *cri; + + if (ss->ss_reporting) { + return 1; /* Somebody else's problem */ + } + else if (cr->cr_waiting) { + return 1; /* Application problem */ + } + + nua_client_bind(cr, NULL); signal_call_state_change(nh, ss, status, "to BYE", nua_callstate_terminated); - if (ss && !ss->ss_reporting) { - if (du->du_cr == NULL || - !nua_client_is_queued(du->du_cr) || - du->du_cr->cr_status >= 200) { - /* INVITE is completed, we can zap the session... */; - cr->cr_usage = NULL; - nua_session_usage_destroy(nh, ss); - } + for (cri = du->du_dialog->ds_cr; cri; cri = cri->cr_next) { + if (cri->cr_method == sip_method_invite) + break; + } + + if (!cri || cri->cr_status >= 200) { + /* INVITE is completed, we can zap the session... */; + nua_session_usage_destroy(nh, ss); } } 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 Sat May 24 23:00:54 2008 @@ -2010,7 +2010,6 @@ NULL); } - cr->cr_owner = nh; cr->cr_methods = methods; cr->cr_event = event; cr->cr_method = method; @@ -2020,17 +2019,25 @@ cr->cr_auto = 1; if (su_msg_is_non_null(nh->nh_nua->nua_signal)) { - nua_event_data_t const *e = su_msg_data(nh->nh_nua->nua_signal)->ee_data; + nua_event_data_t *e = su_msg_data(nh->nh_nua->nua_signal)->ee_data; if (tags == e->e_tags && event == e->e_event) { cr->cr_auto = 0; + if (tags) { nua_move_signal(cr->cr_signal, nh->nh_nua->nua_signal); - cr->cr_tags = tags; + if (cr->cr_signal) { + /* Steal reference from signal */ + cr->cr_owner = e->e_nh, e->e_nh = NULL; + cr->cr_tags = tags; + } } } } + if (cr->cr_owner == NULL) + cr->cr_owner = nua_handle_ref(nh); + if (tags && cr->cr_tags == NULL) cr->cr_tags = tl_tlist(nh->nh_home, TAG_NEXT(tags)); @@ -2099,6 +2106,7 @@ void nua_client_request_complete(nua_client_request_t *cr) { + nua_client_request_remove(cr); if (cr && cr->cr_methods->crm_complete) cr->cr_methods->crm_complete(cr); } @@ -2116,7 +2124,6 @@ nua_destroy_signal(cr->cr_signal); - nua_client_request_remove(cr); nua_client_bind(cr, NULL); if (cr->cr_msg) @@ -2125,7 +2132,6 @@ if (cr->cr_orq) nta_outgoing_destroy(cr->cr_orq); - cr->cr_orq = NULL; if (cr->cr_timer) @@ -2135,6 +2141,8 @@ su_free(nh->nh_home, cr->cr_target); su_free(nh->nh_home, cr); + + nua_handle_unref(nh); } /** Bind client request to a dialog usage */ @@ -3075,6 +3083,7 @@ nua_handle_t *nh = cr->cr_owner; sip_method_t method = cr->cr_method; nua_dialog_usage_t *du; + nua_client_request_t *cr_next; cr->cr_reporting = 1, nh->nh_ds->ds_reporting = 1; @@ -3132,14 +3141,15 @@ cr->cr_phrase = NULL; cr->cr_reporting = 0, nh->nh_ds->ds_reporting = 0; + cr_next = nh->nh_ds->ds_cr; + if (!nua_client_is_queued(cr) && !nua_client_is_bound(cr)) nua_client_request_destroy(cr); if (method == sip_method_cancel) return 1; - return - nua_client_next_request(nh->nh_ds->ds_cr, method == sip_method_invite); + return nua_client_next_request(cr_next, method == sip_method_invite); } /** Send event, zap transaction but leave cr in list */

1 0

[commit] r8588 - freeswitch/trunk
by Freeswitch SVN 25 May '08

25 May '08

Author: stkn Date: Sat May 24 20:52:37 2008 New Revision: 8588 Modified: freeswitch/trunk/configure.in Log: Fix libpython detection in non-standard locations Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sat May 24 20:52:37 2008 @@ -540,6 +540,15 @@ PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print \" \".join(flags);'`" PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print \" \".join(libs);'`" PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print \"python\" + sysconfig.get_config_var(\"VERSION\");'`" + PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_config_var(\"LIBDIR\");'`" + + # handle python being installed into /usr/local + AC_MSG_CHECKING([python libdir]) + if test -z "`echo $PYTHON_LIBDIR | grep "/usr/lib"`" ; then + PYTHON_LDFLAGS="-L$PYTHON_LIBDIR $PYTHON_LDFLAGS" + LIBS="-L$PYTHON_LIBDIR $LIBS" + fi + AC_MSG_RESULT([$PYTHON_LIBDIR]) # check libpython AC_CHECK_LIB([$PYTHON_LIB], [main], [has_libpython="yes"], [has_libpython="no"])

1 0

[commit] r8587 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 25 May '08

25 May '08

Author: stkn Date: Sat May 24 20:02:04 2008 New Revision: 8587 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: fix the fix :/ Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Sat May 24 20:02:04 2008 @@ -68,7 +68,7 @@ #LOCAL_LIBADD =$(XMLRPCLAS) LOCAL_CFLAGS = -w -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include -LOCAL_CFLAGS+= -I$(XMLRPC_DIR)/libs/xmlrpc-c/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD +LOCAL_CFLAGS+= -I$(XMLRPC_DIR)/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD include $(BASE)/build/modmake.rules

1 0

[commit] r8586 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 24 May '08

24 May '08

Author: stkn Date: Sat May 24 19:43:20 2008 New Revision: 8586 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: Fix building on fbsd7 x86_64 (stuff was building without -fPIC), nametab.h is a generated file, recreate it if missing Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Sat May 24 19:43:20 2008 @@ -65,9 +65,10 @@ #XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.so $(XMLRPC_DIR)/src/libxmlrpc.so #XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.so $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.so #XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.so $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.so +#LOCAL_LIBADD =$(XMLRPCLAS) -LOCAL_LIBADD =$(XMLRPCLAS) -LOCAL_CFLAGS=-w -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include -I../../../../libs/xmlrpc-c/lib/abyss/src -I../../../../libs/xmlrpc-c/lib/util/include -D_THREAD +LOCAL_CFLAGS = -w -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include +LOCAL_CFLAGS+= -I$(XMLRPC_DIR)/libs/xmlrpc-c/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD include $(BASE)/build/modmake.rules @@ -75,4 +76,8 @@ cd $(XMLRPC_DIR) && $(MAKE) $(TOUCH_TARGET) +$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o: $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h +$(XMLRPC_DIR)/lib/expat/xmltok/nametab.h: + cd $(XMLRPC_DIR)/lib/expat/gennmtab && $(MAKE) + cd $(XMLRPC_DIR)/lib/expat/xmltok && ../gennmtab/gennmtab > nametab.h

1 0

[commit] r8585 - freeswitch/trunk/src/include
by Freeswitch SVN 24 May '08

24 May '08

Author: mikej Date: Sat May 24 14:59:49 2008 New Revision: 8585 Modified: freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_log.h Log: swig does not work with varargs functions (FSCORE-128) Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Sat May 24 14:59:49 2008 @@ -58,18 +58,22 @@ */ SWITCH_DECLARE(void) switch_console_loop(void); +#ifndef SWIG /*! \brief A method akin to printf that allows you to redirect output to a specific console "channel" */ SWITCH_DECLARE(void) switch_console_printf(switch_text_channel_t channel, const char *file, const char *func, int line, const char *fmt, ...) PRINTF_FUNCTION(5, 6); +#endif SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen); +#ifndef SWIG /*! \brief A method akin to printf for dealing with api streams */ SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2, 3); +#endif SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Sat May 24 14:59:49 2008 @@ -167,6 +167,7 @@ */ SWITCH_DECLARE(char *) switch_event_get_body(switch_event_t *event); +#ifndef SWIG /*! \brief Add a header to an event \param event the event to add the header to @@ -177,7 +178,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *fmt, ...) PRINTF_FUNCTION(4, 5); - +#endif /*! \brief Add a string header to an event \param event the event to add the header to @@ -262,6 +263,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, char **str, switch_bool_t encode); +#ifndef SWIG /*! \brief Render a XML representation of an event sutable for printing or network transport \param event the event to render @@ -270,6 +272,7 @@ \note the body supplied by this function will supersede an existing body the event may have */ SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2, 3); +#endif /*! \brief Determine if the event system has been initilized @@ -277,6 +280,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_event_running(void); +#ifndef SWIG /*! \brief Add a body to an event \param event the event to add to body to @@ -285,6 +289,7 @@ \note the body parameter can be shadowed by the switch_event_reserve_subclass_detailed function */ SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2, 3); +#endif SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const char *in); SWITCH_DECLARE(switch_status_t) switch_event_create_pres_in_detailed(_In_z_ char *file, _In_z_ char *func, _In_ int line, Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Sat May 24 14:59:49 2008 @@ -82,7 +82,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_log_shutdown(void); - +#ifndef SWIG /*! \brief Write log data to the logging engine \param channel the log channel to write to @@ -98,7 +98,7 @@ _In_z_ const char *func, _In_ int line, _In_opt_z_ const char *userdata, _In_ switch_log_level_t level, _In_z_ _Printf_format_string_ const char *fmt, ...) PRINTF_FUNCTION(7, 8); - +#endif /*! \brief Shut down the logging engine \note to be called at application termination by the core

1 0

[commit] r8584 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 24 May '08

24 May '08

Author: anthm Date: Sat May 24 14:49:02 2008 New Revision: 8584 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Sat May 24 14:49:02 2008 @@ -242,7 +242,6 @@ switch_ivr_intercept_session(session, uuid, bleg); } - switch_safe_free(mydata); return; } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sat May 24 14:49:02 2008 @@ -960,7 +960,7 @@ if (bleg) { if (switch_ivr_find_bridged_uuid(uuid, brto, sizeof(brto)) == SWITCH_STATUS_SUCCESS) { - uuid = brto; + uuid = switch_core_session_strdup(session, brto); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no uuid bridged to %s\n", uuid); return;

1 0

[commit] r8583 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 24 May '08

24 May '08

Author: anthm Date: Sat May 24 13:28:04 2008 New Revision: 8583 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c Log: add -bleg to intercept Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Sat May 24 13:28:04 2008 @@ -738,7 +738,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, const char *macro_name, const char *data, const char *lang, switch_input_args_t *args); SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms); -SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid); +SWITCH_DECLARE(switch_status_t) switch_ivr_find_bridged_uuid(const char *uuid, char *b_uuid, switch_size_t blen); +SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid, switch_bool_t bleg); SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session); SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t *session, switch_core_session_t *peer_session); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Sat May 24 13:28:04 2008 @@ -217,10 +217,36 @@ } } -#define INTERCEPT_SYNTAX "<uuid>" +#define INTERCEPT_SYNTAX "[-bleg] <uuid>" SWITCH_STANDARD_APP(intercept_function) { - switch_ivr_intercept_session(session, data); + int argc; + char *argv[4] = { 0 }; + char *mydata; + char *uuid; + switch_bool_t bleg = SWITCH_FALSE; + + if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { + if (!strcasecmp(argv[0], "-bleg")) { + if (argv[1]) { + uuid = argv[1]; + bleg = SWITCH_TRUE; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", INTERCEPT_SYNTAX); + return; + } + } else { + uuid = argv[0]; + } + + switch_ivr_intercept_session(session, uuid, bleg); + } + switch_safe_free(mydata); + return; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", INTERCEPT_SYNTAX); } #define MAX_SPY 3000 Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat May 24 13:28:04 2008 @@ -1713,6 +1713,7 @@ return status; } + /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sat May 24 13:28:04 2008 @@ -929,11 +929,43 @@ return status; } -SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid) +SWITCH_DECLARE(switch_status_t) switch_ivr_find_bridged_uuid(const char *uuid, char *b_uuid, switch_size_t blen) +{ + switch_core_session_t *rsession; + switch_status_t status = SWITCH_STATUS_FALSE; + + switch_assert(uuid); + + if ((rsession = switch_core_session_locate(uuid))) { + switch_channel_t *rchannel = switch_core_session_get_channel(rsession); + const char *brto; + + if ((brto = switch_channel_get_variable(rchannel, SWITCH_SIGNAL_BOND_VARIABLE))) { + switch_copy_string(b_uuid, brto, blen); + status = SWITCH_STATUS_SUCCESS; + } + switch_core_session_rwunlock(rsession); + } + + return status; + +} + +SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid, switch_bool_t bleg) { switch_core_session_t *rsession, *bsession = NULL; switch_channel_t *channel, *rchannel, *bchannel; const char *buuid; + char brto[SWITCH_UUID_FORMATTED_LENGTH + 1] = ""; + + if (bleg) { + if (switch_ivr_find_bridged_uuid(uuid, brto, sizeof(brto)) == SWITCH_STATUS_SUCCESS) { + uuid = brto; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no uuid bridged to %s\n", uuid); + return; + } + } if (switch_strlen_zero(uuid) || !(rsession = switch_core_session_locate(uuid))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no uuid %s\n", uuid);

1 0

[commit] r8582 - freeswitch/trunk/src
by Freeswitch SVN 24 May '08

24 May '08

Author: mikej Date: Sat May 24 01:23:41 2008 New Revision: 8582 Modified: freeswitch/trunk/src/switch_odbc.c Log: build tweak Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Sat May 24 01:23:41 2008 @@ -149,7 +149,7 @@ } else { SQLCHAR outstr[1024] = {0}; SQLSMALLINT outstrlen = 0; - result = SQLDriverConnect(handle->con, NULL, (SQLCHAR *) handle->dsn, strlen(handle->dsn), outstr, sizeof(outstr), &outstrlen, SQL_DRIVER_NOPROMPT); + result = SQLDriverConnect(handle->con, NULL, (SQLCHAR *) handle->dsn, (SQLSMALLINT)strlen(handle->dsn), outstr, sizeof(outstr), &outstrlen, SQL_DRIVER_NOPROMPT); } if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {

1 0