- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5702 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: mikej Date: Tue Sep 11 19:49:28 2007 New Revision: 5702 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: silence windows warning 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 Tue Sep 11 19:49:28 2007 @@ -341,12 +341,12 @@ { struct pcre_obj *pcre_obj; - if ((pcre_obj = malloc(sizeof(*pcre_obj)))) { - memset(pcre_obj, 0, sizeof(*pcre_obj)); - JS_SetPrivate(cx, obj, pcre_obj); - return JS_TRUE; + if (!((pcre_obj = malloc(sizeof(*pcre_obj))))) { + abort(); } - abort(); + memset(pcre_obj, 0, sizeof(*pcre_obj)); + JS_SetPrivate(cx, obj, pcre_obj); + return JS_TRUE; }

1 0

[commit] r5701 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: mikej Date: Tue Sep 11 19:29:50 2007 New Revision: 5701 Added: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj Log: MODLANG-21: Add socket module for spidermonkey from Jonas Gauffin methods: connect, close, send, readBytes, read. Note! It's completely untested. usage: var socket = new Socket(); socket.connect("hostname", 1234"); var line = socket.read(); socket.send("this is something\n"); The read method takes a delimiter and do not return until the delimiter have been received (or the connection have been dropped). The default delimiter is "\n". The readBytes method reads the number of specified bytes. only a TCP socket implementation. Added: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/Makefile Tue Sep 11 19:29:50 2007 @@ -0,0 +1,4 @@ +switch_srcdir=../../../.. + +include ../mod_spidermonkey/sm.mak + Added: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c Tue Sep 11 19:29:50 2007 @@ -0,0 +1,354 @@ +/* + * Spidermonkey Socket Module + * Copyright (C) 2007, Jonas Gauffin <jonas.gauffin(a)gmail.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 Initial Developer of the Original Code is + * Jonas Gauffin + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Jonas Gauffin <jonas.gauffin(a)gmail.com> + * + * + * mod_spidermonkey_socket.c -- Socket Javascript Module + * + */ +#include "mod_spidermonkey.h" + +static const char modname[] = "Socket"; + +struct js_socket_obj { + switch_socket_t *socket; + switch_memory_pool_t *pool; + char* read_buffer; + switch_size_t buffer_size; + int state; +}; +typedef struct js_socket_obj js_socket_obj_t; + +/* Socket Object */ +/*********************************************************************************/ +static JSBool socket_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + if (argc > 0) { + js_socket_obj_t* js_socket_obj = 0; + switch_memory_pool_t *pool; + switch_socket_t *socket; + + switch_core_new_memory_pool(&pool); + if (!switch_socket_create(&socket, AF_INET, SOCK_STREAM, SWITCH_PROTO_TCP, pool)) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Failed to create socket.\n"); + return JS_FALSE; + } + + // allocate information needed by JS to be able to write to the log. + // (needed since multitple js sessions can write to the same log) + js_socket_obj = switch_core_alloc(pool, sizeof(js_socket_obj_t)); + js_socket_obj->pool = pool; + js_socket_obj->socket = socket; + JS_SetPrivate(cx, obj, js_socket_obj); + return JS_TRUE; + } + + return JS_FALSE; +} + +static void socket_destroy(JSContext * cx, JSObject * obj) +{ + js_socket_obj_t *socket = JS_GetPrivate(cx, obj); + if (socket == NULL) + return; + + if (socket->socket != 0) + { + switch_socket_shutdown(socket->socket, SWITCH_SHUTDOWN_READWRITE); + switch_socket_close(socket->socket); + switch_core_destroy_memory_pool(&socket->pool); + } +} + +static JSBool socket_connect(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + js_socket_obj_t *socket = JS_GetPrivate(cx, obj); + if (socket == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n"); + return JS_FALSE; + } + + if (argc == 2) + { + char *host = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + int32 port; + switch_sockaddr_t *addr; + switch_status_t ret; + + JS_ValueToInt32(cx, argv[1], &port); + + ret = switch_sockaddr_info_get(&addr, host, AF_INET, (switch_port_t)port, 0, socket->pool); + if (ret != SWITCH_STATUS_SUCCESS) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_sockaddr_info_get failed: %d.\n", ret); + return JS_FALSE; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Connecting to: %s:%d.\n", host, port); + ret = switch_socket_connect(socket->socket, addr); + if (ret != SWITCH_STATUS_SUCCESS) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_connect failed: %d.\n", ret); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + } + else + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + + } + + return JS_TRUE; +} + +static JSBool socket_send(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + js_socket_obj_t *socket = JS_GetPrivate(cx, obj); + if (socket == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n"); + return JS_FALSE; + } + + if (argc == 1) + { + char *buffer = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + switch_size_t len = strlen(buffer); + switch_status_t ret = switch_socket_send(socket->socket, buffer, &len); + if (ret != SWITCH_STATUS_SUCCESS) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_send failed: %d.\n", ret); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + } + else + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + } + + return JS_TRUE; +} + +static JSBool socket_read_bytes(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + js_socket_obj_t *socket = JS_GetPrivate(cx, obj); + if (socket == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n"); + return JS_FALSE; + } + + if (argc == 1) + { + int32 bytes_to_read; + switch_status_t ret; + switch_size_t len; + + JS_ValueToInt32(cx, argv[0], &bytes_to_read); + len = (switch_size_t)bytes_to_read; + + if (socket->buffer_size < len) + { + socket->read_buffer = switch_core_alloc(socket->pool, len+1); + socket->buffer_size = bytes_to_read + 1; + } + + ret = switch_socket_recv(socket->socket, socket->read_buffer, &len); + if (ret != SWITCH_STATUS_SUCCESS) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_send failed: %d.\n", ret); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + } + else + { + socket->read_buffer[len] = 0; + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, socket->read_buffer)); + } + } + + return JS_TRUE; +} + +static JSBool socket_read(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + js_socket_obj_t *socket = JS_GetPrivate(cx, obj); + if (socket == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n"); + return JS_FALSE; + } + + if (argc >= 0) + { + char* delimiter = "\n"; + switch_status_t ret; + switch_size_t len = 1; + switch_size_t total_length = 0; + BOOL can_run = TRUE; + char tempbuf[2]; + + if (argc == 1) + delimiter = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + + + if (socket->read_buffer == 0) + socket->read_buffer = switch_core_alloc(socket->pool, socket->buffer_size); + + while (can_run == TRUE) + { + ret = switch_socket_recv(socket->socket, tempbuf, &len); + if (ret != SWITCH_STATUS_SUCCESS) + break; + + tempbuf[1] = 0; + if (tempbuf[0] == delimiter[0]) + break; + else if (tempbuf[0] == '\r' && delimiter[0] == '\n') + continue; + else + { + // Buffer is full, let's increase it. + if (total_length == socket->buffer_size - 1) + { + switch_size_t new_size = socket->buffer_size + 4196; + char* new_buffer = switch_core_alloc(socket->pool, socket->buffer_size); + memcpy(new_buffer, socket->read_buffer, total_length); + socket->buffer_size = new_size; + socket->read_buffer = new_buffer; + } + socket->read_buffer[total_length] = tempbuf[0]; + ++total_length; + } + } + if (ret != SWITCH_STATUS_SUCCESS) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "socket receive failed: %d.\n", ret); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + } + else + { + socket->read_buffer[total_length] = 0; + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, socket->read_buffer)); + } + } + + return JS_TRUE; +} + +static JSBool socket_close(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + js_socket_obj_t *socket = JS_GetPrivate(cx, obj); + if (socket == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n"); + return JS_FALSE; + } + + switch_socket_shutdown(socket->socket, SWITCH_SHUTDOWN_READWRITE); + switch_socket_close(socket->socket); + socket->socket = NULL; + return JS_TRUE; +} + +static JSFunctionSpec socket_methods[] = { + {"connect", socket_connect, 1}, + {"close", socket_close, 1}, + {"send", socket_send, 1}, + {"readBytes", socket_read_bytes, 1}, + {"read", socket_read, 1}, + {0} +}; + +#define SOCKET_ADDRESS 1 +#define SOCKET_PORT 2 + +static JSPropertySpec socket_props[] = { + {"address", SOCKET_ADDRESS, JSPROP_READONLY | JSPROP_PERMANENT}, + {"port", SOCKET_PORT, JSPROP_READONLY | JSPROP_PERMANENT}, + {0} +}; + + +static JSBool socket_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp) +{ + JSBool res = JS_TRUE; +// js_socket_obj_t *socket = JS_GetPrivate(cx, obj); + char *name; + int param = 0; + + name = JS_GetStringBytes(JS_ValueToString(cx, id)); + /* numbers are our props anything else is a method */ + if (name[0] >= 48 && name[0] <= 57) { + param = atoi(name); + } else { + return JS_TRUE; + } + + switch (param) { + case SOCKET_ADDRESS: + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, "unknown")); + break; + case SOCKET_PORT: + *vp = INT_TO_JSVAL(1234); + break; + } + + return res; +} + +JSClass socket_class = { + modname, JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, socket_getProperty, JS_PropertyStub, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, socket_destroy, NULL, NULL, NULL, + socket_construct +}; + + +switch_status_t socket_load(JSContext * cx, JSObject * obj) +{ + JS_InitClass(cx, obj, NULL, &socket_class, socket_construct, 3, socket_props, socket_methods, socket_props, socket_methods); + return SWITCH_STATUS_SUCCESS; +} + + +const sm_module_interface_t socket_module_interface = { + /*.name = */ modname, + /*.spidermonkey_load */ socket_load, + /*.next */ NULL +}; + +SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface) +{ + *module_interface = &socket_module_interface; + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Added: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj Tue Sep 11 19:29:50 2007 @@ -0,0 +1,205 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mod_spidermonkey_socket" + ProjectGUID="{028C7278-05D7-4E18-82FE-BE231B844F41}" + RootNamespace="mod_spidermonkey_socket" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkLibraryDependencies="true" + AdditionalOptions=""..\..\..\..\libs\win32\js\debug\js32.lib" "..\..\..\..\libs\win32\apr\debug\libapr-1.lib" "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\win32\debug\libetpan.lib" "..\mod_spidermonkey\debug\mod_spidermonkey.lib"" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" + GenerateDebugInformation="true" + SubSystem="2" + ImportLibrary="$(OutDir)/mod_spidermonkey_socket.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_SPIDERMONKEY_SOCKET_EXPORTS" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\mod_spidermonkey_socket.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r5700 - freeswitch/trunk/scripts/socket/FreeSWITCH
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: mikej Date: Tue Sep 11 18:33:08 2007 New Revision: 5700 Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm Log: Fix for MODAPP-27 from Bret McDanel. Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm ============================================================================== --- freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm (original) +++ freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm Tue Sep 11 18:33:08 2007 @@ -67,6 +67,7 @@ } if ($h->{'content-length'}) { + if(! defined $h->{body}) { $h->{body}=0; } while(length($h->{body}) < $h->{'content-length'}) { my $buf; recv $s, $buf, $h->{'content-length'} - length($h->{body}), 0;

1 0

[commit] r5699 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: mikej Date: Tue Sep 11 18:29:29 2007 New Revision: 5699 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: Fix for memory leak in xml-rpc (MDXMLINT-10) from Bret McDanel. Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Tue Sep 11 18:29:29 2007 @@ -272,7 +272,7 @@ static xmlrpc_value *freeswitch_api(xmlrpc_env * const envP, xmlrpc_value * const paramArrayP, void *const userData) { - char *command, *arg; + char *command = NULL, *arg = NULL; switch_stream_handle_t stream = { 0 }; xmlrpc_value *val = NULL; @@ -280,7 +280,7 @@ /* Parse our argument array. */ xmlrpc_decompose_value(envP, paramArrayP, "(ss)", &command, &arg); if (envP->fault_occurred) { - return NULL; + goto done; } SWITCH_STANDARD_STREAM(stream); @@ -292,20 +292,24 @@ val = xmlrpc_build_value(envP, "s", "ERROR!"); } +done: + /* xmlrpc-c requires us to free memory it malloced from xmlrpc_decompose_value */ + switch_safe_free(command); + switch_safe_free(arg); return val; } static xmlrpc_value *freeswitch_man(xmlrpc_env * const envP, xmlrpc_value * const paramArrayP, void *const userData) { - char *oid, *relative_oid, *s_action, *data; + char *oid = NULL, *relative_oid, *s_action = NULL, *data = NULL; char buf[SWITCH_MAX_MANAGEMENT_BUFFER_LEN] = ""; switch_management_action_t action = SMA_NONE; - xmlrpc_value *val; + xmlrpc_value *val = NULL; /* Parse our argument array. */ xmlrpc_decompose_value(envP, paramArrayP, "(sss)", &oid, &s_action, &data); if (envP->fault_occurred) { - return NULL; + goto done; } if (!strncasecmp(oid, FREESWITCH_OID_PREFIX, strlen(FREESWITCH_OID_PREFIX))) { @@ -343,7 +347,11 @@ /* Return our result. */ val = xmlrpc_build_value(envP, "s", buf); - +done: + /* xmlrpc-c requires us to free memory it malloced from xmlrpc_decompose_value */ + switch_safe_free(oid); + switch_safe_free(s_action); + switch_safe_free(data); return val; }

1 0

[commit] r5698 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: anthm Date: Tue Sep 11 17:19:16 2007 New Revision: 5698 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add getGlobalVariable function to access FS globals 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 Tue Sep 11 17:19:16 2007 @@ -1726,12 +1726,12 @@ if (switch_strlen_zero(tts_name)) { eval_some_js("~throw new Error(\"Invalid TTS Name\");", cx, obj, rval); - return JS_TRUE; + return JS_FALSE; } if (switch_strlen_zero(text)) { eval_some_js("~throw new Error(\"Invalid Text\");", cx, obj, rval); - return JS_TRUE; + return JS_FALSE; } @@ -1747,7 +1747,7 @@ if (init_speech_engine(jss, tts_name, voice_name) != SWITCH_STATUS_SUCCESS) { eval_some_js("~throw new Error(\"Cannot allocate speech engine!\");", cx, obj, rval); jss->speech = NULL; - return JS_TRUE; + return JS_FALSE; } } @@ -2886,6 +2886,23 @@ return JS_FALSE; } + + +static JSBool js_global(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + char *var_name = NULL, *val = NULL; + + if (argc > 0) { + var_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + val = switch_core_get_variable(var_name); + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val)); + return JS_TRUE; + } + + eval_some_js("~throw new Error(\"var name not supplied!\");", cx, obj, rval); + return JS_FALSE; +} + static JSBool js_include(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { char *code; @@ -2974,25 +2991,25 @@ if (JS_ValueToObject(cx, argv[0], &session_obj_a)) { if (!(jss_a = JS_GetPrivate(cx, session_obj_a))) { eval_some_js("~throw new Error(\"Cannot find session A\");", cx, obj, rval); - return JS_TRUE; + return JS_FALSE; } } if (JS_ValueToObject(cx, argv[1], &session_obj_b)) { if (!(jss_b = JS_GetPrivate(cx, session_obj_b))) { eval_some_js("~throw new Error(\"Cannot find session B\");", cx, obj, rval); - return JS_TRUE; + return JS_FALSE; } } } if (!(jss_a && jss_a->session)) { eval_some_js("~throw new Error(\"session A is not ready!\");", cx, obj, rval); - return JS_TRUE; + return JS_FALSE; } if (!(jss_b && jss_b->session)) { eval_some_js("~throw new Error(\"session B is not ready!\");", cx, obj, rval); - return JS_TRUE; + return JS_FALSE; } @@ -3057,6 +3074,7 @@ static JSFunctionSpec fs_functions[] = { {"console_log", js_log, 2}, {"consoleLog", js_log, 2}, + {"getGlobalVariable", js_global, 2}, {"exit", js_exit, 0}, {"include", js_include, 1}, {"bridge", js_bridge, 2},

1 0

[commit] r5697 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: anthm Date: Tue Sep 11 16:41:16 2007 New Revision: 5697 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: tweak to avoid cepstral crash Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Sep 11 16:41:16 2007 @@ -161,6 +161,7 @@ uint8_t async; switch_memory_pool_t *pool; uint32_t leadin; + int nv; struct conference_file_node *next; } conference_file_node_t; @@ -2274,9 +2275,11 @@ text = tmp + 1; switch_copy_string(voice, vp, (tmp - vp) + 1); switch_core_speech_text_param_tts(fnode->sh, "voice", voice); + fnode->nv = 1; } - } else { + } else if (fnode->nv) { switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice); + fnode->nv = 0; } switch_core_speech_feed_tts(fnode->sh, text, &flags); @@ -2363,9 +2366,11 @@ text = tmp + 1; switch_copy_string(voice, vp, (tmp - vp) + 1); switch_core_speech_text_param_tts(fnode->sh, "voice", voice); + fnode->nv = 1; } - } else { + } else if (fnode->nv) { switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice); + fnode->nv = 0; } /* Begin Generation */

