- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4100 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 11:32:59 2007 New Revision: 4100 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Wed Jan 31 11:32:59 2007 @@ -1032,7 +1032,7 @@ holdstr = switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) ? "*" : ""; nua_invite(tech_pvt->nh, - TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), + TAG_IF(!switch_strlen_zero(rpid), SIPTAG_HEADER_STR(rpid)), TAG_IF(alert_info, SIPTAG_HEADER_STR(alert_info)), //SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),

1 0

[commit] r4099 - freeswitch/branches/sepotvin
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: sphere Date: Wed Jan 31 11:06:11 2007 New Revision: 4099 Added: freeswitch/branches/sepotvin/ Log: Creating empty folder for sepotvin

1 0

[commit] r4098 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua: nta su/sofia-sip tport
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: mikej Date: Wed Jan 31 02:57:12 2007 New Revision: 4098 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Log: resolve possible loss of data warnings Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Wed Jan 31 02:57:12 2007 @@ -369,8 +369,8 @@ agent->sa_flags = MSG_DO_CANONIC; agent->sa_maxsize = 2 * 1024 * 1024; /* 2 MB */ - agent->sa_bad_req_mask = ~(sip_mask_response | sip_mask_proxy); - agent->sa_bad_resp_mask = ~(sip_mask_request | sip_mask_proxy); + agent->sa_bad_req_mask = (unsigned)(~(sip_mask_response | sip_mask_proxy)); + agent->sa_bad_resp_mask = (unsigned)(~(sip_mask_request | sip_mask_proxy)); agent->sa_t1 = NTA_SIP_T1; agent->sa_t2 = NTA_SIP_T2; agent->sa_t4 = NTA_SIP_T4; @@ -4153,7 +4153,7 @@ static inline void incoming_remove(nta_incoming_t *irq); static inline void incoming_set_timer(nta_incoming_t *, unsigned interval); static inline void incoming_reset_timer(nta_incoming_t *); -static inline int incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q); +static inline size_t incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q); static int incoming_set_params(nta_incoming_t *irq, tagi_t const *tags); static inline @@ -5955,7 +5955,7 @@ /** Mass destroy server transactions */ static inline -int incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q) +size_t incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q) { size_t destroyed = q->q_length; @@ -10154,7 +10154,7 @@ /** Close all transports. @since Experimental in @VERSION_1_12_2. */ int nta_agent_close_tports(nta_agent_t *agent) { - int i; + size_t i; outgoing_htable_t *oht = agent->sa_outgoing; incoming_htable_t *iht = agent->sa_incoming; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h Wed Jan 31 02:57:12 2007 @@ -174,7 +174,7 @@ #if SU_HAVE_INLINE su_inline tag_value_t tag_int_v(int v) { return (tag_value_t)v; } su_inline tag_value_t tag_int_vr(int *vp) { return (tag_value_t)vp; } -su_inline tag_value_t tag_uint_v(unsigned v) { return (tag_value_t)v; } +su_inline tag_value_t tag_uint_v(size_t v) { return (tag_value_t)v; } su_inline tag_value_t tag_uint_vr(unsigned *vp) { return (tag_value_t)vp; } su_inline tag_value_t tag_usize_v(usize_t v) { return (tag_value_t)v; } su_inline tag_value_t tag_usize_vr(usize_t *vp) { return (tag_value_t)vp; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Wed Jan 31 02:57:12 2007 @@ -292,7 +292,7 @@ } /** MTU for transport */ -static inline unsigned tport_mtu(tport_t const *self) +static inline usize_t tport_mtu(tport_t const *self) { return self->tp_params->tpp_mtu; }

1 0

[commit] r4097 - freeswitch/trunk/libs/libsndfile/src
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: mikej Date: Wed Jan 31 02:55:18 2007 New Revision: 4097 Modified: freeswitch/trunk/libs/libsndfile/src/file_io.c Log: pointer truncation fix. Modified: freeswitch/trunk/libs/libsndfile/src/file_io.c ============================================================================== --- freeswitch/trunk/libs/libsndfile/src/file_io.c (original) +++ freeswitch/trunk/libs/libsndfile/src/file_io.c Wed Jan 31 02:55:18 2007 @@ -858,10 +858,8 @@ /* USE_WINDOWS_API */ void psf_set_file (SF_PRIVATE *psf, int fd) { HANDLE handle ; - long osfhandle ; - osfhandle = _get_osfhandle (fd) ; - handle = (HANDLE) osfhandle ; + handle = (HANDLE) _get_osfhandle (fd) ; psf->hfile = handle ; } /* psf_set_file */

1 0

[commit] r4096 - in freeswitch/trunk: libs/win32 libs/win32/apr-util w32/Library
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: mikej Date: Wed Jan 31 02:54:02 2007 New Revision: 4096 Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj freeswitch/trunk/libs/win32/util.vbs freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: fix windows build when there is a space in the source directory name. Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/xml.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/xml.vcproj Wed Jan 31 02:54:02 2007 @@ -346,7 +346,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> @@ -356,7 +356,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> @@ -370,7 +370,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> @@ -380,7 +380,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Wed Jan 31 02:54:02 2007 @@ -231,7 +231,7 @@ MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote ) MyFile.WriteLine("@" & VersionCmd) MyFile.Close - Set oExec = WshShell.Exec(tmpFolder & "tmpVersion.Bat") + Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote) Do strFromProc = OExec.StdOut.ReadLine() VERSION=strFromProc Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Jan 31 02:54:02 2007 @@ -106,7 +106,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y
if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs

