October 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r10136 - in freeswitch/trunk/src: . include mod/applications/mod_rss mod/languages/mod_managed mod/languages/mod_managed/managed mod/languages/mod_spidermonkey_teletone
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: anthm Date: Thu Oct 23 19:48:11 2008 New Revision: 10136 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr_play_say.c Log: simplify switch_core_service_session to protect against a race condition Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Oct 23 19:48:11 2008 @@ -740,18 +740,15 @@ /*! \brief Signal a thread using a thread session to terminate - \param thread_session the thread_session to indicate to + \param session the session to indicate to */ -SWITCH_DECLARE(void) switch_core_thread_session_end(_In_ switch_core_thread_session_t *thread_session); +SWITCH_DECLARE(void) switch_core_thread_session_end(_In_ switch_core_session_t *session); /*! \brief Launch a service thread on a session to drop inbound data \param session the session the launch thread on - \param stream_id which logical media channel to use - \param thread_session the thread_session to use */ -SWITCH_DECLARE(void) switch_core_service_session(_In_ switch_core_session_t *session, - _In_ switch_core_thread_session_t *thread_session, _In_ int stream_id); +SWITCH_DECLARE(void) switch_core_service_session(_In_ switch_core_session_t *session); /*! \brief Request an outgoing session spawned from an existing session using a desired endpoing module Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Oct 23 19:48:11 2008 @@ -169,7 +169,6 @@ char *timer_name = NULL; switch_speech_handle_t sh; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_thread_session_t thread_session; switch_timer_t timer = { 0 }, *timerp = NULL; uint32_t last; char *mydata = NULL; @@ -293,7 +292,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", (rate / 50) * 2, interval); /* start a thread to absorb incoming audio */ - switch_core_service_session(session, &thread_session, 0); + switch_core_service_session(session); timerp = &timer; } @@ -615,7 +614,7 @@ if (timerp) { /* End the audio absorbing thread */ - switch_core_thread_session_end(&thread_session); + switch_core_thread_session_end(session); switch_core_timer_destroy(&timer); } 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 Thu Oct 23 19:48:11 2008 @@ -5441,22 +5441,18 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_end(void * jarg1) { - switch_core_thread_session_t *arg1 = (switch_core_thread_session_t *) 0 ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - arg1 = (switch_core_thread_session_t *)jarg1; + arg1 = (switch_core_session_t *)jarg1; switch_core_thread_session_end(arg1); } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_service_session(void * jarg1, void * jarg2, int jarg3) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_service_session(void * jarg1) { switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - switch_core_thread_session_t *arg2 = (switch_core_thread_session_t *) 0 ; - int arg3 ; arg1 = (switch_core_session_t *)jarg1; - arg2 = (switch_core_thread_session_t *)jarg2; - arg3 = (int)jarg3; - switch_core_service_session(arg1,arg2,arg3); + switch_core_service_session(arg1); } 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 Thu Oct 23 19:48:11 2008 @@ -1262,12 +1262,12 @@ freeswitchPINVOKE.switch_core_session_launch_thread(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_f_p_switch_thread_t_p_void__p_void.getCPtr(func), SWIGTYPE_p_void.getCPtr(obj)); } - public static void switch_core_thread_session_end(switch_core_thread_session thread_session) { - freeswitchPINVOKE.switch_core_thread_session_end(switch_core_thread_session.getCPtr(thread_session)); + public static void switch_core_thread_session_end(SWIGTYPE_p_switch_core_session session) { + freeswitchPINVOKE.switch_core_thread_session_end(SWIGTYPE_p_switch_core_session.getCPtr(session)); } - public static void switch_core_service_session(SWIGTYPE_p_switch_core_session session, switch_core_thread_session thread_session, int stream_id) { - freeswitchPINVOKE.switch_core_service_session(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_core_thread_session.getCPtr(thread_session), stream_id); + public static void switch_core_service_session(SWIGTYPE_p_switch_core_session session) { + freeswitchPINVOKE.switch_core_service_session(SWIGTYPE_p_switch_core_session.getCPtr(session)); } public static switch_call_cause_t switch_core_session_outgoing_channel(SWIGTYPE_p_switch_core_session session, switch_event var_event, string endpoint_name, switch_caller_profile caller_profile, SWIGTYPE_p_p_switch_core_session new_session, SWIGTYPE_p_p_apr_pool_t pool, uint flags) { @@ -5449,7 +5449,7 @@ public static extern void switch_core_thread_session_end(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_service_session")] - public static extern void switch_core_service_session(HandleRef jarg1, HandleRef jarg2, int jarg3); + public static extern void switch_core_service_session(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_outgoing_channel")] public static extern int switch_core_session_outgoing_channel(HandleRef jarg1, HandleRef jarg2, string jarg3, HandleRef jarg4, HandleRef jarg5, HandleRef jarg6, uint jarg7); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Thu Oct 23 19:48:11 2008 @@ -209,7 +209,6 @@ switch_frame_t write_frame = { 0 }; unsigned char *fdata[1024]; switch_frame_t *read_frame; - switch_core_thread_session_t thread_session = { 0 }; switch_channel_t *channel; if (argc > 1) { @@ -237,7 +236,7 @@ channel = switch_core_session_get_channel(session); if (tto->timer) { - switch_core_service_session(session, &thread_session, 0); + switch_core_service_session(session); } if (loops) { @@ -291,7 +290,7 @@ } if (tto->timer) { - switch_core_thread_session_end(&thread_session); + switch_core_thread_session_end(session); } return JS_TRUE; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Oct 23 19:48:11 2008 @@ -271,53 +271,54 @@ static void *switch_core_service_thread(switch_thread_t *thread, void *obj) { - switch_core_thread_session_t *data = obj; - switch_core_session_t *session = data->objs[0]; - int *stream_id_p = data->objs[1]; + switch_core_session_t *session = obj; switch_channel_t *channel; switch_frame_t *read_frame; - int stream_id = *stream_id_p; switch_assert(thread != NULL); switch_assert(session != NULL); + + switch_core_session_read_lock(session); channel = switch_core_session_get_channel(session); switch_channel_set_flag(channel, CF_SERVICE); - while (data->running > 0) { - switch (switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, stream_id)) { + while (switch_channel_test_flag(channel, CF_SERVICE)) { + switch (switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0)) { case SWITCH_STATUS_SUCCESS: case SWITCH_STATUS_TIMEOUT: case SWITCH_STATUS_BREAK: break; default: - data->running = -1; + switch_channel_clear_flag(channel, CF_SERVICE); continue; } } - switch_channel_clear_flag(channel, CF_SERVICE); - data->running = 0; + switch_core_session_rwunlock(session); return NULL; } /* Either add a timeout here or make damn sure the thread cannot get hung somehow (my preference) */ -SWITCH_DECLARE(void) switch_core_thread_session_end(switch_core_thread_session_t *thread_session) +SWITCH_DECLARE(void) switch_core_thread_session_end(switch_core_session_t *session) { - if (thread_session->running > 0) { - thread_session->running = -1; + switch_channel_t *channel; + switch_assert(session); - while (thread_session->running) { - switch_yield(1000); - } - } + channel = switch_core_session_get_channel(session); + switch_assert(channel); + + switch_channel_clear_flag(channel, CF_SERVICE); } -SWITCH_DECLARE(void) switch_core_service_session(switch_core_session_t *session, switch_core_thread_session_t *thread_session, int stream_id) +SWITCH_DECLARE(void) switch_core_service_session(switch_core_session_t *session) { - thread_session->running = 1; - thread_session->objs[0] = session; - thread_session->objs[1] = &stream_id; - switch_core_session_launch_thread(session, switch_core_service_thread, thread_session); + switch_channel_t *channel; + switch_assert(session); + + channel = switch_core_session_get_channel(session); + switch_assert(channel); + + switch_core_session_launch_thread(session, switch_core_service_thread, session); } /* This function abstracts the thread creation for modules by allowing you to pass a function ptr and Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu Oct 23 19:48:11 2008 @@ -729,7 +729,6 @@ switch_size_t olen = 0, llen = 0; switch_frame_t write_frame = { 0 }; switch_timer_t timer = { 0 }; - switch_core_thread_session_t thread_session = { 0 }; switch_codec_t codec; switch_memory_pool_t *pool = switch_core_session_get_pool(session); char *codec_name; @@ -963,7 +962,7 @@ if (timer_name) { /* start a thread to absorb incoming audio */ - switch_core_service_session(session, &thread_session, 0); + switch_core_service_session(session); } ilen = samples; @@ -1230,7 +1229,7 @@ } if (timer_name) { /* End the audio absorbing thread */ - switch_core_thread_session_end(&thread_session); + switch_core_thread_session_end(session); switch_core_timer_destroy(&timer); } @@ -1842,7 +1841,6 @@ int interval = 0; switch_frame_t write_frame = { 0 }; switch_timer_t ltimer, *timer; - switch_core_thread_session_t thread_session = { 0 }; switch_codec_t lcodec, *codec; switch_memory_pool_t *pool = switch_core_session_get_pool(session); char *codec_name; @@ -1948,7 +1946,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", sh->samples * 2, interval); } /* start a thread to absorb incoming audio */ - switch_core_service_session(session, &thread_session, 0); + switch_core_service_session(session); } @@ -1962,7 +1960,7 @@ if (timer_name) { /* End the audio absorbing thread */ - switch_core_thread_session_end(&thread_session); + switch_core_thread_session_end(session); if (!cache_obj) { switch_core_timer_destroy(timer); }

1 0

[Freeswitch-svn] [commit] r10135 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: anthm Date: Thu Oct 23 18:05:00 2008 New Revision: 10135 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix cng bs 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 Thu Oct 23 18:05:00 2008 @@ -2329,7 +2329,7 @@ } if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG) && !cng_pt && !strcasecmp(rm_encoding, "CN")) { - cng_pt = tech_pvt->cng_pt = (switch_payload_t) map->rm_pt; + cng_pt = (switch_payload_t) map->rm_pt; if (tech_pvt->rtp_session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", cng_pt); switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt); @@ -2519,7 +2519,7 @@ } done: - + tech_pvt->cng_pt = cng_pt; switch_set_flag_locked(tech_pvt, TFLAG_SDP); return match;

1 0

[Freeswitch-svn] [commit] r10134 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: anthm Date: Thu Oct 23 17:58:09 2008 New Revision: 10134 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: cleanup 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 Thu Oct 23 17:58:09 2008 @@ -163,10 +163,27 @@ return SWITCH_STATUS_SUCCESS; } + +static void expire_listener(listener_t **listener) +{ + void *pop; + + switch_thread_rwlock_unlock((*listener)->rwlock); + switch_core_hash_destroy(&(*listener)->event_hash); + switch_core_destroy_memory_pool(&(*listener)->pool); + + while (switch_queue_trypop((*listener)->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { + switch_event_t *pevent = (switch_event_t *) pop; + switch_event_destroy(&pevent); + } + + *listener = NULL; +} + static void event_handler(switch_event_t *event) { switch_event_t *clone = NULL; - listener_t *l; + listener_t *l, *lp; switch_assert(event != NULL); @@ -174,20 +191,24 @@ return; } + lp = listen_list.listeners; + switch_mutex_lock(listen_list.mutex); - for (l = listen_list.listeners; l; l = l->next) { + while(lp) { uint8_t send = 0; - + + l = lp; + lp = lp->next; + if (!switch_test_flag(l, LFLAG_EVENTS)) { continue; } - + if (switch_test_flag(l, LFLAG_STATEFUL) && l->timeout && switch_timestamp(NULL) - l->last_flush > l->timeout) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Stateful Listener %u has expired\n", l->id); remove_listener(l); - switch_thread_rwlock_unlock(l->rwlock); - switch_core_hash_destroy(&l->event_hash); - switch_core_destroy_memory_pool(&l->pool); + expire_listener(&l); + continue; } if (l->event_list[SWITCH_EVENT_ALL]) { @@ -559,9 +580,7 @@ stream->write_function(stream, "<data>\n <reply type=\"success\">listener %u destroyed</reply>\n", listener->id); xmlize_listener(listener, stream); stream->write_function(stream, "</data>\n"); - switch_thread_rwlock_unlock(listener->rwlock); - switch_core_hash_destroy(&listener->event_hash); - switch_core_destroy_memory_pool(&listener->pool); + expire_listener(&listener); goto end; } else { stream->write_function(stream, "<data><reply type=\"error\">Can't find listener</reply></data>\n"); @@ -600,7 +619,7 @@ listener->ebuf = switch_xml_toxml(xml, SWITCH_FALSE); switch_xml_free(xml); } else { - stream->write_function(stream, "-ERR XML Error\n"); + stream->write_function(stream, "<data><reply type=\"error\">XML Render Error</reply></data>\n"); break; }

1 0

[Freeswitch-svn] [commit] r10133 - freeswitch/trunk/src/mod/languages/mod_managed/managed
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: michaelgg Date: Thu Oct 23 13:40:06 2008 New Revision: 10133 Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs Log: Actually USE the saved references.... Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs Thu Oct 23 13:40:06 2008 @@ -47,7 +47,7 @@ { // SWITCH_DECLARE(void) InitManagedSession(ManagedSession *session, MonoObject *dtmfDelegate, MonoObject *hangupDelegate) [DllImport("mod_managed.dll", CharSet = CharSet.Ansi, CallingConvention=CallingConvention.Cdecl)] - static extern void InitManagedSession(IntPtr sessionPtr, DtmfCallback dtmfDelegate, Action hangupDelegate); + static extern void InitManagedSession(IntPtr sessionPtr, DtmfCallback dtmfDelegate, CdeclAction hangupDelegate); /// <summary>Initializes the native ManagedSession. Must be called after Originate.</summary> public void Initialize() @@ -57,11 +57,11 @@ // So we don't need to worry about GCHandles and all that.... // Info here: http://blogs.msdn.com/cbrumme/archive/2003/05/06/51385.aspx this._inputCallbackRef = inputCallback; - this._hangupCallback = hangupCallback; - InitManagedSession(ManagedSession.getCPtr(this).Handle, inputCallback, hangupCallback); + this._hangupCallbackRef = hangupCallback; + InitManagedSession(ManagedSession.getCPtr(this).Handle, this._inputCallbackRef, this._hangupCallbackRef); } DtmfCallback _inputCallbackRef; - CdeclAction _hangupCallback; + CdeclAction _hangupCallbackRef; /// <summary>Function to execute when this session hangs up.</summary> public Action HangupFunction { get; set; }

1 0

[Freeswitch-svn] [commit] r10132 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: anthm Date: Thu Oct 23 13:31:22 2008 New Revision: 10132 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: add nifty new goodies 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 Thu Oct 23 13:31:22 2008 @@ -47,7 +47,8 @@ LFLAG_FULL = (1 << 4), LFLAG_MYEVENTS = (1 << 5), LFLAG_SESSION = (1 << 6), - LFLAG_ASYNC = (1 << 7) + LFLAG_ASYNC = (1 << 7), + LFLAG_STATEFUL = (1 << 8) } event_flag_t; typedef enum { @@ -72,6 +73,9 @@ int lost_events; int lost_logs; int hup; + time_t last_flush; + uint32_t timeout; + uint32_t id; switch_sockaddr_t *sa; char remote_ip[50]; switch_port_t remote_port; @@ -99,8 +103,21 @@ int threads; char *acl[MAX_ACL]; uint32_t acl_count; + uint32_t id; } prefs; + +static void remove_listener(listener_t *listener); + +static uint32_t next_id(void) +{ + uint32_t id; + switch_mutex_lock(listen_list.mutex); + id = ++prefs.id; + switch_mutex_unlock(listen_list.mutex); + return id; +} + SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_pref_ip, prefs.ip); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_pref_pass, prefs.password); @@ -165,6 +182,14 @@ continue; } + if (switch_test_flag(l, LFLAG_STATEFUL) && l->timeout && switch_timestamp(NULL) - l->last_flush > l->timeout) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Stateful Listener %u has expired\n", l->id); + remove_listener(l); + switch_thread_rwlock_unlock(l->rwlock); + switch_core_hash_destroy(&l->event_hash); + switch_core_destroy_memory_pool(&l->pool); + } + if (l->event_list[SWITCH_EVENT_ALL]) { send = 1; } else if ((l->event_list[event->event_id])) { @@ -347,18 +372,6 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_LOAD_FUNCTION(mod_event_socket_load) -{ - switch_application_interface_t *app_interface; - - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_APP(app_interface, "socket", "Connect to a socket", "Connect to a socket", socket_function, "<ip>[:<port>]", SAF_SUPPORT_NOMEDIA); - - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; -} - static void add_listener(listener_t *listener) { /* add me to the listeners so I get events */ @@ -386,6 +399,24 @@ switch_mutex_unlock(listen_list.mutex); } + +static listener_t *find_listener(uint32_t id) +{ + listener_t *l, *r = NULL; + + switch_mutex_lock(listen_list.mutex); + for (l = listen_list.listeners; l; l = l->next) { + if (l->id && l->id == id) { + if (switch_thread_rwlock_tryrdlock(l->rwlock) == SWITCH_STATUS_SUCCESS) { + r = l; + } + break; + } + } + switch_mutex_unlock(listen_list.mutex); + return r; +} + static void strip_cr(char *s) { char *p; @@ -394,6 +425,242 @@ } } + +static void xmlize_listener(listener_t *listener, switch_stream_handle_t *stream) +{ + stream->write_function(stream, " <listener>\n"); + stream->write_function(stream, " <listen-id>%u</listen-id>\n", listener->id); + stream->write_function(stream, " <format>%s</format>\n", listener->format == EVENT_FORMAT_XML ? "xml" : "plain"); + stream->write_function(stream, " <timeout>%u</timeout>\n", listener->timeout); + stream->write_function(stream, " </listener>\n"); +} + +SWITCH_STANDARD_API(event_manager_function) +{ + char *http = NULL; + char *wcmd = NULL; + char *format = NULL; + listener_t *listener = NULL; + + if (stream->param_event) { + http = switch_event_get_header(stream->param_event, "http-host"); + wcmd = switch_event_get_header(stream->param_event, "command"); + format = switch_event_get_header(stream->param_event, "format"); + } + + if (!http) { + stream->write_function(stream, "This is a web application.!\n"); + return SWITCH_STATUS_SUCCESS; + } + stream->write_function(stream, "Content-Type: text/xml\n\n"); + + stream->write_function(stream, "<?xml version=\"1.0\"?>\n"); + stream->write_function(stream, "<root>\n"); + + if (!wcmd) { + stream->write_function(stream, "<data><reply type=\"error\">Missing command parameter!</reply></data>\n"); + goto end; + } + + if (!format) { + format = "xml"; + } + + + + if (!strcasecmp(wcmd, "create-listener")) { + char *events = switch_event_get_header(stream->param_event, "events"); + switch_memory_pool_t *pool; + char *next, *cur; + uint32_t count = 0, key_count = 0; + uint8_t custom = 0; + char *edup; + + if (switch_strlen_zero(events)) { + stream->write_function(stream, "<data><reply type=\"error\">Missing parameter!</reply></data>\n"); + goto end; + } + + switch_core_new_memory_pool(&pool); + listener = switch_core_alloc(pool, sizeof(*listener)); + listener->pool = pool; + listener->format = EVENT_FORMAT_PLAIN; + switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_core_hash_init(&listener->event_hash, listener->pool); + switch_set_flag(listener, LFLAG_AUTHED); + switch_set_flag(listener, LFLAG_STATEFUL); + switch_queue_create(&listener->event_queue, SWITCH_CORE_QUEUE_LEN, listener->pool); + switch_thread_rwlock_create(&listener->rwlock, listener->pool); + listener->id = next_id(); + listener->timeout = 60; + listener->last_flush = switch_timestamp(NULL); + + if (switch_stristr("xml", format)) { + listener->format = EVENT_FORMAT_XML; + } else { + listener->format = EVENT_FORMAT_PLAIN; + } + + edup = strdup(events); + + for (cur = edup; cur; count++) { + switch_event_types_t type; + + if ((next = strchr(cur, ' '))) { + *next++ = '\0'; + } + + if (custom) { + switch_core_hash_insert(listener->event_hash, cur, MARKER); + } else if (switch_name_event(cur, &type) == SWITCH_STATUS_SUCCESS) { + key_count++; + if (type == SWITCH_EVENT_ALL) { + uint32_t x = 0; + for (x = 0; x < SWITCH_EVENT_ALL; x++) { + listener->event_list[x] = 1; + } + } + if (type <= SWITCH_EVENT_ALL) { + listener->event_list[type] = 1; + } + if (type == SWITCH_EVENT_CUSTOM) { + custom++; + } + } + + cur = next; + } + + + switch_safe_free(edup); + + if (!key_count) { + switch_core_hash_destroy(&listener->event_hash); + switch_core_destroy_memory_pool(&listener->pool); + stream->write_function(stream, "<data><reply type=\"error\">No keywords supplied</reply></data>\n"); + goto end; + } + + + switch_set_flag_locked(listener, LFLAG_EVENTS); + add_listener(listener); + stream->write_function(stream, "<data>\n"); + stream->write_function(stream, " <reply type=\"success\">Listener %u Created</reply>\n", listener->id); + xmlize_listener(listener, stream); + stream->write_function(stream, "</data>\n"); + + goto end; + } else if (!strcasecmp(wcmd, "destroy-listener")) { + char *id = switch_event_get_header(stream->param_event, "listen-id"); + uint32_t idl = (uint32_t) atol(id); + + if ((listener = find_listener(idl))) { + remove_listener(listener); + stream->write_function(stream, "<data>\n <reply type=\"success\">listener %u destroyed</reply>\n", listener->id); + xmlize_listener(listener, stream); + stream->write_function(stream, "</data>\n"); + switch_thread_rwlock_unlock(listener->rwlock); + switch_core_hash_destroy(&listener->event_hash); + switch_core_destroy_memory_pool(&listener->pool); + goto end; + } else { + stream->write_function(stream, "<data><reply type=\"error\">Can't find listener</reply></data>\n"); + goto end; + } + + } else if (!strcasecmp(wcmd, "check-listener")) { + char *id = switch_event_get_header(stream->param_event, "listen-id"); + uint32_t idl = (uint32_t) atol(id); + void *pop; + switch_event_t *pevent; + + if (!(listener = find_listener(idl))) { + stream->write_function(stream, "<data><reply type=\"error\">Can't find listener</reply></data>\n"); + goto end; + } + + listener->last_flush = switch_timestamp(NULL); + stream->write_function(stream, "<data>\n <reply type=\"success\">Current Events Follow</reply>\n"); + xmlize_listener(listener, stream); + stream->write_function(stream, "<events>\n"); + + while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { + pevent = (switch_event_t *) pop; + char *etype; + + if (listener->format == EVENT_FORMAT_PLAIN) { + etype = "plain"; + switch_event_serialize(pevent, &listener->ebuf, SWITCH_TRUE); + stream->write_function(stream, "<event type=\"plain\">\n%s</event>", listener->ebuf); + } else { + switch_xml_t xml; + etype = "xml"; + + if ((xml = switch_event_xmlize(pevent, "%s", ""))) { + listener->ebuf = switch_xml_toxml(xml, SWITCH_FALSE); + switch_xml_free(xml); + } else { + stream->write_function(stream, "-ERR XML Error\n"); + break; + } + + stream->write_function(stream, "%s\n", listener->ebuf); + } + + switch_safe_free(listener->ebuf); + switch_event_destroy(&pevent); + } + + stream->write_function(stream, " </events>\n</data>\n"); + + if (pevent) { + switch_event_destroy(&pevent); + } + + switch_thread_rwlock_unlock(listener->rwlock); + } else if (!strcasecmp(wcmd, "exec-fsapi")) { + char *api_command = switch_event_get_header(stream->param_event, "fsapi-command"); + char *api_args = switch_event_get_header(stream->param_event, "fsapi-args"); + switch_event_t *event, *oevent; + + if (!(api_command)) { + stream->write_function(stream, "<data><reply type=\"error\">INVALID API COMMAND!</reply></data>\n"); + goto end; + } + + stream->write_function(stream, "<data>\n <reply type=\"success\">Execute API Command</reply>\n<api-command>\n"); + switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); + oevent = stream->param_event; + stream->param_event = event; + switch_api_execute(api_command, api_args, NULL, stream); + stream->param_event = oevent; + stream->write_function(stream, " </api-command>\n</data>"); + } else { + stream->write_function(stream, "<data><reply type=\"error\">INVALID COMMAND!</reply></data\n"); + } + + end: + + stream->write_function(stream, "</root>\n\n"); + + return SWITCH_STATUS_SUCCESS; +} + + +SWITCH_MODULE_LOAD_FUNCTION(mod_event_socket_load) +{ + switch_application_interface_t *app_interface; + switch_api_interface_t *api_interface; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_APP(app_interface, "socket", "Connect to a socket", "Connect to a socket", socket_function, "<ip>[:<port>]", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_API(api_interface, "event_manager", "event_manager", event_manager_function, "<web data>"); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t read_packet(listener_t *listener, switch_event_t **event, uint32_t timeout) { switch_size_t mlen, bytes = 0;

1 0

[Freeswitch-svn] [commit] r10131 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: anthm Date: Thu Oct 23 09:04:08 2008 New Revision: 10131 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: let any channel get messages 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 Thu Oct 23 09:04:08 2008 @@ -881,13 +881,6 @@ } if ((session = switch_core_session_locate(uuid))) { - if (!switch_channel_test_flag(switch_core_session_get_channel(session), CF_CONTROLLED)) { - switch_core_session_rwunlock(session); - session = NULL; - } - } - - if (session) { if ((status = switch_core_session_queue_private_event(session, event)) == SWITCH_STATUS_SUCCESS) { switch_snprintf(reply, reply_len, "+OK"); } else {

1 0

[Freeswitch-svn] [commit] r10130 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Thu Oct 23 01:52:05 2008 New Revision: 10130 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: revert, give up for the night Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 23 01:52:05 2008 @@ -2116,14 +2116,6 @@ sofia_glue_attach_private(nsession, profile, tech_pvt, dest); - if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { - if (tech_pvt->bcng_pt) { - tech_pvt->cng_pt = tech_pvt->bcng_pt; - } else if (!tech_pvt->cng_pt) { - tech_pvt->cng_pt = profile->cng_pt; - } - } - if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); if (profile->pres_type) { 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 Thu Oct 23 01:52:05 2008 @@ -413,6 +413,14 @@ tech_pvt->dtmf_type = profile->dtmf_type; + if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { + if (tech_pvt->bcng_pt) { + tech_pvt->cng_pt = tech_pvt->bcng_pt; + } else if (!tech_pvt->cng_pt) { + tech_pvt->cng_pt = profile->cng_pt; + } + } + tech_pvt->session = session; tech_pvt->channel = switch_core_session_get_channel(session); switch_core_session_set_private(session, tech_pvt);

1 0

[Freeswitch-svn] [commit] r10129 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Thu Oct 23 01:27:32 2008 New Revision: 10129 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: don't put CN in sdp answer if it was not in the offer. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 23 01:27:32 2008 @@ -2116,6 +2116,14 @@ sofia_glue_attach_private(nsession, profile, tech_pvt, dest); + if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { + if (tech_pvt->bcng_pt) { + tech_pvt->cng_pt = tech_pvt->bcng_pt; + } else if (!tech_pvt->cng_pt) { + tech_pvt->cng_pt = profile->cng_pt; + } + } + if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); if (profile->pres_type) { 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 Thu Oct 23 01:27:32 2008 @@ -413,14 +413,6 @@ tech_pvt->dtmf_type = profile->dtmf_type; - if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { - if (tech_pvt->bcng_pt) { - tech_pvt->cng_pt = tech_pvt->bcng_pt; - } else if (!tech_pvt->cng_pt) { - tech_pvt->cng_pt = profile->cng_pt; - } - } - tech_pvt->session = session; tech_pvt->channel = switch_core_session_get_channel(session); switch_core_session_set_private(session, tech_pvt);

1 0

[Freeswitch-svn] [commit] r10128 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Thu Oct 23 00:54:38 2008 New Revision: 10128 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: revert Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 23 00:54:38 2008 @@ -2114,7 +2114,6 @@ tech_pvt->dest_to = tech_pvt->dest; } - switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); sofia_glue_attach_private(nsession, profile, tech_pvt, dest); if (tech_pvt->local_url) { @@ -2129,6 +2128,7 @@ caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest); switch_channel_set_caller_profile(nchannel, caller_profile); switch_channel_set_flag(nchannel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); if (switch_channel_get_state(nchannel) == CS_NEW) { switch_channel_set_state(nchannel, CS_INIT); 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 Thu Oct 23 00:54:38 2008 @@ -413,7 +413,7 @@ tech_pvt->dtmf_type = profile->dtmf_type; - if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND) && !(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { + if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { if (tech_pvt->bcng_pt) { tech_pvt->cng_pt = tech_pvt->bcng_pt; } else if (!tech_pvt->cng_pt) {

1 0

[Freeswitch-svn] [commit] r10127 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Thu Oct 23 00:48:03 2008 New Revision: 10127 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: another tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 23 00:48:03 2008 @@ -2114,6 +2114,9 @@ tech_pvt->dest_to = tech_pvt->dest; } + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + sofia_glue_attach_private(nsession, profile, tech_pvt, dest); + if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); if (profile->pres_type) { @@ -2126,11 +2129,7 @@ caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest); switch_channel_set_caller_profile(nchannel, caller_profile); switch_channel_set_flag(nchannel, CF_OUTBOUND); - switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); - - sofia_glue_attach_private(nsession, profile, tech_pvt, dest); - if (switch_channel_get_state(nchannel) == CS_NEW) { switch_channel_set_state(nchannel, CS_INIT); }

1 0