- Freeswitch-svn - FreeSWITCH Mailing Lists

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

24 Jan '08

Author: anthm Date: Thu Jan 24 09:05:52 2008 New Revision: 7343 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: disable garbage collector on originate and waitfor_* funcs in js 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 Thu Jan 24 09:05:52 2008 @@ -2070,6 +2070,7 @@ switch_time_t started; unsigned int elapsed; int32 timeout = 60; + jsrefcount saveDepth; METHOD_SANITY_CHECK(); @@ -2082,6 +2083,7 @@ JS_ValueToInt32(cx, argv[0], &timeout); } + saveDepth = JS_SuspendRequest(cx); for (;;) { if (((elapsed = (unsigned int) ((switch_timestamp_now() - started) / 1000)) > (switch_time_t) timeout) || switch_channel_get_state(channel) >= CS_HANGUP) { @@ -2097,6 +2099,7 @@ switch_yield(1000); } + JS_ResumeRequest(cx, saveDepth); return JS_TRUE; } @@ -2109,6 +2112,7 @@ switch_time_t started; unsigned int elapsed; int32 timeout = 60; + jsrefcount saveDepth; METHOD_SANITY_CHECK(); @@ -2121,6 +2125,7 @@ JS_ValueToInt32(cx, argv[0], &timeout); } + saveDepth = JS_SuspendRequest(cx); for (;;) { if (((elapsed = (unsigned int) ((switch_timestamp_now() - started) / 1000)) > (switch_time_t) timeout) || switch_channel_get_state(channel) >= CS_HANGUP) { @@ -2135,6 +2140,7 @@ switch_yield(1000); } + JS_ResumeRequest(cx, saveDepth); return JS_TRUE; } @@ -2797,7 +2803,9 @@ const char *username = NULL; char *to = NULL; char *tmp; - + jsrefcount saveDepth; + switch_status_t status; + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); if (JS_ValueToObject(cx, argv[0], &session_obj)) { @@ -2847,8 +2855,11 @@ caller_profile = switch_caller_profile_new(pool,username, dialplan, cid_name, cid_num, network_addr, ani, aniii, rdnis, modname, context, dest); - if (switch_ivr_originate(session, &peer_session, &jss->cause, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile, SOF_NONE) - != SWITCH_STATUS_SUCCESS) { + saveDepth = JS_SuspendRequest(cx); + status = switch_ivr_originate(session, &peer_session, &jss->cause, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile, SOF_NONE); + JS_ResumeRequest(cx, saveDepth); + + if (status != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest); goto done; }

1 0

[commit] r7342 - in freeswitch/trunk/src/mod: applications/mod_dptools applications/mod_voicemail endpoints/mod_sofia
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: mikej Date: Thu Jan 24 06:56:57 2008 New Revision: 7342 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: use switch_event_add_header_string 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 Thu Jan 24 06:56:57 2008 @@ -1432,7 +1432,7 @@ switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "as_channel", "true"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "as_channel", "true"); if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, params) != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Thu Jan 24 06:56:57 2008 @@ -1568,9 +1568,9 @@ switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "mailbox", myid); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "destination_number", caller_profile->destination_number); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "caller_id_number", caller_profile->caller_id_number); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", myid); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "destination_number", caller_profile->destination_number); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "caller_id_number", caller_profile->caller_id_number); if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), @@ -1752,7 +1752,7 @@ switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "mailbox", id); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", id); x_user = x_domain = x_domain_root = NULL; if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), 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 Thu Jan 24 06:56:57 2008 @@ -856,9 +856,9 @@ switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "action", "sip_auth"); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "profile", profile->name); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "user_agent", (sip && sip->sip_user_agent) ? sip->sip_user_agent->g_string : "unknown"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "sip_auth"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile", profile->name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "user_agent", (sip && sip->sip_user_agent) ? sip->sip_user_agent->g_string : "unknown"); if (!switch_strlen_zero(profile->reg_domain)) {

1 0

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

24 Jan '08

Author: mikej Date: Thu Jan 24 06:47:28 2008 New Revision: 7341 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: use switch_event_add_header_string 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 Thu Jan 24 06:47:28 2008 @@ -850,7 +850,7 @@ switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "profile", profile_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile", profile_name); if (!(xml = switch_xml_open_cfg(cf, &cfg, params))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);

1 0

[commit] r7340 - freeswitch/branches/anthonyl/events-js
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: anthonyl Date: Thu Jan 24 00:32:28 2008 New Revision: 7340 Added: freeswitch/branches/anthonyl/events-js/ - copied from r7339, /freeswitch/trunk/ Log: new branch, will store some new modifications i made to the events engine realted stuff a short bit ago.

1 0

