- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7232 - freeswitch/trunk/src
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Mon Jan 14 21:04:11 2008 New Revision: 7232 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: incrementing the wrong var. 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 14 21:04:11 2008 @@ -1073,7 +1073,7 @@ frame = switch_core_media_bug_get_write_replace_frame(bug); } - for (i = 0 ; i < cont->index; cont++) { + for (i = 0 ; i < cont->index; i++) { if (cont->list[i].up && teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) { switch_event_t *event;

1 0

[commit] r7231 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: anthm Date: Mon Jan 14 19:44:23 2008 New Revision: 7231 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add bgapi api command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Jan 14 19:44:23 2008 @@ -1629,6 +1629,91 @@ } +struct bg_job { + char *cmd; + char *arg; + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + switch_memory_pool_t *pool; +}; + +static void *SWITCH_THREAD_FUNC bgapi_exec(switch_thread_t *thread, void *obj) +{ + + struct bg_job *job = (struct bg_job *) obj; + switch_stream_handle_t stream = { 0 }; + switch_status_t status; + char *reply, *freply = NULL; + switch_event_t *event; + char *arg; + + SWITCH_STANDARD_STREAM(stream); + + if ((arg = strchr(job->cmd, ' '))) { + *arg++ = '\0'; + } + + if ((status = switch_api_execute(job->cmd, arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { + reply = stream.data; + } else { + freply = switch_mprintf("%s: Command not found!\n", job->cmd); + reply = freply; + } + + if (!reply) { + reply = "Command returned no output!"; + } + + if (switch_event_create(&event, SWITCH_EVENT_BACKGROUND_JOB) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Job-Command", "%s", job->cmd); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Job-Command-Arg", "%s", arg); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Job-UUID", "%s", job->uuid_str); + switch_event_add_body(event, "%s", reply); + switch_event_fire(&event); + } + + switch_safe_free(stream.data); + switch_safe_free(freply); + + if (job) { + switch_memory_pool_t *pool = job->pool; + job = NULL; + switch_core_destroy_memory_pool(&pool); + pool = NULL; + } + return NULL; +} + +SWITCH_STANDARD_API(bgapi_function) +{ + struct bg_job *job; + switch_uuid_t uuid; + switch_memory_pool_t *pool; + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + if (!cmd) { + stream->write_function(stream, "-ERR Invalid syntax\n"); + return SWITCH_STATUS_SUCCESS; + } + + switch_core_new_memory_pool(&pool); + job = switch_core_alloc(pool, sizeof(*job)); + job->cmd = switch_core_strdup(pool, cmd); + job->pool = pool; + + switch_uuid_get(&uuid); + switch_uuid_format(job->uuid_str, &uuid); + + switch_threadattr_create(&thd_attr, job->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + stream->write_function(stream, "+OK %s\n", job->uuid_str); + switch_thread_create(&thread, thd_attr, bgapi_exec, job, job->pool); + + return SWITCH_STATUS_SUCCESS; +} + + struct holder { switch_stream_handle_t *stream; char *http; @@ -2146,6 +2231,7 @@ SWITCH_ADD_API(commands_api_interface, "sched_transfer", "Schedule a broadcast event to a running call", sched_transfer_function, SCHED_TRANSFER_SYNTAX); SWITCH_ADD_API(commands_api_interface, "create_uuid", "Create a uuid", uuid_function, UUID_SYNTAX); SWITCH_ADD_API(commands_api_interface, "sched_api", "Schedule an api command", sched_api_function, "[+]<time> <group_name> <command_string>"); + SWITCH_ADD_API(commands_api_interface, "bgapi", "Execute an api command in a thread", bgapi_function, "<command>[ <arg>]"); SWITCH_ADD_API(commands_api_interface, "sched_del", "Delete a Scheduled task", sched_del_function, "<task_id>|<group_id>"); SWITCH_ADD_API(commands_api_interface, "xml_wrap", "Wrap another api command in xml", xml_wrap_api_function, "<command> <args>"); SWITCH_ADD_API(commands_api_interface, "is_lan_addr", "see if an ip is a lan addr", lan_addr_function, "<ip>");

1 0

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

15 Jan '08

Author: anthm Date: Mon Jan 14 19:06:15 2008 New Revision: 7230 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix potential locking issue 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 Mon Jan 14 19:06:15 2008 @@ -38,6 +38,7 @@ #include <curl/curl.h> #endif static int foo = 0; +static switch_mutex_t *mutex; SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load); @@ -3404,6 +3405,7 @@ JSContext *cx = NULL; jsval rval; + switch_mutex_lock(mutex); if ((cx = JS_NewContext(globals.rt, globals.gStackChunkSize))) { JS_BeginRequest(cx); @@ -3423,7 +3425,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Allocation Error!\n"); - return; + goto end; } script = input_code; @@ -3448,11 +3450,17 @@ 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; + } SWITCH_STANDARD_APP(js_dp_function) @@ -3579,6 +3587,8 @@ 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] r7229 - freeswitch/trunk/src
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: anthm Date: Mon Jan 14 18:32:21 2008 New Revision: 7229 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: pre_answer instead of answer 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 Mon Jan 14 18:32:21 2008 @@ -375,7 +375,7 @@ return SWITCH_STATUS_GENERR; } - switch_channel_answer(channel); + switch_channel_pre_answer(channel); if ((p = switch_channel_get_variable(channel, "RECORD_TITLE"))) { vval = switch_core_session_strdup(session, p); @@ -1588,7 +1588,7 @@ switch_core_speech_text_param_tts(sh, "voice", voice_name); } - switch_channel_answer(channel); + switch_channel_pre_answer(channel); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name);

1 0

[commit] r7228 - freeswitch/trunk/src/mod/applications/mod_esf
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: mikej Date: Mon Jan 14 17:34:05 2008 New Revision: 7228 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Log: if there is no frame, there is no cng Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Mon Jan 14 17:34:05 2008 @@ -136,7 +136,7 @@ while(!ready) { status = switch_core_session_read_frame(session, &read_frame, -1, 0); - if (switch_test_flag(read_frame, SFF_CNG)) { + if (read_frame && switch_test_flag(read_frame, SFF_CNG)) { continue; }

1 0

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

14 Jan '08

Author: mikej Date: Mon Jan 14 17:25:36 2008 New Revision: 7227 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: parse crypto header. 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 Mon Jan 14 17:25:36 2008 @@ -1339,6 +1339,7 @@ int greedy = 0, x = 0, skip = 0, mine = 0; switch_channel_t *channel = NULL; const char *val; + const char *crypto = NULL; tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); @@ -1441,6 +1442,8 @@ for (a = m->m_attributes; a; a = a->a_next) { if (!strcasecmp(a->a_name, "ptime") && a->a_value) { ptime = atoi(a->a_value); + } else if (!strcasecmp(a->a_name, "crypto") && a->a_value) { + crypto = a->a_value; } }

1 0

[commit] r7226 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: anthm Date: Mon Jan 14 17:19:48 2008 New Revision: 7226 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Mon Jan 14 17:19:48 2008 @@ -39,8 +39,9 @@ JSContext *cx; JSObject *obj; JSFunction *function; + JSObject *user_data; jsrefcount saveDepth; - jsval ret; + jsval ret; }; @@ -58,7 +59,9 @@ if (co->function) { char *ret; argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(co->cx, (char *)ptr)); - + if (co->user_data) { + argv[argc++] = OBJECT_TO_JSVAL(co->user_data); + } JS_ResumeRequest(co->cx, co->saveDepth); JS_CallFunction(co->cx, co->obj, co->function, argc, argv, &co->ret); co->saveDepth = JS_SuspendRequest(co->cx); @@ -134,7 +137,11 @@ } if (argc > 4) { - cred = JS_GetStringBytes(JS_ValueToString(cx, argv[4])); + JS_ValueToObject(cx, argv[4], &co->user_data); + } + + if (argc > 5) { + cred = JS_GetStringBytes(JS_ValueToString(cx, argv[5])); if (!switch_strlen_zero(cred)) { curl_easy_setopt(co->curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); curl_easy_setopt(co->curl_handle, CURLOPT_USERPWD, cred);

1 0

[commit] r7225 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: mikej Date: Mon Jan 14 16:58:36 2008 New Revision: 7225 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: user endpoint shouldn't need an a leg. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Jan 14 16:58:36 2008 @@ -1419,7 +1419,7 @@ goto done; } - user = switch_core_session_strdup(session, outbound_profile->destination_number); + user = strdup(outbound_profile->destination_number); if (!(domain = strchr(user, '@'))) { goto done; @@ -1464,15 +1464,20 @@ switch_channel_t *channel; switch_originate_flag_t myflags = SOF_NONE; - channel = switch_core_session_get_channel(session); - if ((var = switch_channel_get_variable(channel, "call_timeout"))) { - timelimit = atoi(var); - } - - switch_channel_set_variable(channel, "dialed_user", user); - switch_channel_set_variable(channel, "dialed_domain", domain); + if (session) { + channel = switch_core_session_get_channel(session); + if ((var = switch_channel_get_variable(channel, "call_timeout"))) { + timelimit = atoi(var); + } + + switch_channel_set_variable(channel, "dialed_user", user); + switch_channel_set_variable(channel, "dialed_domain", domain); + + d_dest = switch_channel_expand_variables(channel, dest); - d_dest = switch_channel_expand_variables(channel, dest); + } else { + d_dest = strdup(dest); + } if ((flags & SOF_FORKED_DIAL)) { myflags |= SOF_NOBLOCK; @@ -1519,6 +1524,7 @@ switch_xml_free(xml); } + switch_safe_free(user); return cause; }

1 0

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

14 Jan '08

Author: anthm Date: Mon Jan 14 16:52:38 2008 New Revision: 7224 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: put a 5 packet pause between digits so you can hear the spaces 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 14 16:52:38 2008 @@ -546,7 +546,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - if (0 && !(tech_pvt->profile->pflags & PFLAG_RUNNING)) { + if (!(tech_pvt->profile->pflags & PFLAG_RUNNING)) { switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; }

1 0

[commit] r7223 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: anthm Date: Mon Jan 14 16:51:31 2008 New Revision: 7223 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: put a 5 packet pause between digits so you can hear the spaces 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 14 16:51:31 2008 @@ -546,7 +546,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - if (!(tech_pvt->profile->pflags & PFLAG_RUNNING)) { + if (0 && !(tech_pvt->profile->pflags & PFLAG_RUNNING)) { switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jan 14 16:51:31 2008 @@ -139,6 +139,7 @@ uint32_t ts; uint32_t last_write_ts; uint32_t last_write_samplecount; + uint32_t next_write_samplecount; uint32_t flags; switch_memory_pool_t *pool; switch_sockaddr_t *from_addr; @@ -843,6 +844,7 @@ if (rtp_session->timer.interval) { switch_core_timer_check(&rtp_session->timer); rtp_session->last_write_samplecount = rtp_session->timer.samplecount; + rtp_session->next_write_samplecount = rtp_session->timer.samplecount + samples * 5; } rtp_session->dtmf_data.out_digit_dur = 0; } @@ -851,6 +853,13 @@ if (!rtp_session->dtmf_data.out_digit_dur && rtp_session->dtmf_data.dtmf_queue && switch_queue_size(rtp_session->dtmf_data.dtmf_queue)) { void *pop; + if (rtp_session->timer.interval) { + switch_core_timer_check(&rtp_session->timer); + if (rtp_session->timer.samplecount < rtp_session->next_write_samplecount) { + return; + } + } + if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { switch_dtmf_t *rdigit = pop; int64_t offset;

1 0