January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7311 - in freeswitch/trunk/src: . include include/private mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: anthm Date: Mon Jan 21 12:14:43 2008 New Revision: 7311 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_async.c Log: fix obscure race condition Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Mon Jan 21 12:14:43 2008 @@ -153,6 +153,7 @@ uint32_t flags; uint8_t ready; time_t stop_time; + switch_thread_id_t thread_id; struct switch_media_bug *next; }; 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 21 12:14:43 2008 @@ -830,6 +830,7 @@ SMBF_READ_REPLACE - Replace the Read Stream SMBF_STEREO - Record in stereo SMBF_ANSWER_RECORD_REQ - Don't record until the channel is answered +SMBF_THREAD_LOCK - Only let the same thread who created the bug remove it. </pre> */ typedef enum { @@ -840,7 +841,8 @@ SMBF_READ_REPLACE = (1 << 3), SMBF_READ_PING = (1 << 4), SMBF_STEREO = (1 << 5), - SMBF_RECORD_ANSWER_REQ = (1 << 6) + SMBF_RECORD_ANSWER_REQ = (1 << 6), + SMBF_THREAD_LOCK = (1 << 7) } switch_media_bug_flag_t; /*! 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 Mon Jan 21 12:14:43 2008 @@ -1748,11 +1748,11 @@ } else if (!strchr(dest, '@')) { char buf[128]; tech_pvt->e_dest = switch_core_session_strdup(nsession, dest); - if (sofia_reg_find_reg_url(profile, dest, profile_name, buf, sizeof(buf))) { + if (sofia_reg_find_reg_url(profile, dest, profile->name, buf, sizeof(buf))) { tech_pvt->dest = switch_core_session_strdup(nsession, buf); - tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile_name); + tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile->name); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile->name); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; goto error; } Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Mon Jan 21 12:14:43 2008 @@ -244,6 +244,12 @@ switch_buffer_create_dynamic(&bug->raw_write_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER); switch_mutex_init(&bug->write_mutex, SWITCH_MUTEX_NESTED, session->pool); } + + if ((bug->flags & SMBF_THREAD_LOCK)) { + bug->thread_id = switch_thread_self(); + } + + bug->ready = 1; switch_thread_rwlock_wrlock(session->bug_rwlock); bug->next = session->bugs; @@ -269,6 +275,11 @@ if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { + if (bp->thread_id && bp->thread_id != switch_thread_self()) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n"); + continue; + } + if (bp->callback) { bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE); } @@ -287,6 +298,11 @@ { switch_media_bug_t *bp = *bug; if (bp) { + if (bp->thread_id && bp->thread_id != switch_thread_self()) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n"); + return SWITCH_STATUS_FALSE; + } + if (bp->callback) { bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE); bp->ready = 0; @@ -308,6 +324,11 @@ if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { + if (bp->thread_id && bp->thread_id != switch_thread_self()) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n"); + continue; + } + if (!bp->ready) { continue; } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Jan 21 12:14:43 2008 @@ -657,7 +657,8 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n", switch_channel_get_name((*session)->channel), switch_channel_state_name(switch_channel_get_state((*session)->channel))); - + + switch_core_media_bug_remove_all(*session); switch_ivr_deactivate_unicast(*session); switch_scheduler_del_task_group((*session)->uuid_str); @@ -674,7 +675,7 @@ switch_event_fire(&event); } - switch_core_media_bug_remove_all(*session); + switch_buffer_destroy(&(*session)->raw_read_buffer); switch_buffer_destroy(&(*session)->raw_write_buffer); switch_ivr_clear_speech_cache(*session); @@ -694,10 +695,7 @@ switch_core_session_t *session = obj; session->thread = thread; - - switch_core_session_run(session); - switch_core_media_bug_remove_all(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %"SWITCH_SIZE_T_FMT" (%s) Locked, Waiting on external entities\n", session->id, switch_channel_get_name(session->channel)); switch_core_session_write_lock(session); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Jan 21 12:14:43 2008 @@ -503,9 +503,10 @@ switch_channel_t *tchannel = switch_core_session_get_channel(tsession); switch_frame_t *read_frame, write_frame = { 0 }; switch_codec_t codec = {0}; - int16_t buf[1024]; + int16_t buf[8192]; switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession); - + int tlen = tread_codec->implementation->bytes_per_frame; + ep = switch_core_session_alloc(session, sizeof(*ep)); switch_channel_pre_answer(channel); @@ -543,7 +544,7 @@ if (switch_core_media_bug_add(tsession, eavesdrop_callback, ep, 0, - SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING, + SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING | SMBF_THREAD_LOCK, &bug) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot attach bug\n"); goto end; @@ -630,11 +631,10 @@ switch_buffer_unlock(ep->w_buffer); } - - if (len > tread_codec->implementation->bytes_per_frame) { - len = tread_codec->implementation->bytes_per_frame; + if (len > tlen) { + len = tlen; } - + if (switch_buffer_inuse(ep->buffer) >= len) { switch_buffer_lock(ep->buffer); while (switch_buffer_inuse(ep->buffer) >= len) {