[commit] r7339 - freeswitch/branches/anthonyl/spidermonkey-stuff/src/mod/languages/mod_spidermonkey_openssl
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: anthonyl Date: Thu Jan 24 00:00:34 2008 New Revision: 7339 Added: freeswitch/branches/anthonyl/spidermonkey-stuff/src/mod/languages/mod_spidermonkey_openssl/mod_spidermonkey_openssl.c Log: basic outline of what this will look like, part of me really things this is unneeded bloat, but I do have a creative use or two for this.. oh well Added: freeswitch/branches/anthonyl/spidermonkey-stuff/src/mod/languages/mod_spidermonkey_openssl/mod_spidermonkey_openssl.c ============================================================================== --- (empty file) +++ freeswitch/branches/anthonyl/spidermonkey-stuff/src/mod/languages/mod_spidermonkey_openssl/mod_spidermonkey_openssl.c Thu Jan 24 00:00:34 2008 @@ -0,0 +1,181 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony LaMantia <anthony(a)petabit.net> + * + * + * mod_spidermonkey_openssl.c -- Experimental OpenSSL extension to Spidermonkey + * + */ +#include "mod_spidermonkey.h" +enum hash_flags { + HASH_FUNCTION_SHA1 = 1, + HASH_FUNCTION_MD5 = 2, + HASH_FUNCTION_MD4 = 3, +}; +enum cipher_flags { + CIPHER_FUNCTION_AES = 1, + CIPHER_FUNCTION_DSA = 2, + CIPHER_FUNCTION_RSA = 3, + CIPHER_FUNCTION_RC4 = 4, +}; +struct _hash_functions { + char *name; + unsigned char flag; + void *ptr; +} hash_functions[] = { + {"SHA1", HASH_FUNCTION_SHA1, NULL}, + {"MD5", HASH_FUNCTION_MD5, NULL}, + {"MD4", HASH_FUNCTION_MD4, NULL} +}; +struct _cipher_functions { + char *name; + unsigned char flag; + void *ptr; +} hash_functions[] = { + {"AES", CIPHER_FUNCTION_AES, NULL}, + {"DSA", CIPHER_FUNCTION_DSA, NULL}, + {"RSA", CIPHER_FUNCTION_RSA, NULL}, + {"RC4", CIPHER_FUNCTION_RC4, NULL}, +}; +static const char modname[] = "Crypto"; +struct openssl_pvt { + unsigned int hash_flag; + unsigned int cipher_flag; + char *pvt1; + char *pvt2; + JSContext *js_ctx; + JSObject *js_obj; + JSFunction *js_function; + JSObject *js_user_data; + jsrefcount js_saveDepth; + jsval js_ret; + +}; +/* Skel Object */ +/*********************************************************************************/ +static JSBool crypto_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct openssl_pvt *obj_pvt = NULL; + obj_pvt = malloc(sizeof(struct openssl_pvt)); + switch_assert(obj_pvt); + memset(obj_pvt, 0, sizeof(struct openssl_pvt)); + obj_pvt->js_cx = cx; + obj_pvt->js_obj = obj; + JS_SetPrivate(cx, obj, obj_pvt); + return JS_TRUE; +} +static void crypto_destroy(JSContext * cx, JSObject * obj) +{ + struct openssl_pvt *obj_pvt = JS_GetPrivate(cx, obj); + switch_safe_free(obj_pvt); + JS_SetPrivate(cx, obj, NULL); +} +static JSBool crypto_set_hashfunc(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + return JS_FALSE; +} +static JSBool crypto_set_cipherfunc(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + return JS_FALSE; +} +static JSBool crypto_set_cipherkey(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + return JS_FALSE; +} +static JSBool crypto_set_hashseed(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + return JS_FALSE; +} +static JSBool crypto_hash(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + return JS_FALSE; +} +static JSBool crypto_encrypt(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + return JS_FALSE; +} +enum crypto_tinyid { + CRYPTO_NAME +}; +static JSFunctionSpec crypto_methods[] = { + {"setHashFunc", crypto_set_hashfunc, 1}, + {"setHashSeed", crypto_set_hashseed, 1}, + {"setCipherFunc", crypto_set_cipherfunc, 1}, + {"setCipherKey", crypto_set_cipherkey, 1}, + {"Hash", crypto_hash, 1}, + {"Encrypt", crypto_encrypt, 1}, + {0} +}; + +static JSPropertySpec crypto_props[] = { + {"name", CRYPTO_NAME, JSPROP_READONLY | JSPROP_PERMANENT}, + {0} +}; + +static JSBool crypto_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp) +{ + JSBool res = JS_TRUE; + + return res; +} + +JSClass skel_class = { + modname, JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, crypto_getProperty, DEFAULT_SET_PROPERTY, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, crypto_destroy, NULL, NULL, NULL, + crypto_construct +}; + + +switch_status_t spidermonkey_load(JSContext * cx, JSObject * obj) +{ + JS_InitClass(cx, obj, NULL, &crypto_class, crypto_construct, 3, crypto_props, crypto_methods, crypto_props, crypto_methods); + return SWITCH_STATUS_SUCCESS; +} + + +const sm_module_interface_t crypto_module_interface = { + /*.name = */ modname, + /*.spidermonkey_load */ spidermonkey_load, + /*.next */ NULL +}; + +SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface) +{ + *module_interface = &crypto_module_interface; + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

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

