- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

15 Jan '08

Author: mikej Date: Tue Jan 15 11:27:42 2008 New Revision: 7235 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Log: remove ( ) from default user agent. 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 Tue Jan 15 11:27:42 2008 @@ -66,7 +66,7 @@ #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" -#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_FULL "-mod_sofia" +#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO " " SWITCH_VERSION_REVISION "-mod_sofia" #define SOFIA_CHAT_PROTO "sip" #define SOFIA_SIP_HEADER_PREFIX "sip_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_"

1 0

[commit] r7234 - in freeswitch/trunk: . scripts
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: stkn Date: Tue Jan 15 09:53:05 2008 New Revision: 7234 Added: freeswitch/trunk/scripts/gentls_cert.in Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Log: Add gentls_cert script to create a CA and certificate for mod_sofia TLS Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Jan 15 09:53:05 2008 @@ -156,6 +156,7 @@ libfreeswitch_la_LDFLAGS += -lodbc endif +bin_SCRIPTS = scripts/gentls_cert libs/libedit/src/.libs/libedit.a: Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Jan 15 09:53:05 2008 @@ -424,7 +424,8 @@ src/include/switch_am_config.h build/getsounds.sh build/getlib.sh - build/modmake.rules]) + build/modmake.rules + scripts/gentls_cert]) AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux]) AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin]) Added: freeswitch/trunk/scripts/gentls_cert.in ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/gentls_cert.in Tue Jan 15 09:53:05 2008 @@ -0,0 +1,172 @@ +#!/bin/sh + +CONFDIR=@prefix@/conf/ssl +DAYS=365 + +TMPFILE="/tmp/fs-ca-$$-$(date +%Y%m%d%H%M%S)" + +COMMON_NAME="FreesSWITCH CA" +ALT_NAME="DNS:test.freeswitch.org" +ORG_NAME="FreeSWITCH" + +umask 037 + +setup_ca() { + echo "Creating new CA..." + + if [ ! -d "${CONFDIR}/CA" ]; then + mkdir -p -m 750 "${CONFDIR}/CA" || exit 1 + fi + + if [ ! -e "${CONFDIR}/CA/config.tpl" ]; then + cat > "${CONFDIR}/CA/config.tpl" <<-EOF + [ req ] + default_bits = 1024 + prompt = no + distinguished_name = req_dn + + [ req_dn ] + commonName = %CN% + organizationName = %ORG% + + [ ext ] + basicConstraints=CA:FALSE + subjectKeyIdentifier=hash + authorityKeyIdentifier=keyid,issuer:always + subjectAltName=%ALTNAME% + EOF + fi + + sed \ + -e "s|%CN%|$COMMON_NAME|" \ + -e "s|%ORG%|$ORG_NAME|" \ + -e "/%ALTNAME%/d" \ + -e "s|CA:FALSE|CA:TRUE|" \ + "${CONFDIR}/CA/config.tpl" \ + > "${TMPFILE}.cfg" || exit 1 + + openssl req -new -out "${CONFDIR}/CA/careq.pem" \ + -newkey rsa:1024 -keyout "${CONFDIR}/CA/cakey.pem" \ + -config "${TMPFILE}.cfg" -nodes -sha1 >/dev/null || exit 1 + + openssl x509 -req -signkey "${CONFDIR}/CA/cakey.pem" -in "${CONFDIR}/CA/careq.pem" \ + -out "${CONFDIR}/CA/cacert.pem" -extfile "${TMPFILE}.cfg" \ + -extensions ext -days ${DAYS} -sha1 >/dev/null || exit 1 + + rm "${TMPFILE}.cfg" + + echo "DONE" +} + +generate_cert() { + local val="" + + echo "Generating new certificate..." + + echo + echo "--------------------------------------------------------" + echo "CN: \"${COMMON_NAME}\"" + echo "ORG_NAME: \"${ORG_NAME}\"" + echo "ALT_NAME: \"${ALT_NAME}\"" + echo + echo "[Enter \"OK\" to accept]" + read val + if [ "${val}" != "OK" ]; then + return 2 + fi + + sed \ + -e "s|%CN%|$COMMON_NAME|" \ + -e "s|%ALTNAME%|$ALT_NAME|" \ + -e "s|%ORG%|$ORG_NAME|" \ + "${CONFDIR}/CA/config.tpl" \ + > "${TMPFILE}.cfg" || exit 1 + + openssl req -new -out "${TMPFILE}.req" \ + -newkey rsa:1024 -keyout "${TMPFILE}.key" \ + -config "${TMPFILE}.cfg" -nodes -sha1 >/dev/null || exit 1 + + openssl x509 -req -CAkey "${CONFDIR}/CA/cakey.pem" -CA "${CONFDIR}/CA/cacert.pem" -CAcreateserial \ + -in "${TMPFILE}.req" -out "${TMPFILE}.crt" -extfile "${TMPFILE}.cfg" \ + -extensions ext -days ${DAYS} -sha1 >/dev/null || exit 1 + + cat "${CONFDIR}/CA/cacert.pem" > "${CONFDIR}/cafile.pem" + cat "${TMPFILE}.crt" "${TMPFILE}.key" > "${CONFDIR}/agent.pem" + + rm "${TMPFILE}.cfg" "${TMPFILE}.crt" "${TMPFILE}.key" "${TMPFILE}.req" + + echo "DONE" +} + +remove_ca() { + echo "Cleaning CA" + + if [ ! -d "${CONFDIR}/CA" ]; then + rm "${CONFDIR}/CA/"* + rmdir "${CONFDIR}/CA" + fi + + echo "DONE" +} + +command="$1" +shift + +while [ $# -gt 0 ]; do + case $1 in + -cn) + shift + COMMON_NAME="$1" + ;; + -alt) + shift + ALT_NAME="$1" + ;; + -org) + shift + ORG_NAME="$1" + ;; + esac + shift +done + + +case ${command} in + setup) + setup_ca + ;; + + create) + generate_cert + ;; + + remove) + echo "Are you sure you want to delete the CA? [YES to delete]" + read val + if [ "${val}" = "YES" ]; then + remove_ca + else + echo "Not deleting CA" + fi + ;; + + *) + cat <<-EOF + $0 <setup|create|clean> [options] + + * commands: + + setup - Setup new CA + create - Create new certificate (overwriting old!) + remove - Remove CA + + * options: + + -cn Set common name + -alt Set alternative name (use prefix 'DNS:' or 'URI:') + -org Set organization name + + EOF + exit 1 + ;; +esac

1 0

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

15 Jan '08

Author: mikej Date: Mon Jan 14 22:28:09 2008 New Revision: 7233 Modified: freeswitch/trunk/src/switch_utils.c Log: null is not a lan address Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Jan 14 22:28:09 2008 @@ -356,7 +356,7 @@ SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip) { - + if (switch_strlen_zero(ip)) return SWITCH_FALSE; return ( strncmp(ip, "10.", 3) &&

1 0

[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