1 0

[commit] r7310 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: intralanman Date: Mon Jan 21 10:06:53 2008 New Revision: 7310 Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Log: whoops, these are pretty important lines Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Mon Jan 21 10:06:53 2008 @@ -75,6 +75,9 @@ private function writeDialplan($dpArray) { //print_r($dpArray); if (is_array($dpArray)) { + $this -> xmlw -> startElement('section'); + $this -> xmlw -> writeAttribute('name', 'dialplan'); + $this -> xmlw -> writeAttribute('description', 'FreeSWITCH Dialplan'); //$this -> comment('dpArray is an array'); foreach ($dpArray as $context => $extensions_array) { //$this -> comment($context); @@ -121,6 +124,8 @@ // </context> $this -> xmlw -> endElement(); } + // </section> + $this -> xmlw -> endElement(); } } }

1 0

[commit] r7309 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: mikej Date: Sun Jan 20 19:35:33 2008 New Revision: 7309 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_glue.c Log: add optional var/param for seperately setting the rtp timeout when on hold 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 Sun Jan 20 19:35:33 2008 @@ -288,6 +288,7 @@ uint32_t session_timeout; uint32_t max_proceeding; uint32_t rtp_timeout_sec; + uint32_t rtp_hold_timeout_sec; char *odbc_dsn; char *odbc_user; char *odbc_pass; @@ -374,6 +375,7 @@ uint32_t owner_id; uint32_t session_id; uint32_t max_missed_packets; + uint32_t max_missed_hold_packets; /** VIDEO **/ switch_frame_t video_read_frame; switch_codec_t video_read_codec; 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 Sun Jan 20 19:35:33 2008 @@ -1011,6 +1011,11 @@ if (v >= 0) { profile->rtp_timeout_sec = v; } + } else if (!strcasecmp(var, "rtp-hold-timeout-sec")) { + int v = atoi(val); + if (v >= 0) { + profile->rtp_hold_timeout_sec = v; + } } else if (!strcasecmp(var, "manage-presence")) { if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; 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 Sun Jan 20 19:35:33 2008 @@ -1226,6 +1226,7 @@ switch_status_t status; char tmp[50]; uint32_t rtp_timeout_sec = tech_pvt->profile->rtp_timeout_sec; + uint32_t rtp_hold_timeout_sec = tech_pvt->profile->rtp_hold_timeout_sec; switch_assert(tech_pvt != NULL); @@ -1370,12 +1371,27 @@ rtp_timeout_sec = v; } } + + if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_hold_timeout_sec"))) { + int v = atoi(val); + if (v >= 0) { + rtp_hold_timeout_sec = v; + } + } if (rtp_timeout_sec) { tech_pvt->max_missed_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / tech_pvt->read_codec.implementation->samples_per_frame; switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); + if (!rtp_hold_timeout_sec) { + rtp_hold_timeout_sec = rtp_timeout_sec * 10; + } + } + + if (rtp_hold_timeout_sec) { + tech_pvt->max_missed_hold_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_hold_timeout_sec) / + tech_pvt->read_codec.implementation->samples_per_frame; } if (tech_pvt->te) { @@ -1540,7 +1556,7 @@ switch_channel_presence(tech_pvt->channel, "unknown", "hold"); if (tech_pvt->max_missed_packets) { - switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets * 10); + switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_hold_packets); } if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) {

1 0

[commit] r7308 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 20 Jan '08

20 Jan '08

Author: anthm Date: Sun Jan 20 17:39:08 2008 New Revision: 7308 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix mem leak 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 Sun Jan 20 17:39:08 2008 @@ -481,7 +481,7 @@ switch_xml_free(xml); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML ERROR!\n"); - continue; + goto endloop; } } @@ -496,6 +496,9 @@ switch_socket_send(listener->sock, listener->ebuf, &len); switch_safe_free(listener->ebuf); + + endloop: + switch_event_destroy(&pevent); } } }

1 0

[commit] r7307 - freeswitch/trunk/libs/apr-util/misc
by Freeswitch SVN 20 Jan '08

20 Jan '08