23 Jan '08

Author: mikej Date: Wed Jan 23 16:38:59 2008 New Revision: 7338 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: don't scopemask vars. 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 Wed Jan 23 16:38:59 2008 @@ -326,10 +326,10 @@ nua_bye(tech_pvt->nh, TAG_END()); } else { if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - switch_call_cause_t cause = switch_channel_get_cause(channel); + switch_call_cause_t causecode = switch_channel_get_cause(channel); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel)); - nua_cancel(tech_pvt->nh, TAG_IF(cause == SWITCH_CAUSE_PICKED_OFF, + nua_cancel(tech_pvt->nh, TAG_IF(causecode == SWITCH_CAUSE_PICKED_OFF, SIPTAG_REASON_STR("SIP;cause=200;text=\"Call completed elsewhere\"")), TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause);

1 0

[commit] r7337 - freeswitch/trunk/src
by Freeswitch SVN 23 Jan '08

23 Jan '08

Author: mikej Date: Wed Jan 23 16:37:22 2008 New Revision: 7337 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: tweak buffer size smaller again Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Jan 23 16:37:22 2008 @@ -503,7 +503,7 @@ 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[SWITCH_RECOMMENDED_BUFFER_SIZE]; + int16_t buf[SWITCH_RECOMMENDED_BUFFER_SIZE/2]; switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession); uint32_t tlen = tread_codec->implementation->bytes_per_frame;

1 0

[commit] r7336 - freeswitch/trunk/src
by Freeswitch SVN 23 Jan '08

23 Jan '08

Author: mikej Date: Wed Jan 23 16:27:04 2008 New Revision: 7336 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: tweak buffer size Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Jan 23 16:27:04 2008 @@ -503,7 +503,7 @@ 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[8192]; + int16_t buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession); uint32_t tlen = tread_codec->implementation->bytes_per_frame;

1 0

[commit] r7335 - freeswitch/trunk/src
by Freeswitch SVN 23 Jan '08

23 Jan '08

Author: mikej Date: Wed Jan 23 16:21:18 2008 New Revision: 7335 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: type tweak Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Jan 23 16:21:18 2008 @@ -505,7 +505,7 @@ switch_codec_t codec = {0}; int16_t buf[8192]; switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession); - int tlen = tread_codec->implementation->bytes_per_frame; + uint32_t tlen = tread_codec->implementation->bytes_per_frame; ep = switch_core_session_alloc(session, sizeof(*ep));

1 0

[commit] r7334 - in freeswitch/trunk/src: . mod/xml_int/mod_xml_curl
by Freeswitch SVN 23 Jan '08

23 Jan '08

Author: anthm Date: Wed Jan 23 16:14:38 2008 New Revision: 7334 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/trunk/src/switch_event.c Log: change xml_lookups to take an event as params instead of url string this will break your xml_curl scripts please update Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Jan 23 16:14:38 2008 @@ -138,9 +138,8 @@ switch_str_nil(key_value)); data = switch_event_build_param_string(params, basic_data); - switch_assert(data); - printf("XXXXXXXXXXXXXXXXXXXX\n%s\n", data); + switch_uuid_get(&uuid); switch_uuid_format(uuid_str, &uuid); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Jan 23 16:14:38 2008 @@ -1310,28 +1310,29 @@ stream.write_function(&stream, "%s=%s&", prof_names[x], encode_buf); } - if ((hi = event->headers)) { - for (; hi; hi = hi->next) { - char *var = hi->name; - char *val = hi->value; + if (event) { + if ((hi = event->headers)) { + for (; hi; hi = hi->next) { + char *var = hi->name; + char *val = hi->value; - new_len = (strlen((char *) var) * 3) + 1; - if (encode_len < new_len) { - char *tmp; + new_len = (strlen((char *) var) * 3) + 1; + if (encode_len < new_len) { + char *tmp; - encode_len = new_len; + encode_len = new_len; - tmp = realloc(encode_buf, encode_len); - switch_assert(tmp); - encode_buf = tmp; - } + tmp = realloc(encode_buf, encode_len); + switch_assert(tmp); + encode_buf = tmp; + } - switch_url_encode((char *) val, encode_buf, encode_len - 1); - stream.write_function(&stream, "%s=%s&", (char *) var, encode_buf); + switch_url_encode((char *) val, encode_buf, encode_len - 1); + stream.write_function(&stream, "%s=%s&", (char *) var, encode_buf); + } } } - e = (char *) stream.data + (strlen((char *) stream.data) - 1); if (e && *e == '&') {

1 0