- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10416 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 15 Nov '08

15 Nov '08

Author: anthm Date: Fri Nov 14 21:46:25 2008 New Revision: 10416 Log: default call id to match session uuid on outbound calls Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Nov 14 21:46:25 2008 @@ -1188,9 +1188,13 @@ use_from_str = from_str; from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", tech_pvt->caller_profile->caller_id_name, use_from_str); - + if (!(call_id = switch_channel_get_variable(channel, "sip_outgoing_call_id"))) { + call_id = switch_core_session_get_uuid(session); + } + tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, NUTAG_URL(url_str), + TAG_IF(call_id, SIPTAG_CALL_ID_STR(call_id)), SIPTAG_TO_STR(to_str), SIPTAG_FROM_STR(from_str), SIPTAG_CONTACT_STR(invite_contact), @@ -1301,8 +1305,6 @@ sofia_glue_tech_patch_sdp(tech_pvt); } - call_id = switch_channel_get_variable(channel, "sip_outgoing_call_id"); - if (tech_pvt->dest && (route = strstr(tech_pvt->dest, ";fs_path="))) { char *p; @@ -1341,7 +1343,6 @@ TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), - TAG_IF(call_id, SIPTAG_CALL_ID_STR(call_id)), TAG_IF(route_uri, NUTAG_PROXY(route_uri)), TAG_IF(route, SIPTAG_ROUTE_STR(route)), SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip),

1 0

[commit] r10415 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 15 Nov '08

15 Nov '08