1 0

[commit] r5696 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: anthm Date: Tue Sep 11 16:40:49 2007 New Revision: 5696 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix warns 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 Tue Sep 11 16:40:49 2007 @@ -1688,7 +1688,7 @@ void process_rpid(sip_unknown_t *un, private_object_t *tech_pvt) { int argc, x, screen = 1; - char *mydata, *user, *argv[10] = { 0 }; + char *mydata, *argv[10] = { 0 }; char *display = NULL; size_t n = 0; @@ -1702,7 +1702,7 @@ tech_pvt->caller_profile->caller_id_name = switch_core_session_strdup(tech_pvt->session, display); } if (*argv[0] == '<') { - char *start, *end; + char *end; argv[0]++; n = strcspn(argv[0], ":"); argv[0] += (n + 1);

1 0

[commit] r5695 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: anthm Date: Tue Sep 11 13:33:06 2007 New Revision: 5695 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: Add PCRE object to javascript var re = new PCRE(); if (re.compile("the answer is 42", '(\\d+)')) { answer = re.substitute("$1"); console_log("err", "result [" + answer + "]\n"); } 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 Tue Sep 11 13:33:06 2007 @@ -327,7 +327,145 @@ return NULL; } +struct pcre_obj { + switch_regex_t *re; + char *string; + int proceed; + int ovector[30]; + int freed; +}; + +/* Pcre Object */ +/*********************************************************************************/ +static JSBool pcre_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct pcre_obj *pcre_obj; + + if ((pcre_obj = malloc(sizeof(*pcre_obj)))) { + memset(pcre_obj, 0, sizeof(*pcre_obj)); + JS_SetPrivate(cx, obj, pcre_obj); + return JS_TRUE; + } + abort(); + +} +static void pcre_destroy(JSContext * cx, JSObject * obj) +{ + struct pcre_obj *pcre_obj = JS_GetPrivate(cx, obj); + + if (pcre_obj) { + if (!pcre_obj->freed && pcre_obj->re) { + switch_regex_safe_free(pcre_obj->re); + switch_safe_free(pcre_obj->string); + } + switch_safe_free(pcre_obj); + } +} + +static JSBool pcre_compile(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct pcre_obj *pcre_obj = JS_GetPrivate(cx, obj); + char *string, *regex_string; + + if (argc > 1) { + string = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + regex_string = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + switch_regex_safe_free(pcre_obj->re); + switch_safe_free(pcre_obj->string); + pcre_obj->string = strdup(string); + pcre_obj->proceed = switch_regex_perform(pcre_obj->string, regex_string, &pcre_obj->re, pcre_obj->ovector, + sizeof(pcre_obj->ovector) / sizeof(pcre_obj->ovector[0])); + *rval = BOOLEAN_TO_JSVAL(pcre_obj->proceed ? JS_TRUE : JS_FALSE); + } else { + eval_some_js("~throw new Error(\"Invalid Args\");", cx, obj, rval); + return JS_FALSE; + } + + return JS_TRUE; +} + +static JSBool pcre_substitute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct pcre_obj *pcre_obj = JS_GetPrivate(cx, obj); + char *subst_string; + char *substituted; + + if (!pcre_obj->proceed) { + eval_some_js("~throw new Error(\"REGEX is not compiled or has no matches\");", cx, obj, rval); + return JS_FALSE; + } + + if (argc > 0) { + uint32_t len; + subst_string = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + len = (uint32_t) (strlen(pcre_obj->string) + strlen(subst_string) + 10); + substituted = malloc(len); + assert(substituted != NULL); + switch_perform_substitution(pcre_obj->re, pcre_obj->proceed, subst_string, pcre_obj->string, substituted, len, pcre_obj->ovector); + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, substituted)); + free(substituted); + } else { + eval_some_js("~throw new Error(\"Invalid Args\");", cx, obj, rval); + return JS_FALSE; + } + + return JS_TRUE; +} + +enum pcre_tinyid { + PCRE_READY +}; + +static JSFunctionSpec pcre_methods[] = { + {"compile", pcre_compile, 2}, + {"substitute", pcre_substitute, 2}, + {0} +}; + + +static JSPropertySpec pcre_props[] = { + {"ready", PCRE_READY, JSPROP_READONLY | JSPROP_PERMANENT}, + {0} +}; + + +static JSBool pcre_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp) +{ + JSBool res = JS_TRUE; + struct pcre_obj *pcre_obj = JS_GetPrivate(cx, obj); + char *name; + int param = 0; + + if (!pcre_obj) { + *vp = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + + name = JS_GetStringBytes(JS_ValueToString(cx, id)); + /* numbers are our props anything else is a method */ + if (name[0] >= 48 && name[0] <= 57) { + param = atoi(name); + } else { + return JS_TRUE; + } + + switch (param) { + case PCRE_READY: + *vp = BOOLEAN_TO_JSVAL(JS_TRUE); + break; + } + + return res; +} + +JSClass pcre_class = { + "PCRE", JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, pcre_getProperty, DEFAULT_SET_PROPERTY, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, pcre_destroy, NULL, NULL, NULL, + pcre_construct +}; struct event_obj { switch_event_t *event; @@ -2947,6 +3085,8 @@ JS_InitClass(cx, javascript_object, NULL, &event_class, event_construct, 3, event_props, event_methods, event_props, event_methods); + JS_InitClass(cx, javascript_object, NULL, &pcre_class, pcre_construct, 3, pcre_props, pcre_methods, pcre_props, pcre_methods); + return 1; }

1 0

[commit] r5694 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: mikej Date: Tue Sep 11 10:51:13 2007 New Revision: 5694 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: actually take the caller id name and/or number from the rpid. Still incomplete, but should do a better job 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 Tue Sep 11 10:51:13 2007 @@ -34,6 +34,8 @@ * */ #include "mod_sofia.h" +#include "sofia-sip/msg_parser.h" + extern su_log_t tport_log[]; static void sofia_handle_sip_i_state(switch_core_session_t *session, int status, @@ -1686,13 +1688,29 @@ void process_rpid(sip_unknown_t *un, private_object_t *tech_pvt) { int argc, x, screen = 1; - char *mydata, *argv[10] = { 0 }; + char *mydata, *user, *argv[10] = { 0 }; + char *display = NULL; + size_t n = 0; + if (!switch_strlen_zero(un->un_value)) { if ((mydata = strdup(un->un_value))) { argc = switch_separate_string(mydata, ';', argv, (sizeof(argv) / sizeof(argv[0]))); - // Do We really need this at this time - // clid_uri = argv[0]; + /* FIXME: This is completely insufficient parsing code, and should use the parsers from sofia-sip */ + if (*argv[0] == '"') { + if (msg_quoted_d(&argv[0], &display) != -1) + tech_pvt->caller_profile->caller_id_name = switch_core_session_strdup(tech_pvt->session, display); + } + if (*argv[0] == '<') { + char *start, *end; + argv[0]++; + n = strcspn(argv[0], ":"); + argv[0] += (n + 1); + n = strcspn(argv[0], "@"); + end = argv[0] + n; + if (*end) *end++ = '\0'; + tech_pvt->caller_profile->caller_id_number = switch_core_session_strdup(tech_pvt->session, argv[0]); + } for (x = 1; x < argc && argv[x]; x++) { // we dont need to do anything with party yet we should only be seeing party=calling here anyway @@ -1701,7 +1719,7 @@ // party = argv[x]; // } else if (!strncasecmp(argv[x], "privacy=", 8)) { - char *arg = argv[x] + 9; + char *arg = argv[x] + 8; if (!strcasecmp(arg, "yes")) { switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER);

1 0

[commit] r5693 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: anthm Date: Tue Sep 11 09:52:32 2007 New Revision: 5693 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix nua_i_error 500 when responding to OPTIONS 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 Tue Sep 11 09:52:32 2007 @@ -2007,6 +2007,7 @@ nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]) { nua_respond(nh, SIP_200_OK, + NUTAG_WITH_THIS(nua), //SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), //SOATAG_AUDIO_AUX("cn telephone-event"), //NUTAG_INCLUDE_EXTRA_SDP(1),

1 0