Author: mikej Date: Sun Jan 20 16:49:01 2008 New Revision: 7307 Modified: freeswitch/trunk/libs/apr-util/misc/apr_queue.c Log: return error instead of segfaulting on pool allocation failure when creating a queue. Modified: freeswitch/trunk/libs/apr-util/misc/apr_queue.c ============================================================================== --- freeswitch/trunk/libs/apr-util/misc/apr_queue.c (original) +++ freeswitch/trunk/libs/apr-util/misc/apr_queue.c Sun Jan 20 16:49:01 2008 @@ -126,7 +126,9 @@ } /* Set all the data in the queue to NULL */ - queue->data = apr_pcalloc(a, queue_capacity * sizeof(void*)); + queue->data = apr_palloc(a, queue_capacity * sizeof(void*)); + if (!queue->data) return APR_ENOMEM; + memset(queue->data, 0, queue_capacity * sizeof(void*)); queue->bounds = queue_capacity; queue->nelts = 0; queue->in = 0;

1 0

[commit] r7306 - freeswitch/trunk/src
by Freeswitch SVN 20 Jan '08

20 Jan '08

Author: anthm Date: Sun Jan 20 14:05:16 2008 New Revision: 7306 Modified: freeswitch/trunk/src/switch_utils.c Log: update Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sun Jan 20 14:05:16 2008 @@ -1056,7 +1056,8 @@ int esc = 0; if (*ptr == ESCAPE_META) { - if ((e = unescape_char(*(ptr+1))) != e) { + e = *(ptr+1); + if (e == '\'' || e == '"' || (e = unescape_char(*(ptr+1))) != *(ptr+1)) { ++ptr; *dest++ = e; end = dest;

1 0

[commit] r7305 - freeswitch/trunk/src
by Freeswitch SVN 20 Jan '08

20 Jan '08

Author: mikej Date: Sun Jan 20 06:00:07 2008 New Revision: 7305 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Jan 20 06:00:07 2008 @@ -1832,7 +1832,7 @@ } else { data = frame->data; len = frame->datalen; - ts = frame->timestamp; + ts = (uint32_t)frame->timestamp; } return rtp_common_write(rtp_session, send_msg, data, len, payload, ts, &frame->flags);

1 0

[commit] r7304 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 20 Jan '08

20 Jan '08

Author: mikej Date: Sun Jan 20 02:43:25 2008 New Revision: 7304 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: support no media calls Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Sun Jan 20 02:43:25 2008 @@ -666,9 +666,9 @@ /* 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, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_NONE); - SWITCH_ADD_APP(app_interface, "db", "Insert to the db", DB_DESC, db_function, DB_USAGE, SAF_NONE); - SWITCH_ADD_APP(app_interface, "group", "Manage a group", GROUP_DESC, group_function, GROUP_USAGE, SAF_NONE); + SWITCH_ADD_APP(app_interface, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "db", "Insert to the db", DB_DESC, db_function, DB_USAGE, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "group", "Manage a group", GROUP_DESC, group_function, GROUP_USAGE, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[get|set]/<realm>/<key>/<value>"); SWITCH_ADD_API(commands_api_interface, "group", "group [insert|delete|call]", group_api_function, "[insert|delete|call]:<group name>:<url>");

1 0

[commit] r7303 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: anthm Date: Sat Jan 19 18:23:12 2008 New Revision: 7303 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix 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 Sat Jan 19 18:23:12 2008 @@ -38,8 +38,6 @@ #include <curl/curl.h> #endif static int foo = 0; -static switch_mutex_t *mutex; - SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown); @@ -3223,6 +3221,12 @@ 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"); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + if (argc > 1) { arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); } @@ -3405,8 +3409,6 @@ JSContext *cx = NULL; jsval rval; - switch_mutex_lock(mutex); - if ((cx = JS_NewContext(globals.rt, globals.gStackChunkSize))) { JS_BeginRequest(cx); JS_SetErrorReporter(cx, js_error); @@ -3424,8 +3426,7 @@ } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Allocation Error!\n"); - goto end; + abort(); } script = input_code; @@ -3450,14 +3451,11 @@ eval_some_js(buf, cx, javascript_global_object, &rval); } } - + if (cx) { eval_some_js(script, cx, javascript_global_object, &rval); JS_DestroyContext(cx); } - - end: - switch_mutex_unlock(mutex); return; @@ -3523,6 +3521,7 @@ ro.cmd = cmd; ro.session = session; ro.stream = stream; + js_parse_and_execute(session, (char *) cmd, &ro); return SWITCH_STATUS_SUCCESS; @@ -3587,8 +3586,6 @@ curl_global_init(CURL_GLOBAL_ALL); - switch_mutex_init(&mutex, SWITCH_MUTEX_NESTED, pool); - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7302 - freeswitch/trunk/src
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: brian Date: Sat Jan 19 16:59:06 2008 New Revision: 7302 Modified: freeswitch/trunk/src/switch_utils.c Log: src/switch_utils.c cleanup Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sat Jan 19 16:59:06 2008 @@ -1017,7 +1017,7 @@ static char unescape_char(char escaped) { char unescaped; - printf("WTF [%c]\n", escaped); + switch (escaped) { case 'n': unescaped = '\n';

1 0