Author: anthm Date: Fri Nov 14 21:38:40 2008 New Revision: 10415 Log: use the same call-id on all registers from the same gateway Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Nov 14 21:38:40 2008 @@ -299,6 +299,7 @@ switch_memory_pool_t *pool; int deleted; switch_event_t *vars; + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; struct sofia_gateway *next; }; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Nov 14 21:38:40 2008 @@ -799,9 +799,13 @@ *expire_seconds = "3600", *retry_seconds = "30", *from_user = "", *from_domain = "", *register_proxy = NULL, *contact_params = NULL, *params = NULL, *register_transport = NULL; - + uint32_t ping_freq = 0; - + switch_uuid_t uuid; + + switch_uuid_get(&uuid); + switch_uuid_format(gateway->uuid_str, &uuid); + gateway->register_transport = SOFIA_TRANSPORT_UDP; gateway->pool = profile->pool; gateway->profile = profile; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Nov 14 21:38:40 2008 @@ -152,6 +152,7 @@ sofia_reg_kill_reg(gateway_ptr, 0); if ((gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, + SIPTAG_CALL_ID_STR(gateway_ptr->uuid_str), NUTAG_URL(gateway_ptr->register_proxy), SIPTAG_TO_STR(gateway_ptr->register_to), NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()))) {

1 0

[commit] r10414 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Nov '08

15 Nov '08

Author: anthm Date: Fri Nov 14 21:28:20 2008 New Revision: 10414 Log: add exec directove Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Fri Nov 14 21:28:20 2008 @@ -1097,6 +1097,53 @@ return ebuf; } +static int preprocess_exec(const char *cwd, const char *command, int write_fd, int rlevel) +{ +#ifdef WIN32 + char *message[] = ""; + + if (write(write_fd, message, sizeof(message)) < 0) { + goto end; + } + +#else + int fds[2], pid = 0; + + if (pipe(fds)) { + goto end; + } else { /* good to go*/ + pid = fork(); + + if (pid < 0) { /* ok maybe not */ + close(fds[0]); + close(fds[1]); + goto end; + } else if (pid) { /* parent */ + char buf[1024] = ""; + int bytes; + close(fds[1]); + while ((bytes = read(fds[0], buf, sizeof(buf))) > 0) { + if (write(write_fd, buf, bytes) <= 0) { + break; + } + } + close(fds[0]); + } else { /* child */ + close(fds[0]); + dup2(fds[1], STDOUT_FILENO); + system(command); + close(fds[1]); + exit(0); + } + } +#endif + end: + + return write_fd; + +} + + static int preprocess_glob(const char *cwd, const char *pattern, int write_fd, int rlevel) { char *full_path = NULL; @@ -1244,6 +1291,8 @@ } else if (!strcasecmp(tcmd, "include")) { preprocess_glob(cwd, targ, write_fd, rlevel + 1); + } else if (!strcasecmp(tcmd, "exec")) { + preprocess_exec(cwd, targ, write_fd, rlevel + 1); } continue; @@ -1300,6 +1349,8 @@ } else if (!strcasecmp(cmd, "include")) { preprocess_glob(cwd, arg, write_fd, rlevel + 1); + } else if (!strcasecmp(cmd, "exec")) { + preprocess_exec(cwd, arg, write_fd, rlevel + 1); } }

1 0

[commit] r10413 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 15 Nov '08

15 Nov '08

Author: anthm Date: Fri Nov 14 20:30:15 2008 New Revision: 10413 Log: fix bug in apiExecute Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c 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 Fri Nov 14 20:30:15 2008 @@ -3317,7 +3317,6 @@ char *arg = NULL; switch_core_session_t *session = NULL; switch_stream_handle_t stream = { 0 }; - char retbuf[2048] = ""; if (!strcasecmp(cmd, "jsapi")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid API Call!\n"); @@ -3339,13 +3338,12 @@ } } - stream.data = retbuf; - stream.end = stream.data; - stream.data_size = sizeof(retbuf); - stream.write_function = switch_console_stream_write; + SWITCH_STANDARD_STREAM(stream); switch_api_execute(cmd, arg, session, &stream); - *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, retbuf)); + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_str_nil((char *)stream.data))); + switch_safe_free(stream.data); + } else { *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, "")); }

1 0

[commit] r10412 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Nov '08

15 Nov '08

Author: mikej Date: Fri Nov 14 19:32:58 2008 New Revision: 10412 Log: clean up error message handling in module loader process. Modified: freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Nov 14 19:32:58 2008 @@ -870,7 +870,7 @@ char *path; char *file, *dot; switch_loadable_module_t *new_module = NULL; - switch_status_t status; + switch_status_t status = SWITCH_STATUS_SUCCESS; #ifdef WIN32 const char *ext = ".dll"; @@ -878,8 +878,10 @@ const char *ext = ".so"; #endif + *err = ""; if ((file = switch_core_strdup(loadable_modules.pool, fname)) == 0) { + *err = "allocation error"; return SWITCH_STATUS_FALSE; } @@ -910,7 +912,11 @@ if (new_module->switch_module_runtime) { switch_core_launch_thread(switch_loadable_module_exec, new_module, new_module->pool); } + } else if (status != SWITCH_STATUS_SUCCESS) { + *err = "module load routine returned an error"; } + } else { + *err = "module load file routine returned an error"; } switch_mutex_unlock(loadable_modules.mutex);

1 0

[commit] r10411 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Fri Nov 14 18:31:41 2008 New Revision: 10411 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Fri Nov 14 18:31:41 2008 @@ -7401,14 +7401,25 @@ } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_cond_yield(unsigned long jarg1) { - uint32_t arg1 ; +SWIGEXPORT void SWIGSTDCALL CSharp_switch_cond_yield(void * jarg1) { + switch_interval_time_t arg1 ; + switch_interval_time_t *argp1 ; - arg1 = (uint32_t)jarg1; + argp1 = (switch_interval_time_t *)jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_interval_time_t", 0); + return ; + } + arg1 = *argp1; switch_cond_yield(arg1); } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_cond_next() { + switch_cond_next(); +} + + SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CMD_CHUNK_LEN_get() { int jresult ; int result; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Fri Nov 14 18:31:41 2008 @@ -1913,8 +1913,13 @@ return ret; } - public static void switch_cond_yield(uint ms) { - freeswitchPINVOKE.switch_cond_yield(ms); + public static void switch_cond_yield(SWIGTYPE_p_switch_interval_time_t t) { + freeswitchPINVOKE.switch_cond_yield(SWIGTYPE_p_switch_interval_time_t.getCPtr(t)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + } + + public static void switch_cond_next() { + freeswitchPINVOKE.switch_cond_next(); } public static void switch_console_loop() { @@ -5918,7 +5923,10 @@ public static extern int switch_system(string jarg1, int jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_cond_yield")] - public static extern void switch_cond_yield(uint jarg1); + public static extern void switch_cond_yield(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_cond_next")] + public static extern void switch_cond_next(); [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_CMD_CHUNK_LEN_get")] public static extern int SWITCH_CMD_CHUNK_LEN_get(); @@ -13990,6 +13998,36 @@ using System; using System.Runtime.InteropServices; +public class SWIGTYPE_p_switch_interval_time_t { + private HandleRef swigCPtr; + + internal SWIGTYPE_p_switch_interval_time_t(IntPtr cPtr, bool futureUse) { + swigCPtr = new HandleRef(this, cPtr); + } + + protected SWIGTYPE_p_switch_interval_time_t() { + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + + internal static HandleRef getCPtr(SWIGTYPE_p_switch_interval_time_t obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + +using System; +using System.Runtime.InteropServices; + public class SWIGTYPE_p_switch_ivr_action_t { private HandleRef swigCPtr;

1 0

[commit] r10410 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_fsv mod/applications/mod_skel mod/asr_tts/mod_cepstral mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_loopback mod/endpoints/mod_portaudio mod/endpoints/mod_reference mod/endpoints/mod_sofia mod/endpoints/mod_unicall mod/endpoints/mod_woomera mod/event_handlers/mod_event_multicast mod/event_handlers/mod_event_socket mod/event_handlers/mod_zeroconf mod/formats/mod_
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Fri Nov 14 18:31:21 2008 New Revision: 10410 Log: more stuff Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_core_sqldb.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_log.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_stun.c freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Nov 14 18:31:21 2008 @@ -1682,8 +1682,8 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string); SWITCH_DECLARE(switch_status_t) switch_console_set_alias(const char *string); SWITCH_DECLARE(int) switch_system(const char *cmd, switch_bool_t wait); -SWITCH_DECLARE(void) switch_cond_yield(uint32_t ms); - +SWITCH_DECLARE(void) switch_cond_yield(switch_interval_time_t t); +SWITCH_DECLARE(void) switch_cond_next(); ///\} /*! 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 Fri Nov 14 18:31:21 2008 @@ -1195,7 +1195,7 @@ if (conference->video_running == 1) { conference->video_running = -1; while (conference->video_running) { - switch_yield(1000); + switch_cond_next(); } } @@ -2010,7 +2010,7 @@ if (use_timer) { switch_core_timer_next(&timer); } else { - switch_yield(1000); + switch_cond_next(); } } /* Rinse ... Repeat */ @@ -2032,7 +2032,7 @@ /* Wait for the input thread to end */ while (switch_test_flag(member, MFLAG_ITHREAD)) { - switch_yield(1000); + switch_cond_next(); } } Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Fri Nov 14 18:31:21 2008 @@ -203,7 +203,7 @@ if (eh.up) { while (eh.up) { - switch_yield(1000); + switch_cond_next(); } } @@ -320,7 +320,7 @@ switch_core_session_write_video_frame(session, &vid_frame, SWITCH_IO_FLAG_NONE, 0); } if (ts && last && last != ts) { - switch_yield(1000); + switch_cond_next(); } last = ts; } else { Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Fri Nov 14 18:31:21 2008 @@ -64,7 +64,7 @@ { while(looping) { - switch_yield(1000); + switch_cond_next(); } return SWITCH_STATUS_TERM; } Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Fri Nov 14 18:31:21 2008 @@ -302,7 +302,7 @@ status = SWITCH_STATUS_SUCCESS; break; } - switch_yield(1000); + switch_cond_next(); continue; } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Nov 14 18:31:21 2008 @@ -1112,7 +1112,7 @@ if (switch_test_flag(tech_pvt, TFLAG_BYE) || !switch_test_flag(tech_pvt, TFLAG_IO)) { goto done; } - switch_yield(1000); + switch_cond_next(); } if (switch_channel_get_state(channel) >= CS_HANGUP || switch_test_flag(tech_pvt, TFLAG_BYE)) { Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Fri Nov 14 18:31:21 2008 @@ -583,7 +583,7 @@ while (switch_test_flag(tech_pvt, TFLAG_IO)) { if (!switch_test_flag(tech_pvt, TFLAG_CODEC)) { - switch_yield(1000); + switch_cond_next(); continue; } if (switch_test_flag(tech_pvt, TFLAG_BREAK)) { @@ -615,7 +615,7 @@ return SWITCH_STATUS_SUCCESS; } - switch_yield(1000); + switch_cond_next(); if (++ms_count >= 30000) { break; } Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Fri Nov 14 18:31:21 2008 @@ -491,7 +491,7 @@ break; } - switch_yield(1000); + switch_cond_next(); } if (switch_test_flag(tech_pvt, TFLAG_LINKED)) { Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Fri Nov 14 18:31:21 2008 @@ -131,7 +131,7 @@ PaUtil_FlushRingBuffer(&aStream->outFIFO); return 0; } - switch_yield(1000); + switch_cond_next(); } } return numFrames; @@ -169,7 +169,7 @@ if (bytesRead) { p += bytesRead; } else { - switch_yield(1000); + switch_cond_next(); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Fri Nov 14 18:31:21 2008 @@ -309,7 +309,7 @@ return SWITCH_STATUS_SUCCESS; } - switch_yield(1000); + switch_cond_next(); } 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 Fri Nov 14 18:31:21 2008 @@ -453,7 +453,7 @@ // Maybe we should timeout? while(switch_channel_ready(channel) && !switch_test_flag(tech_pvt, TFLAG_3PCC_HAS_ACK)) { - switch_yield(1000); + switch_cond_next(); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Done waiting for ACK\n"); } @@ -2549,7 +2549,7 @@ switch_event_unbind_callback(general_event_handler); while (mod_sofia_globals.threads) { - switch_yield(1000); + switch_cond_next(); if (++sanity >= 10000) { break; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Nov 14 18:31:21 2008 @@ -3159,7 +3159,7 @@ break; } else if (result == SWITCH_CORE_DB_BUSY) { running++; - switch_yield(1000); + switch_cond_next(); continue; } break; Modified: freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c Fri Nov 14 18:31:21 2008 @@ -1052,7 +1052,7 @@ return SWITCH_STATUS_SUCCESS; } - switch_yield(1000); + switch_cond_next(); } return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Fri Nov 14 18:31:21 2008 @@ -338,7 +338,7 @@ if (switch_test_flag(tech_pvt, TFLAG_MEDIA)) { break; } - switch_yield(1000); + switch_cond_next(); } if (!tech_pvt->udp_socket) { 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 Fri Nov 14 18:31:21 2008 @@ -253,7 +253,7 @@ globals.running = -1; while (x < 100000 && globals.running) { x++; - switch_yield(1000); + switch_cond_next(); } } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Nov 14 18:31:21 2008 @@ -1049,7 +1049,7 @@ } } if (do_sleep) { - switch_yield(1000); + switch_cond_next(); } } Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c Fri Nov 14 18:31:21 2008 @@ -303,7 +303,7 @@ sw_uint32 ms; ms = 100; sw_discovery_step(globals.discovery, &ms); - switch_yield(1000); + switch_cond_next(); } RUNNING = 0; return SWITCH_STATUS_TERM; Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Fri Nov 14 18:31:21 2008 @@ -1195,7 +1195,7 @@ switch_buffer_unlock(buffer); } else { if (!bytes) { - switch_yield(1000); + switch_cond_next(); continue; } memset(buf, 0, bytes); 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 Fri Nov 14 18:31:21 2008 @@ -2135,7 +2135,7 @@ break; } - switch_yield(1000); + switch_cond_next(); } JS_ResumeRequest(cx, saveDepth); check_hangup_hook(jss, &ret); @@ -2179,7 +2179,7 @@ break; } - switch_yield(1000); + switch_cond_next(); } JS_ResumeRequest(cx, saveDepth); check_hangup_hook(jss, &ret); Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Fri Nov 14 18:31:21 2008 @@ -683,7 +683,7 @@ status = SWITCH_STATUS_FALSE; break; } - switch_yield(1000); + switch_cond_next(); } else { to_count = 0; } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Nov 14 18:31:21 2008 @@ -683,7 +683,7 @@ if (mystate != ostate || state >= CS_HANGUP || state == want_state) { break; } - switch_yield(1000); + switch_cond_next(); } } @@ -709,7 +709,7 @@ } } - switch_yield(1000); + switch_cond_next(); if (super_channel && !switch_channel_ready(super_channel)) { return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Fri Nov 14 18:31:21 2008 @@ -449,7 +449,7 @@ free(cmd); } } - switch_yield(1000); + switch_cond_next(); } switch_core_destroy_memory_pool(&pool); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Nov 14 18:31:21 2008 @@ -360,6 +360,7 @@ } ts->objs[0] = obj; switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_threadattr_priority_increase(thd_attr); switch_thread_create(&thread, thd_attr, func, ts, pool); } } Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Fri Nov 14 18:31:21 2008 @@ -444,7 +444,7 @@ #ifndef INSTANTLY_DESTROY_POOLS memory_manager.pool_thread_running = -1; while (memory_manager.pool_thread_running) { - switch_yield(1000); + switch_cond_next(); } #endif } @@ -503,7 +503,7 @@ switch_thread_create(&thread, thd_attr, pool_thread, NULL, memory_manager.memory_pool); while (!memory_manager.pool_thread_running) { - switch_yield(1000); + switch_cond_next(); } #endif Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Fri Nov 14 18:31:21 2008 @@ -220,7 +220,7 @@ } if (nothing_in_queue) { - switch_yield(1000); + switch_cond_next(); } } Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Fri Nov 14 18:31:21 2008 @@ -462,7 +462,7 @@ if (endstate == switch_channel_get_running_state(session->channel)) { if (endstate == CS_NEW) { - switch_yield(1000); + switch_cond_next(); } else { switch_thread_cond_wait(session->cond, session->mutex); } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Nov 14 18:31:21 2008 @@ -446,7 +446,7 @@ } while (x < 10000 && THREAD_COUNT) { - switch_yield(1000); + switch_cond_next(); if (THREAD_COUNT == last) { x++; } @@ -537,7 +537,7 @@ switch_thread_create(&thread, thd_attr, switch_event_thread, EVENT_QUEUE[2], RUNTIME_POOL); while (!THREAD_COUNT) { - switch_yield(1000); + switch_cond_next(); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Nov 14 18:31:21 2008 @@ -112,13 +112,13 @@ } if (switch_channel_test_flag(channel, CF_PROXY_MODE)) { - switch_yield(1000); + switch_cond_next(); continue; } if (switch_channel_test_flag(channel, CF_SERVICE) || (!switch_channel_test_flag(channel, CF_ANSWERED) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA))) { - switch_yield(1000); + switch_cond_next(); } else { status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { @@ -709,7 +709,7 @@ } if (switch_channel_test_flag(channel, CF_SERVICE)) { - switch_yield(1000); + switch_cond_next(); } else { status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); } @@ -824,7 +824,7 @@ } if (switch_channel_test_flag(channel, CF_SERVICE)) { - switch_yield(1000); + switch_cond_next(); } else { status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Nov 14 18:31:21 2008 @@ -157,7 +157,7 @@ #ifdef SWITCH_VIDEO_IN_THREADS if (eh.up) { while (eh.up) { - switch_yield(1000); + switch_cond_next(); } } #endif Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Nov 14 18:31:21 2008 @@ -913,7 +913,7 @@ } while (switch_channel_get_state(peer_channel) == CS_EXCHANGE_MEDIA) { - switch_yield(1000); + switch_cond_next(); } switch_core_session_rwunlock(peer_session); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Nov 14 18:31:21 2008 @@ -497,7 +497,7 @@ } } } else { - switch_yield(1000); + switch_cond_next(); } } @@ -1199,7 +1199,7 @@ goto notready; } - switch_yield(10000); + switch_yield(100000); } check_per_channel_timeouts(peer_channels, per_channel_timelimit_sec, per_channel_progress_timelimit_sec, and_argc, start); @@ -1432,7 +1432,7 @@ } } else { - switch_yield(10000); + switch_yield(100000); } } Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Fri Nov 14 18:31:21 2008 @@ -402,7 +402,7 @@ switch_thread_create(&thread, thd_attr, log_thread, NULL, LOG_POOL); while (!THREAD_RUNNING) { - switch_yield(1000); + switch_cond_next(); } if (colorize) { @@ -438,7 +438,7 @@ THREAD_RUNNING = -1; switch_queue_push(LOG_QUEUE, NULL); while (THREAD_RUNNING) { - switch_yield(1000); + switch_cond_next(); } switch_core_memory_reclaim_logger(); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Nov 14 18:31:21 2008 @@ -558,7 +558,7 @@ if (++x > 1000) { break; } - switch_yield(1000); + switch_cond_next(); } switch_socket_opt_set(new_sock, SWITCH_SO_NONBLOCK, FALSE); @@ -1537,7 +1537,7 @@ rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); } else if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late! */ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) { - switch_yield(1000); + switch_cond_next(); continue; } Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Fri Nov 14 18:31:21 2008 @@ -518,7 +518,7 @@ switch_socket_close(sock); return SWITCH_STATUS_TIMEOUT; } - switch_yield(1000); + switch_cond_next(); } switch_socket_close(sock); Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Fri Nov 14 18:31:21 2008 @@ -172,14 +172,14 @@ SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t) { - if (t < 1000) { + if (t < 1000 || t >= 10000) { do_sleep(t); return; } #ifndef DISABLE_1MS_COND if (globals.use_cond_yield == 1) { - switch_cond_yield((uint32_t)(t / 1000)); + switch_cond_yield(t); return; } #endif @@ -188,20 +188,39 @@ } -SWITCH_DECLARE(void) switch_cond_yield(uint32_t ms) +SWITCH_DECLARE(void) switch_cond_next(void) { - if (!ms) return; - - if (globals.use_cond_yield != 1) { - do_sleep(ms * 1000); +#ifdef DISABLE_1MS_COND + do_sleep(1000); +#else + if (!runtime.timestamp || globals.use_cond_yield != 1) { + do_sleep(1000); return; } - switch_mutex_lock(TIMER_MATRIX[1].mutex); - while(globals.RUNNING == 1 && globals.use_cond_yield == 1 && ms--) { - switch_thread_cond_wait(TIMER_MATRIX[1].cond, TIMER_MATRIX[1].mutex); - } + switch_thread_cond_wait(TIMER_MATRIX[1].cond, TIMER_MATRIX[1].mutex); switch_mutex_unlock(TIMER_MATRIX[1].mutex); +#endif +} + +SWITCH_DECLARE(void) switch_cond_yield(switch_interval_time_t t) +{ + switch_time_t want; + if (!t) return; + + if (!runtime.timestamp || globals.use_cond_yield != 1) { + do_sleep(t); + return; + } + want = runtime.timestamp + t; + while(globals.RUNNING == 1 && globals.use_cond_yield == 1 && runtime.timestamp < want) { + switch_mutex_lock(TIMER_MATRIX[1].mutex); + if (runtime.timestamp < want) { + switch_thread_cond_wait(TIMER_MATRIX[1].cond, TIMER_MATRIX[1].mutex); + } + switch_mutex_unlock(TIMER_MATRIX[1].mutex); + } + } @@ -292,22 +311,28 @@ static switch_status_t timer_next(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; - timer_step(timer); -#if 1 - switch_mutex_lock(TIMER_MATRIX[timer->interval].mutex); - while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) { - check_roll(); - switch_thread_cond_wait(TIMER_MATRIX[timer->interval].cond, TIMER_MATRIX[timer->interval].mutex); - } - switch_mutex_unlock(TIMER_MATRIX[timer->interval].mutex); +#ifdef DISABLE_1MS_COND + int cond_index = timer->interval; #else + int cond_index = 1; +#endif + + timer_step(timer); + while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) { check_roll(); - do_sleep(1000); + if (globals.use_cond_yield == 1) { + switch_mutex_lock(TIMER_MATRIX[cond_index].mutex); + if (TIMER_MATRIX[timer->interval].tick < private_info->reference) { + switch_thread_cond_wait(TIMER_MATRIX[cond_index].cond, TIMER_MATRIX[cond_index].mutex); + } + switch_mutex_unlock(TIMER_MATRIX[cond_index].mutex); + } else { + do_sleep(1000); + } } -#endif - + if (globals.RUNNING == 1) { return SWITCH_STATUS_SUCCESS; } @@ -486,7 +511,7 @@ if ((current_ms % x) == 0) { if (TIMER_MATRIX[x].count) { TIMER_MATRIX[x].tick++; -#if 1 +#ifdef DISABLE_1MS_COND if (TIMER_MATRIX[x].mutex && switch_mutex_trylock(TIMER_MATRIX[x].mutex) == SWITCH_STATUS_SUCCESS) { switch_thread_cond_broadcast(TIMER_MATRIX[x].cond); switch_mutex_unlock(TIMER_MATRIX[x].mutex); @@ -726,11 +751,13 @@ timer_interface->timer_destroy = timer_destroy; /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_NOUNLOAD; } SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown) { + globals.use_cond_yield = 0; + if (globals.RUNNING == 1) { switch_mutex_lock(globals.mutex); globals.RUNNING = -1;

1 0

[commit] r10409 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: andrew Date: Fri Nov 14 17:35:40 2008 New Revision: 10409 Log: added some cleanup code Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Nov 14 17:35:40 2008 @@ -230,7 +230,7 @@ } -static void remove_binding(listener_t *listener) { +static void remove_binding(listener_t *listener, erlang_pid *pid) { struct erlang_binding *ptr, *lst = NULL; switch_mutex_lock(globals.listener_mutex); @@ -238,11 +238,13 @@ switch_xml_set_binding_sections(bindings.search_binding, (1 << sizeof(switch_xml_section_enum_t))); for (ptr = bindings.head; ptr; lst = ptr, ptr = ptr->next) { - if (ptr->listener == listener) { + if ((listener && ptr->listener == listener) || + (pid && (&ptr->pid) && (!strcmp(pid->node, ptr->pid.node)) && pid->creation == ptr->pid.creation && pid->num == ptr->pid.num && pid->serial == ptr->pid.serial)) { if (bindings.head == ptr) { if (ptr->next) { bindings.head = ptr->next; } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removed all (only?) listeners\n"); bindings.head = NULL; break; } @@ -253,6 +255,7 @@ lst->next = NULL; } } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removed listener\n"); } else { switch_xml_set_binding_sections(bindings.search_binding, switch_xml_get_binding_sections(bindings.search_binding) | ptr->section); } @@ -611,6 +614,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got data %s after %d milliseconds!\n", data, i*10); + switch_core_hash_delete(ptr->listener->fetch_reply_hash, uuid_str); + + free(rep->buff); + free(rep); + return xml; } @@ -1214,6 +1222,7 @@ break; case ERL_EXIT : switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_exit from %s <%d.%d.%d>\n", msg.from.node, msg.from.creation, msg.from.num, msg.from.serial); + remove_binding(NULL, &msg.from); /* TODO - check if this linked pid is any of the log/event handler processes and cleanup if it is. */ break; default : @@ -1293,7 +1302,7 @@ switch_core_hash_destroy(&listener->event_hash); /* remove any bindings for this connection */ - remove_binding(listener); + remove_binding(listener, NULL); if (listener->session) { switch_channel_clear_flag(switch_core_session_get_channel(listener->session), CF_CONTROLLED);

1 0

[commit] r10408 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: andrew Date: Fri Nov 14 17:05:03 2008 New Revision: 10408 Log: actually send and receive bind_search events, don't do anything with the reply yet tho Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Nov 14 17:05:03 2008 @@ -68,6 +68,7 @@ switch_log_level_t level; uint8_t event_list[SWITCH_EVENT_ALL + 1]; switch_hash_t *event_hash; + switch_hash_t *fetch_reply_hash; switch_thread_rwlock_t *rwlock; switch_core_session_t *session; int lost_events; @@ -261,18 +262,16 @@ } -static void ei_encode_switch_event(ei_x_buff *ebuf, switch_event_t *event) +static void ei_encode_switch_event_headers(ei_x_buff *ebuf, switch_event_t *event) { int i; switch_event_header_t *hp; - for (i = 0, hp = event->headers; hp; hp = hp->next, i++) { - } + + for (i = 0, hp = event->headers; hp; hp = hp->next, i++); if (event->body) i++; - ei_x_encode_tuple_header(ebuf, 2); - ei_x_encode_atom(ebuf, "event"); ei_x_encode_list_header(ebuf, i); for (hp = event->headers; hp; hp = hp->next) { @@ -291,6 +290,18 @@ } +static void ei_encode_switch_event_tag(ei_x_buff *ebuf, switch_event_t *event, char *tag) +{ + + ei_x_encode_tuple_header(ebuf, 2); + ei_x_encode_atom(ebuf, tag); + ei_encode_switch_event_headers(ebuf, event); +} + + +#define ei_encode_switch_event(_b, _e) ei_encode_switch_event_tag(_b, _e, "event") + + static void event_handler(switch_event_t *event) { switch_event_t *clone = NULL; @@ -534,11 +545,15 @@ } -static switch_xml_t erlang_fetch (const char *sectionstr, const char *tag_name, const char *key_name, const char *key_value, +static switch_xml_t erlang_fetch(const char *sectionstr, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data) { switch_xml_t xml = NULL; struct erlang_binding *ptr; + switch_uuid_t uuid; + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1]; + ei_x_buff buf; + ei_x_new_with_version(&buf); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "looking for bindings\n"); @@ -558,11 +573,44 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "binding for %s in section %s with key %s and value %s requested from node %s\n", tag_name, sectionstr, key_name, key_value, ptr->pid.node); + switch_uuid_get(&uuid); + switch_uuid_format(uuid_str, &uuid); + + /*switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Request-ID", uuid_str);*/ + + ei_x_encode_tuple_header(&buf, 7); + ei_x_encode_atom(&buf, "fetch"); + ei_x_encode_atom(&buf, sectionstr); + ei_x_encode_string(&buf, tag_name ? tag_name : "undefined"); + ei_x_encode_string(&buf, key_name ? key_name : "undefined"); + ei_x_encode_string(&buf, key_value ? key_value : "undefined"); + ei_x_encode_string(&buf, uuid_str); + ei_encode_switch_event_headers(&buf, params); + + /*switch_core_hash_insert(ptr->reply_hash, uuid_str, );*/ switch_mutex_lock(ptr->listener->sock_mutex); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "It's a lock!\n"); + ei_send(ptr->listener->sockfd, &ptr->pid, buf.buff, buf.index); switch_mutex_unlock(ptr->listener->sock_mutex); + int i = 0; + ei_x_buff *rep; + /*int index = 3;*/ + while (!(rep = (ei_x_buff *) switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str))) { + if (i > 50) { /* half a second timeout */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timed out!\n"); + return NULL; + } + i++; + switch_yield(10000); /* 10ms */ + } + + char data[MAXATOMLEN]; + + ei_decode_atom(rep->buff, &rep->index, data); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got data %s after %d milliseconds!\n", data, i*10); + return xml; } @@ -588,7 +636,29 @@ break; } - if (!strncmp(tupletag, "set_log_level", MAXATOMLEN)) { + if (!strncmp(tupletag, "fetch_reply", MAXATOMLEN)) { + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + + if (ei_decode_string(buf->buff, &buf->index, uuid_str)) { + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "badarg"); + break; + } + + ei_x_buff *nbuf = switch_core_alloc(listener->pool, sizeof(nbuf)); + /*char *wtf = "hello world";*/ + nbuf->buff = switch_core_alloc(listener->pool, buf->buffsz); + memcpy(nbuf->buff, buf->buff, buf->buffsz); + /*memcpy(nbuf, wtf, 20);*/ + nbuf->index = buf->index; + nbuf->buffsz = buf->buffsz; + + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "stored %d %d %s\n", buf->index, buf->buffsz, nbuf);*/ + + switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf); + + } else if (!strncmp(tupletag, "set_log_level", MAXATOMLEN)) { if (arity == 2) { switch_log_level_t ltype = SWITCH_LOG_DEBUG; char loglevelstr[MAXATOMLEN]; @@ -930,6 +1000,8 @@ binding->pid = msg->from; binding->listener = listener; + switch_core_hash_init(&listener->fetch_reply_hash, listener->pool); + switch_mutex_lock(globals.listener_mutex); for (ptr = bindings.head; ptr && ptr->next; ptr = ptr->next);

1 0

[commit] r10407 - freeswitch/trunk/src/mod/applications/mod_enum
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Fri Nov 14 15:43:32 2008 New Revision: 10407 Log: update Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Fri Nov 14 15:43:32 2008 @@ -461,6 +461,8 @@ struct dns_ctx *nctx = NULL; char *num, *mnum = NULL, *mroot = NULL, *p; + *results = NULL; + mnum = switch_mprintf("%s%s", *in == '+' ? "" : "+", in); if ((p = strchr(mnum, '*'))) { @@ -563,7 +565,7 @@ SWITCH_STANDARD_DIALPLAN(enum_dialplan_hunt) { switch_caller_extension_t *extension = NULL; - enum_record_t *results, *rp; + enum_record_t *results = NULL, *rp; switch_channel_t *channel = switch_core_session_get_channel(session); char *dp = (char *) arg;

1 0