" + CommandLine="xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" /> </Configuration> <Configuration @@ -195,7 +195,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y
if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs

" + CommandLine="xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" /> </Configuration> </Configurations>

1 0

[commit] r4095 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: mikej Date: Tue Jan 30 14:20:41 2007 New Revision: 4095 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: code before declaration, and function must return value. 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 Jan 30 14:20:41 2007 @@ -1230,7 +1230,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dial argc %u 1 '%s' 2 '%s' 3 '%s' 4 '%s'\n", argc, argv[0], argv[1], argv[2], argv[3]); if (argc >= 4) { - switch_call_cause_t *cause; + switch_call_cause_t cause; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "executing conference outcall\n"); conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2], &cause); } else { @@ -3466,9 +3466,9 @@ if (call) { switch_call_cause_t cause; + switch_event_t *event; conference_outcall(call->conference, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); - switch_event_t *event; if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", call->conference->name); @@ -3523,7 +3523,11 @@ switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n"); + + return SWITCH_STATUS_SUCCESS; } + + return SWITCH_STATUS_MEMERR; } /* Play a file */

1 0

[commit] r4094 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: mikej Date: Tue Jan 30 13:00:58 2007 New Revision: 4094 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: Yet another attempt to get the garbage collector code right. Patch worked out with Bret McDanel Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Jan 30 13:00:58 2007 @@ -2411,6 +2411,8 @@ if (cx) { eval_some_js(script, cx, javascript_global_object, &rval); + JS_EndRequest(cx); + JS_MaybeGC(cx); JS_DestroyContext(cx); } }

1 0

[commit] r4093 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: anthm Date: Tue Jan 30 11:37:03 2007 New Revision: 4093 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: ummm.... yeah... 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 Tue Jan 30 11:37:03 2007 @@ -2310,6 +2310,7 @@ if (match && (map->rm_rate == imp->samples_per_second)) { if (ptime && ptime * 1000 != imp->microseconds_per_frame) { near_match = imp; + match = 0; continue; } mimp = imp; @@ -2329,7 +2330,8 @@ near_match->iananame, near_match->samples_per_second, ptime); - + + prefs[0] = tmp; num = switch_loadable_module_get_codecs_sorted(search, 1, prefs, 1); if (num) {

1 0

[commit] r4092 - freeswitch/trunk/libs/libdingaling
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: anthm Date: Tue Jan 30 10:12:31 2007 New Revision: 4092 Modified: freeswitch/trunk/libs/libdingaling/.update Log: trigger dingaling rebuild Modified: freeswitch/trunk/libs/libdingaling/.update ============================================================================== --- freeswitch/trunk/libs/libdingaling/.update (original) +++ freeswitch/trunk/libs/libdingaling/.update Tue Jan 30 10:12:31 2007 @@ -1 +1 @@ -Fri Jan 19 15:23:51 EST 2007 +Tue Jan 30 10:12:18 EST 2007

1 0

[commit] r4091 - in freeswitch/trunk/src: . include
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: anthm Date: Mon Jan 29 22:17:10 2007 New Revision: 4091 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: add success cause for originate Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Jan 29 22:17:10 2007 @@ -783,6 +783,7 @@ typedef enum { SWITCH_CAUSE_UNALLOCATED = 0, + SWITCH_CAUSE_SUCCESS = 1, SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET = 2, SWITCH_CAUSE_NO_ROUTE_DESTINATION = 3, SWITCH_CAUSE_CHANNEL_UNACCEPTABLE = 6, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Jan 29 22:17:10 2007 @@ -40,6 +40,7 @@ static struct switch_cause_table CAUSE_CHART[] = { { "UNALLOCATED", SWITCH_CAUSE_UNALLOCATED }, + { "SUCCESS", SWITCH_CAUSE_SUCCESS }, { "NO_ROUTE_TRANSIT_NET", SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET }, { "NO_ROUTE_DESTINATION", SWITCH_CAUSE_NO_ROUTE_DESTINATION }, { "CHANNEL_UNACCEPTABLE", SWITCH_CAUSE_CHANNEL_UNACCEPTABLE }, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Jan 29 22:17:10 2007 @@ -2893,6 +2893,7 @@ switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); + *cause = SWITCH_CAUSE_SUCCESS; } else { if (peer_channel) { *cause = switch_channel_get_cause(peer_channel);

1 0