- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5170 - freeswitch/trunk
by Freeswitch SVN 14 May '07

14 May '07

Author: anthm Date: Mon May 14 09:54:52 2007 New Revision: 5170 Modified: freeswitch/trunk/bootstrap.sh Log: deal with extra _x in autoconf version Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon May 14 09:54:52 2007 @@ -33,6 +33,7 @@ fi # automake 1.7 or newer + am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'` if test -z "$am_version"; then echo "bootstrap: automake not found." @@ -40,6 +41,8 @@ echo " to build FreeSWITCH from SVN." exit 1 fi +IFS=_; set $am_version; IFS=' ' +am_version=$1 IFS=.; set $am_version; IFS=' ' if test "$1" = "1" -a "$2" -lt "7"; then echo "bootstrap: automake version $am_version found."

1 0

[commit] r5169 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 14 May '07

14 May '07

Author: anthm Date: Sun May 13 23:17:38 2007 New Revision: 5169 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add jsapi api function 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 Sun May 13 23:17:38 2007 @@ -45,6 +45,7 @@ static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static switch_api_interface_t js_run_interface; +static switch_api_interface_t jsapi_interface; static struct { size_t gStackChunkSize; @@ -111,6 +112,190 @@ int32 bufsize; }; +struct request_obj { + const char *cmd; + switch_core_session_t *session; + switch_stream_handle_t *stream; +}; + + +/* Request Object */ +/*********************************************************************************/ + +static JSBool request_write(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct request_obj *ro = JS_GetPrivate(cx, obj); + + if (!ro) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + if (argc > 0) { + char *string = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + ro->stream->write_function(ro->stream, "%s", string); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; +} + +static JSBool request_add_header(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct request_obj *ro = JS_GetPrivate(cx, obj); + + if (!ro) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + if (argc > 1) { + char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + char *hval = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + switch_event_add_header(ro->stream->event, SWITCH_STACK_BOTTOM, hname, "%s", hval); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; +} + +static JSBool request_get_header(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct request_obj *ro = JS_GetPrivate(cx, obj); + + if (!ro) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + + if (argc > 0) { + char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + char *val = switch_event_get_header(ro->stream->event, hname); + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val)); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; +} + +static JSBool request_dump_env(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct request_obj *ro = JS_GetPrivate(cx, obj); + char *how = "text"; + + if (!ro) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + if (argc > 0) { + how = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + } + + if (!strcasecmp(how, "xml")) { + switch_xml_t xml; + char *xmlstr; + if ((xml = switch_event_xmlize(ro->stream->event, NULL))) { + xmlstr = switch_xml_toxml(xml); + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, xmlstr)); + return JS_TRUE; + } + } else { + char *buf; + switch_event_serialize(ro->stream->event, &buf); + if (buf) { + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf)); + free(buf); + return JS_TRUE; + } + } + + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_FALSE; +} + +static void request_destroy(JSContext * cx, JSObject * obj) +{ + +} + +enum request_tinyid { + REQUEST_COMMAND +}; + +static JSFunctionSpec request_methods[] = { + {"write", request_write, 1}, + {"getHeader", request_get_header, 1}, + {"addHeader", request_add_header, 1}, + {"dumpENV", request_dump_env, 1}, + {0} +}; + +static JSPropertySpec request_props[] = { + {"command", REQUEST_COMMAND, JSPROP_READONLY | JSPROP_PERMANENT}, + {0} +}; + + +static JSBool request_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) +{ + JSBool res = JS_TRUE; + struct request_obj *ro = JS_GetPrivate(cx, obj); + char *name; + int param = 0; + + if (!ro) { + *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 REQUEST_COMMAND: + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, ro->cmd)); + break; + } + + return res; +} + + +JSClass request_class = { + "Request", JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, request_getProperty, JS_PropertyStub, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, request_destroy, NULL, NULL, NULL, NULL +}; + + +static JSObject *new_request(JSContext *cx, JSObject *obj, struct request_obj *ro) +{ + JSObject *Request; + if ((Request = JS_DefineObject(cx, obj, "request", &request_class, NULL, 0))) { + if ((JS_SetPrivate(cx, Request, ro) && + JS_DefineProperties(cx, Request, request_props) && JS_DefineFunctions(cx, Request, request_methods))) { + return Request; + } + } + + return NULL; +} + + + struct event_obj { switch_event_t *event; int freed; @@ -402,8 +587,6 @@ }; - - static void js_error(JSContext * cx, const char *message, JSErrorReport * report) { const char *filename = __FILE__; @@ -2649,7 +2832,7 @@ return 1; } -static void js_parse_and_execute(switch_core_session_t *session, char *input_code) +static void js_parse_and_execute(switch_core_session_t *session, char *input_code, struct request_obj *ro) { JSObject *javascript_global_object = NULL; char buf[1024], *script, *arg, *argv[512]; @@ -2671,6 +2854,10 @@ if (session && new_js_session(cx, javascript_global_object, session, &jss, "session", flags)) { JS_SetPrivate(cx, javascript_global_object, session); } + if (ro) { + new_request(cx, javascript_global_object, ro); + } + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Allocation Error!\n"); return; @@ -2683,7 +2870,11 @@ argc = switch_separate_string(arg, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } - if (argc) { /* create a js doppleganger of this argc/argv */ + if (!argc) { + snprintf(buf, sizeof(buf), "~var argv = new Array();"); + eval_some_js(buf, cx, javascript_global_object, &rval); + } else { + /* create a js doppleganger of this argc/argv */ snprintf(buf, sizeof(buf), "~var argv = new Array(%d);", argc); eval_some_js(buf, cx, javascript_global_object, &rval); snprintf(buf, sizeof(buf), "~var argc = %d", argc); @@ -2701,14 +2892,16 @@ } } - - +static void js_dp_function(switch_core_session_t *session, char *input_code) +{ + js_parse_and_execute(session, input_code, NULL); +} static void *SWITCH_THREAD_FUNC js_thread_run(switch_thread_t * thread, void *obj) { char *input_code = obj; - js_parse_and_execute(NULL, input_code); + js_parse_and_execute(NULL, input_code, NULL); if (input_code) { free(input_code); @@ -2738,6 +2931,23 @@ switch_thread_create(&thread, thd_attr, js_thread_run, strdup(text), module_pool); } +SWITCH_STANDARD_API(jsapi_function) +{ + struct request_obj ro = {0}; + + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "USAGE: %s\n", jsapi_interface.syntax); + return SWITCH_STATUS_SUCCESS; + } + + ro.cmd = cmd; + ro.session = session; + ro.stream = stream; + js_parse_and_execute(session, (char *) cmd, &ro); + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_STANDARD_API(launch_async) { @@ -2755,7 +2965,7 @@ static const switch_application_interface_t ivrtest_application_interface = { /*.interface_name */ "javascript", - /*.application_function */ js_parse_and_execute, + /*.application_function */ js_dp_function, /* long_desc */ "Run a javascript ivr on a channel", /* short_desc */ "Launch JS ivr.", /* syntax */ "<script> [additional_vars [...]]", @@ -2764,12 +2974,21 @@ /*.next */ NULL }; + +static switch_api_interface_t jsapi_interface = { + /*.interface_name */ "jsapi", + /*.desc */ "execute an api call", + /*.function */ jsapi_function, + /*.syntax */ "jsapi <script> [additional_vars [...]]", + /*.next */ NULL +}; + static switch_api_interface_t js_run_interface = { /*.interface_name */ "jsrun", /*.desc */ "run a script", /*.function */ launch_async, /*.syntax */ "jsrun <script> [additional_vars [...]]", - /*.next */ NULL + /*.next */ &jsapi_interface }; static switch_loadable_module_interface_t spidermonkey_module_interface = {

1 0

[commit] r5168 - in freeswitch/trunk/src: . include
by Freeswitch SVN 12 May '07

12 May '07

Author: mikej Date: Sat May 12 17:43:41 2007 New Revision: 5168 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr_async.c Log: create macro to define scheduler function prototypes. Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat May 12 17:43:41 2007 @@ -1013,8 +1013,13 @@ typedef void (*switch_application_function_t) (switch_core_session_t *, char *); typedef void (*switch_event_callback_t) (switch_event_t *); typedef switch_caller_extension_t *(*switch_dialplan_hunt_function_t) (switch_core_session_t *, void *, switch_caller_profile_t *); + typedef struct switch_scheduler_task switch_scheduler_task_t; + typedef void (*switch_scheduler_func_t) (switch_scheduler_task_t *task); + +#define SWITCH_STANDARD_SCHED_FUNC(name) static void name (switch_scheduler_task_t *task) + typedef switch_status_t (*switch_state_handler_t) (switch_core_session_t *); typedef struct switch_stream_handle switch_stream_handle_t; typedef switch_status_t (*switch_stream_handle_write_function_t) (switch_stream_handle_t *handle, const char *fmt, ...); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat May 12 17:43:41 2007 @@ -71,7 +71,7 @@ } } -static void heartbeat_callback(switch_scheduler_task_t *task) +SWITCH_STANDARD_SCHED_FUNC(heartbeat_callback) { send_heartbeat(); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Sat May 12 17:43:41 2007 @@ -615,7 +615,7 @@ switch_call_cause_t cause; }; -static void sch_hangup_callback(switch_scheduler_task_t *task) +SWITCH_STANDARD_SCHED_FUNC(sch_hangup_callback) { struct hangup_helper *helper; switch_core_session_t *session, *other_session; @@ -665,7 +665,7 @@ char *context; }; -static void sch_transfer_callback(switch_scheduler_task_t *task) +SWITCH_STANDARD_SCHED_FUNC(sch_transfer_callback) { struct transfer_helper *helper; switch_core_session_t *session; @@ -732,7 +732,7 @@ switch_media_flag_t flags; }; -static void sch_broadcast_callback(switch_scheduler_task_t *task) +SWITCH_STANDARD_SCHED_FUNC(sch_broadcast_callback) { struct broadcast_helper *helper; assert(task);

1 0

[commit] r5167 - in freeswitch/trunk/src: include mod/applications/mod_commands mod/applications/mod_conference mod/applications/mod_dptools mod/applications/mod_enum mod/endpoints/mod_alsa mod/endpoints/mod_dingaling mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/event_handlers/mod_cdr mod/languages/mod_python mod/languages/mod_spidermonkey
by Freeswitch SVN 12 May '07

12 May '07

Author: mikej Date: Sat May 12 17:36:15 2007 New Revision: 5167 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: create macro to define api command prototypes. Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat May 12 17:36:15 2007 @@ -1018,7 +1018,11 @@ typedef switch_status_t (*switch_state_handler_t) (switch_core_session_t *); typedef struct switch_stream_handle switch_stream_handle_t; typedef switch_status_t (*switch_stream_handle_write_function_t) (switch_stream_handle_t *handle, const char *fmt, ...); -typedef switch_status_t (*switch_api_function_t) (const char *in, switch_core_session_t *session, switch_stream_handle_t *stream); + +typedef switch_status_t (*switch_api_function_t) (const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream); + +#define SWITCH_STANDARD_API(name) static switch_status_t name (const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) + typedef switch_status_t (*switch_input_callback_function_t) (switch_core_session_t *session, void *input, switch_input_type_t input_type, void *buf, unsigned int buflen); typedef struct switch_say_interface switch_say_interface_t; 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 Sat May 12 17:36:15 2007 @@ -57,7 +57,7 @@ static switch_api_interface_t sched_transfer_api_interface; static switch_api_interface_t sched_hangup_api_interface; -static switch_status_t status_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(status_function) { uint8_t html = 0; switch_core_time_duration_t duration; @@ -107,18 +107,18 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t ctl_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(ctl_function) { int argc; char *mydata, *argv[5]; uint32_t arg = 0; - if (switch_strlen_zero(data)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", ctl_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if ((mydata = strdup(data))) { + if ((mydata = strdup(cmd))) { argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (!strcmp(argv[0], "hupall")) { @@ -149,7 +149,7 @@ } -static switch_status_t load_function(const char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(load_function) { const char *err; @@ -157,12 +157,12 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(mod)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", load_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) { + if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "OK\n"); } else { stream->write_function(stream, "ERROR [%s]\n", err); @@ -171,7 +171,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t unload_function(const char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(unload_function) { const char *err; @@ -179,12 +179,12 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(mod)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", unload_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod, &err) == SWITCH_STATUS_SUCCESS) { + if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, &err) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "OK\n"); } else { stream->write_function(stream, "ERROR [%s]\n", err); @@ -193,7 +193,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t reload_function(const char *args, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(reload_function) { const char *err; switch_xml_t xml_root; @@ -211,20 +211,20 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t kill_function(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(kill_function) { - switch_core_session_t *session = NULL; + switch_core_session_t *ksession = NULL; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } - if (!dest) { + if (!cmd) { stream->write_function(stream, "USAGE: %s\n", kill_api_interface.syntax); - } else if ((session = switch_core_session_locate(dest))) { - switch_channel_t *channel = switch_core_session_get_channel(session); + } else if ((ksession = switch_core_session_locate(cmd))) { + switch_channel_t *channel = switch_core_session_get_channel(ksession); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(ksession); stream->write_function(stream, "OK\n"); } else { stream->write_function(stream, "No Such Channel!\n"); @@ -233,13 +233,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t transfer_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(transfer_function) { - switch_core_session_t *session = NULL; + switch_core_session_t *tsession = NULL; char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } @@ -251,15 +251,15 @@ char *dp = argv[2]; char *context = argv[3]; - if ((session = switch_core_session_locate(uuid))) { + if ((tsession = switch_core_session_locate(uuid))) { - if (switch_ivr_session_transfer(session, dest, dp, context) == SWITCH_STATUS_SUCCESS) { + if (switch_ivr_session_transfer(tsession, dest, dp, context) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "OK\n"); } else { stream->write_function(stream, "ERROR\n"); } - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(tsession); } else { stream->write_function(stream, "No Such Channel!\n"); @@ -276,13 +276,13 @@ } -static switch_status_t sched_transfer_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_transfer_function) { - switch_core_session_t *session = NULL; + switch_core_session_t *tsession = NULL; char *mycmd = NULL, *argv[6] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } @@ -305,10 +305,10 @@ when = atol(argv[0]); } - if ((session = switch_core_session_locate(uuid))) { + if ((tsession = switch_core_session_locate(uuid))) { switch_ivr_schedule_transfer(when, uuid, dest, dp, context); stream->write_function(stream, "OK\n"); - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(tsession); } else { stream->write_function(stream, "No Such Channel!\n"); } @@ -318,13 +318,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_hangup_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_hangup_function) { - switch_core_session_t *session = NULL; + switch_core_session_t *hsession = NULL; char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } @@ -350,10 +350,10 @@ cause = switch_channel_str2cause(cause_str); } - if ((session = switch_core_session_locate(uuid))) { + if ((hsession = switch_core_session_locate(uuid))) { switch_ivr_schedule_hangup(when, uuid, cause, SWITCH_FALSE); stream->write_function(stream, "OK\n"); - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(hsession); } else { stream->write_function(stream, "No Such Channel!\n"); } @@ -364,13 +364,13 @@ } -static switch_status_t uuid_media_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(uuid_media_function) { char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (isession) { + if (session) { return status; } @@ -399,13 +399,13 @@ } -static switch_status_t uuid_broadcast_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(uuid_broadcast_function) { char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (isession) { + if (session) { return status; } @@ -439,13 +439,13 @@ } -static switch_status_t sched_broadcast_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_broadcast_function) { char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (isession) { + if (session) { return status; } @@ -485,13 +485,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_hold_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(uuid_hold_function) { char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (isession) { + if (session) { return status; } @@ -519,12 +519,12 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_bridge_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(uuid_bridge_function) { char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } @@ -544,14 +544,14 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t session_record_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(session_record_function) { - switch_core_session_t *session = NULL; + switch_core_session_t *rsession = NULL; char *mycmd = NULL, *argv[4] = { 0 }; char *uuid = NULL, *action = NULL, *path = NULL; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } @@ -571,7 +571,7 @@ action = argv[1]; path = argv[2]; - if (!(session = switch_core_session_locate(uuid))) { + if (!(rsession = switch_core_session_locate(uuid))) { stream->write_function(stream, "-Error Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } @@ -581,9 +581,9 @@ } if (!strcasecmp(action, "start")) { - switch_ivr_record_session(session, path, NULL); + switch_ivr_record_session(rsession, path, NULL); } else if (!strcasecmp(action, "stop")) { - switch_ivr_stop_record_session(session, path); + switch_ivr_stop_record_session(rsession, path); } else { goto usage; } @@ -599,20 +599,20 @@ done: if (session) { - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(rsession); } switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t pause_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(pause_function) { - switch_core_session_t *session = NULL; + switch_core_session_t *psession = NULL; char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } @@ -626,8 +626,8 @@ char *uuid = argv[0]; char *dest = argv[1]; - if ((session = switch_core_session_locate(uuid))) { - switch_channel_t *channel = switch_core_session_get_channel(session); + if ((psession = switch_core_session_locate(uuid))) { + switch_channel_t *channel = switch_core_session_get_channel(psession); if (!strcasecmp(dest, "on")) { switch_channel_set_flag(channel, CF_HOLD); @@ -635,7 +635,7 @@ switch_channel_clear_flag(channel, CF_HOLD); } - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(psession); } else { stream->write_function(stream, "No Such Channel!\n"); @@ -646,7 +646,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t originate_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(originate_function) { switch_channel_t *caller_channel; switch_core_session_t *caller_session = NULL; @@ -657,7 +657,7 @@ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; uint8_t machine = 1; - if (isession) { + if (session) { stream->write_function(stream, "Illegal Usage\n"); return SWITCH_STATUS_SUCCESS; } @@ -775,7 +775,7 @@ switch_safe_free(stream.data); } -static switch_status_t sched_del_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_del_function) { uint32_t cnt = 0; @@ -794,7 +794,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t xml_wrap_api_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(xml_wrap_api_function) { char *dcommand, *edata = NULL, *send = NULL, *command, *arg = NULL; switch_stream_handle_t mystream = { 0 }; @@ -843,7 +843,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_api_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_api_function) { char *tm = NULL, *dcmd, *group; time_t when; @@ -979,7 +979,7 @@ return 0; } -static switch_status_t show_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(show_function) { char sql[1024]; char *errmsg; @@ -988,15 +988,15 @@ int help = 0; char *mydata = NULL, *argv[6] = {0}; int argc; - char *cmd = NULL, *as = NULL; + char *command = NULL, *as = NULL; if (session) { return SWITCH_STATUS_FALSE; } - if (data && (mydata = strdup(data))) { + if (cmd && (mydata = strdup(cmd))) { argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - cmd = argv[0]; + command = argv[0]; if (argv[2] && !strcasecmp(argv[1], "as")) { as = argv[2]; } @@ -1010,25 +1010,25 @@ // If you changes the field qty or order of any of these select // statmements, you must also change show_callback and friends to match! - if (!cmd) { + if (!command) { stream->write_function(stream, "USAGE: %s\n", show_api_interface.syntax); return SWITCH_STATUS_SUCCESS; - } else if (!strcmp(cmd, "codec") || !strcmp(cmd, "dialplan") || !strcmp(cmd, "file") || !strcmp(cmd, "timer")) { - sprintf(sql, "select type, name from interfaces where type = '%s'", cmd); - } else if (!strcmp(cmd, "tasks")) { - sprintf(sql, "select * from %s", cmd); - } else if (!strcmp(cmd, "application") || !strcmp(cmd, "api")) { - sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != ''", cmd); - } else if (!strcmp(cmd, "calls")) { + } else if (!strcmp(command, "codec") || !strcmp(command, "dialplan") || !strcmp(command, "file") || !strcmp(command, "timer")) { + sprintf(sql, "select type, name from interfaces where type = '%s'", command); + } else if (!strcmp(command, "tasks")) { + sprintf(sql, "select * from %s", command); + } else if (!strcmp(command, "application") || !strcmp(command, "api")) { + sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != ''", command); + } else if (!strcmp(command, "calls")) { sprintf(sql, "select * from calls"); - } else if (!strcmp(cmd, "channels")) { + } else if (!strcmp(command, "channels")) { sprintf(sql, "select * from channels"); - } else if (!strncasecmp(cmd, "help", 4)) { + } else if (!strncasecmp(command, "help", 4)) { char *cmdname = NULL; help = 1; holder.print_title = 0; - if ((cmdname = strchr(cmd, ' ')) != 0) { + if ((cmdname = strchr(command, ' ')) != 0) { *cmdname++ = '\0'; snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); } else { @@ -1100,7 +1100,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t version_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(version_function) { char version_string[1024]; snprintf(version_string, sizeof(version_string) - 1, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); @@ -1109,7 +1109,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t help_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(help_function) { char showcmd[1024]; int all = 0; 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 Sat May 12 17:36:15 2007 @@ -3445,7 +3445,7 @@ } /* API Interface Function */ -static switch_status_t conf_api_main(const char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(conf_api_main) { char *lbuf = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -3453,8 +3453,8 @@ int argc; char *argv[25] = { 0 }; - if (!buf) { - buf = "help"; + if (!cmd) { + cmd = "help"; } if (session) { @@ -3470,7 +3470,7 @@ stream->write_function(stream, "<pre>\n"); } - if (!(lbuf = strdup(buf))) { + if (!(lbuf = strdup(cmd))) { return status; } @@ -3486,7 +3486,7 @@ goto done; } if (argc >= 2) { - conf_api_dispatch(conference, stream, argc, argv, (const char *) buf, 1); + conf_api_dispatch(conference, stream, argc, argv, cmd, 1); } else { stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n"); } 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 Sat May 12 17:36:15 2007 @@ -502,14 +502,14 @@ } -static switch_status_t strepoch_api_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(strepoch_api_function) { switch_time_t out; - if (switch_strlen_zero(data)) { + if (switch_strlen_zero(cmd)) { out = switch_time_now(); } else { - out = switch_str_time(data); + out = switch_str_time(cmd); } stream->write_function(stream, "%d", (uint32_t) ((out) / (int64_t) (1000000))); @@ -517,7 +517,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t strftime_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(strftime_api_function) { switch_size_t retsize; @@ -525,20 +525,20 @@ char date[80] = ""; switch_time_exp_lt(&tm, switch_time_now()); - switch_strftime(date, &retsize, sizeof(date), fmt ? fmt : "%Y-%m-%d %T", &tm); + switch_strftime(date, &retsize, sizeof(date), cmd ? cmd : "%Y-%m-%d %T", &tm); stream->write_function(stream, "%s", date); return SWITCH_STATUS_SUCCESS; } -static switch_status_t presence_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(presence_api_function) { switch_event_t *event; char *lbuf, *argv[4]; int argc = 0; switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; - if (fmt && (lbuf = strdup(fmt)) + if (cmd && (lbuf = strdup(cmd)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { if (!strcasecmp(argv[0], "out")) { type = SWITCH_EVENT_PRESENCE_OUT; @@ -568,12 +568,12 @@ } -static switch_status_t chat_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(chat_api_function) { char *lbuf, *argv[4]; int argc = 0; - if (fmt && (lbuf = strdup(fmt)) + if (cmd && (lbuf = strdup(cmd)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { switch_chat_interface_t *ci; Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Sat May 12 17:36:15 2007 @@ -625,7 +625,7 @@ } -static switch_status_t enum_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(enum_function) { int argc = 0; @@ -640,7 +640,7 @@ return SWITCH_STATUS_FALSE; } - if (!(mydata = strdup(data))) { + if (!cmd || !(mydata = strdup(cmd))) { stream->write_function(stream, "Error!\n"); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Sat May 12 17:36:15 2007 @@ -1522,7 +1522,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t pa_cmd(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(pa_cmd) { char *argv[1024] = { 0 }; int argc = 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sat May 12 17:36:15 2007 @@ -2028,7 +2028,7 @@ } } -static switch_status_t dl_debug(const char *tf, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(dl_debug) { int on, cur; @@ -2036,8 +2036,8 @@ return SWITCH_STATUS_FALSE; } - if (tf) { - on = switch_true(tf); + if (cmd) { + on = switch_true(cmd); cur = ldl_global_debug(on); } else { cur = ldl_global_debug(-1); @@ -2049,7 +2049,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_pres(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(dl_pres) { mdl_profile_t *profile; @@ -2057,26 +2057,26 @@ return SWITCH_STATUS_FALSE; } - if (!profile_name) { + if (!cmd) { stream->write_function(stream, "USAGE: %s\n", pres_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if ((profile = switch_core_hash_find(globals.profile_hash, profile_name))) { + if ((profile = switch_core_hash_find(globals.profile_hash, cmd))) { if (profile->user_flags & LDL_FLAG_COMPONENT) { sign_on(profile); stream->write_function(stream, "OK\n"); } else { - stream->write_function(stream, "NO PROFILE %s NOT A COMPONENT\n", profile_name); + stream->write_function(stream, "NO PROFILE %s NOT A COMPONENT\n", cmd); } } else { - stream->write_function(stream, "NO SUCH PROFILE %s\n", profile_name); + stream->write_function(stream, "NO SUCH PROFILE %s\n", cmd); } return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_logout(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(dl_logout) { mdl_profile_t *profile; @@ -2084,22 +2084,22 @@ return SWITCH_STATUS_FALSE; } - if (!profile_name) { + if (!cmd) { stream->write_function(stream, "USAGE: %s\n", logout_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if ((profile = switch_core_hash_find(globals.profile_hash, profile_name))) { + if ((profile = switch_core_hash_find(globals.profile_hash, cmd))) { ldl_handle_stop(profile->handle); stream->write_function(stream, "OK\n"); } else { - stream->write_function(stream, "NO SUCH PROFILE %s\n", profile_name); + stream->write_function(stream, "NO SUCH PROFILE %s\n", cmd); } return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_login(const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(dl_login) { char *argv[10] = { 0 }; int argc = 0; @@ -2111,16 +2111,16 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(arg)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", login_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - myarg = strdup(arg); + myarg = strdup(cmd); argc = switch_separate_string(myarg, ';', argv, (sizeof(argv) / sizeof(argv[0]))); - if (switch_strlen_zero(arg) || argc != 1) { + if (switch_strlen_zero(cmd) || argc != 1) { stream->write_function(stream, "USAGE: %s\n", login_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Sat May 12 17:36:15 2007 @@ -1711,13 +1711,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t padep(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(padep) { stream->write_function(stream, "This command no longer exists (try 'pa help')\n"); return SWITCH_STATUS_SUCCESS; } -static switch_status_t pa_cmd(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(pa_cmd) { char *argv[1024] = { 0 }; int argc = 0; 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 Sat May 12 17:36:15 2007 @@ -1175,7 +1175,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t sofia_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sofia_function) { char *argv[1024] = { 0 }; int argc = 0; @@ -1190,7 +1190,7 @@ "sofia status [[profile | gateway] <name>]\n" "--------------------------------------------------------------------------------\n"; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Sat May 12 17:36:15 2007 @@ -151,7 +151,7 @@ return RUNNING ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_TERM; } -static switch_status_t modcdr_reload(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_reload) { #ifdef SWITCH_QUEUE_ENHANCED switch_thread_rwlock_wrlock(cdr_rwlock); @@ -164,7 +164,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_queue_pause(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_queue_pause) { #ifdef SWITCH_QUEUE_ENHANCED newcdrcontainer->queue_pause(stream); @@ -174,7 +174,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_queue_resume(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_queue_resume) { #ifdef SWITCH_QUEUE_ENHANCED newcdrcontainer->queue_resume(stream); @@ -184,13 +184,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_show_active(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_show_active) { newcdrcontainer->active(stream); return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_show_available(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_show_available) { newcdrcontainer->available(stream); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Sat May 12 17:36:15 2007 @@ -161,14 +161,14 @@ return NULL; } -static switch_status_t launch_python(const char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(launch_python) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; switch_memory_pool_t *pool; struct switch_py_thread *pt; - if (switch_strlen_zero(text)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", python_run_interface.syntax); return SWITCH_STATUS_SUCCESS; } @@ -180,7 +180,7 @@ assert(pt != NULL); pt->pool = pool; - pt->args = switch_core_strdup(pt->pool, text); + pt->args = switch_core_strdup(pt->pool, cmd); switch_threadattr_create(&thd_attr, pt->pool); switch_threadattr_detach_set(thd_attr, 1); 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 May 12 17:36:15 2007 @@ -2739,15 +2739,15 @@ } -static switch_status_t launch_async(const char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(launch_async) { - if (switch_strlen_zero(text)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", js_run_interface.syntax); return SWITCH_STATUS_SUCCESS; } - js_thread_launch(text); + js_thread_launch(cmd); stream->write_function(stream, "OK\n"); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r5166 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 May '07

12 May '07

Author: anthm Date: Sat May 12 13:57:30 2007 New Revision: 5166 Modified: freeswitch/trunk/conf/directory.xml freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add from-domain param to sofia.conf for mmurdock Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Sat May 12 13:57:30 2007 @@ -9,6 +9,8 @@    +  +     @@ -21,6 +23,10 @@    +  +  +  +   </gateways> <params> Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Sat May 12 13:57:30 2007 @@ -12,6 +12,8 @@    +  +     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 Sat May 12 13:57:30 2007 @@ -476,7 +476,8 @@ *proxy = NULL, *context = "default", *expire_seconds = "3600", - *retry_seconds = "30"; + *retry_seconds = "30", + *from_domain = ""; gateway->pool = profile->pool; gateway->profile = profile; @@ -510,6 +511,8 @@ expire_seconds = val; } else if (!strcmp(var, "retry-seconds")) { retry_seconds = val; + } else if (!strcmp(var, "from-domain")) { + from_domain = val; } } @@ -539,6 +542,10 @@ gateway->state = REG_STATE_NOREG; } + if (switch_strlen_zero(from_domain)) { + from_domain = realm; + } + gateway->retry_seconds = atoi(retry_seconds); if (gateway->retry_seconds < 10) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "INVALID: retry_seconds correcting the value to 30\n"); @@ -552,7 +559,7 @@ if (switch_true(caller_id_in_from)) { switch_set_flag(gateway, REG_FLAG_CALLERID); } - gateway->register_from = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, realm); + gateway->register_from = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, from_domain); gateway->register_contact = switch_core_sprintf(gateway->pool, "sip:%s@%s:%d", extension, profile->sipip, profile->sip_port); if (!strncasecmp(proxy, "sip:", 4)) {

1 0

[commit] r5165 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_conference mod/applications/mod_dptools mod/applications/mod_enum mod/endpoints/mod_alsa mod/endpoints/mod_dingaling mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/event_handlers/mod_cdr mod/languages/mod_python mod/languages/mod_spidermonkey
by Freeswitch SVN 12 May '07

12 May '07

Author: mikej Date: Sat May 12 10:48:14 2007 New Revision: 5165 Modified: freeswitch/trunk/src/include/switch_buffer.h freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_regex.h freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_scheduler.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_buffer.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_regex.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_scheduler.c freeswitch/trunk/src/switch_utils.c Log: adding const qualifiers across the api as appropriate. Modified: freeswitch/trunk/src/include/switch_buffer.h ============================================================================== --- freeswitch/trunk/src/include/switch_buffer.h (original) +++ freeswitch/trunk/src/include/switch_buffer.h Sat May 12 10:48:14 2007 @@ -117,7 +117,7 @@ * \param datalen amount of data to be written * \return int amount of buffer used after the write, or 0 if no space available */ -SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, void *data, switch_size_t datalen); +SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, const void *data, switch_size_t datalen); /*! \brief Remove data from the buffer * \param buffer any buffer of type switch_buffer_t Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Sat May 12 10:48:14 2007 @@ -128,7 +128,7 @@ \param extension_number extension number \return a new extension object allocated from the session's memory pool */ -SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, char *extension_name, char *extension_number); +SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number); /*! \brief Add an application (instruction) to the given extension @@ -138,7 +138,7 @@ \param extra_data optional argument to the application */ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session_t *session, - switch_caller_extension_t *caller_extension, char *application_name, char *extra_data); + switch_caller_extension_t *caller_extension, const char *application_name, const char *extra_data); /*! @@ -147,7 +147,7 @@ \param name the name \note this function is meant for situations where the name paramater is the contents of the variable */ -SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, char *name); +SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name); /*! \brief Create a new caller profile object @@ -191,7 +191,7 @@ \param event the event to add the information to */ -SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event); +SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, const char *prefix, switch_event_t *event); SWITCH_END_EXTERN_C /** @} */ Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Sat May 12 10:48:14 2007 @@ -89,7 +89,7 @@ \param str the string to check \return the code */ -SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(char *str); +SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(const char *str); /*! \brief return the cause code for a given channel @@ -103,7 +103,7 @@ \param cause the code to check \return the string */ -SWITCH_DECLARE(char *) switch_channel_cause2str(switch_call_cause_t cause); +SWITCH_DECLARE(const char *) switch_channel_cause2str(switch_call_cause_t cause); /*! \brief View the timetable of a channel @@ -136,7 +136,7 @@ \param rpid the rpid if for the icon to use \param status the status message */ -SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rpid, char *status); +SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status); /*! \brief Uninitalize a channel @@ -218,7 +218,7 @@ \param varname the name of the variable \return the value of the requested variable */ -SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, char *varname); +SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname); /*! * Start iterating over the entries in the channel variable list. @@ -373,7 +373,7 @@ \param private_info void pointer to private data \return SWITCH_STATUS_SUCCESS if data was set */ -SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, char *key, void *private_info); +SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info); /*! \brief Retrieve private from a given channel @@ -381,7 +381,7 @@ \param key unique keyname to retrieve your private data \return void pointer to channel's private data */ -SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, char *key); +SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key); /*! \brief Assign a name to a given channel @@ -389,7 +389,7 @@ \param name name to assign \return SWITCH_STATUS_SUCCESS if name was assigned */ -SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, char *name); +SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name); /*! \brief Retrieve the name of a given channel @@ -423,7 +423,7 @@ \param dtmf string of digits to queue \return SWITCH_STATUS_SUCCESS if successful */ -SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, char *dtmf); +SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, const char *dtmf); /*! \brief Retrieve DTMF digits from a given channel @@ -446,7 +446,7 @@ \param name the name of the state \return the enum value (numeric) */ -SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(char *name); +SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(const char *name); /*! \brief Add information about a given channel to an event object Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sat May 12 10:48:14 2007 @@ -220,7 +220,7 @@ \param err a pointer to set any errors to \note to be called at application startup */ -SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err); +SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, const char **err); /*! \brief Initilize the core and load modules @@ -228,7 +228,7 @@ \param err a pointer to set any errors to \note to be called at application startup instead of switch_core_init. Includes module loading. */ -SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err); +SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(const char *console, const char **err); /*! \brief Set/Get Session Limit @@ -503,7 +503,7 @@ #ifdef SWITCH_DEBUG_RWLOCKS #define switch_core_session_locate(uuid_str) switch_core_session_perform_locate(uuid_str, __FILE__, __SWITCH_FUNC__, __LINE__) #else -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(char *uuid_str); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(const char *uuid_str); #endif /*! @@ -511,14 +511,14 @@ \param varname the name of the variable \return the value of the desired variable */ -SWITCH_DECLARE(char *) switch_core_get_variable(char *varname); +SWITCH_DECLARE(char *) switch_core_get_variable(const char *varname); /*! \brief Add a global variable to the core \param varname the name of the variable \param value the value of the variable */ -SWITCH_DECLARE(void) switch_core_set_variable(char *varname, char *value); +SWITCH_DECLARE(void) switch_core_set_variable(const char *varname, const char *value); /*! \brief Hangup All Sessions @@ -1395,7 +1395,7 @@ \brief Set the output console to the desired file \param console the file path */ -SWITCH_DECLARE(switch_status_t) switch_core_set_console(char *console); +SWITCH_DECLARE(switch_status_t) switch_core_set_console(const char *console); /*! \brief Breakdown a number of milliseconds into various time spec Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Sat May 12 10:48:14 2007 @@ -97,21 +97,21 @@ \param name the name of the endpoint \return the desired endpoint interface */ -SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(char *name); +SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(const char *name); /*! \brief Retrieve the codec interface by it's registered name \param name the name of the codec \return the desired codec interface */ -SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(char *name); +SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(const char *name); /*! \brief Retrieve the dialplan interface by it's registered name \param name the name of the dialplan \return the desired dialplan interface */ -SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(char *name); +SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(const char *name); /*! \brief build a dynamic module object and register it (for use in double embeded modules) @@ -132,70 +132,70 @@ \param name the name of the timer \return the desired timer interface */ -SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(char *name); +SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(const char *name); /*! \brief Retrieve the application interface by it's registered name \param name the name of the application \return the desired application interface */ -SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(char *name); +SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(const char *name); /*! \brief Retrieve the API interface by it's registered name \param name the name of the API \return the desired API interface */ -SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(char *name); +SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(const char *name); /*! \brief Retrieve the file format interface by it's registered name \param name the name of the file format \return the desired file format interface */ -SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(char *name); +SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(const char *name); /*! \brief Retrieve the speech interface by it's registered name \param name the name of the speech interface \return the desired speech interface */ -SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(char *name); +SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(const char *name); /*! \brief Retrieve the asr interface by it's registered name \param name the name of the asr interface \return the desired asr interface */ -SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(char *name); +SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(const char *name); /*! \brief Retrieve the directory interface by it's registered name \param name the name of the directory interface \return the desired directory interface */ -SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(char *name); +SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(const char *name); /*! \brief Retrieve the chat interface by it's registered name \param name the name of the chat interface \return the desired chat interface */ -SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name); +SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(const char *name); /*! \brief Retrieve the say interface by it's registered name \param name the name of the say interface \return the desired say interface */ -SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(char *name); +SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(const char *name); /*! \brief Retrieve the management interface by it's registered name \param relative_oid the relative oid of the management interface \return the desired management interface */ -SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(char *relative_oid); +SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(const char *relative_oid); /*! \brief Retrieve the list of loaded codecs into an array @@ -226,7 +226,7 @@ \param stream stream for output \return the status returned by the API call */ -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); +SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); /*! \brief Load a module Modified: freeswitch/trunk/src/include/switch_regex.h ============================================================================== --- freeswitch/trunk/src/include/switch_regex.h (original) +++ freeswitch/trunk/src/include/switch_regex.h Sat May 12 10:48:14 2007 @@ -49,8 +49,8 @@ SWITCH_DECLARE(void) switch_regex_free(void *data); -SWITCH_DECLARE(int) switch_regex_perform(char *field, char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen); -SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, char *data, char *field_data, +SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen); +SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data, char *substituted, uint32_t len, int *ovector); /*! @@ -59,7 +59,7 @@ \param expression The regular expression to run against the string \return Boolean if a match was found or not */ -SWITCH_DECLARE(switch_status_t) switch_regex_match(char *target, char *expression); +SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression); #define switch_regex_safe_free(re) if (re) {\ switch_regex_free(re);\ Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Sat May 12 10:48:14 2007 @@ -111,9 +111,9 @@ \param pool a memory pool to use for the session \return the new RTP session or NULL on failure */ -SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(char *rx_host, +SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host, switch_port_t rx_port, - char *tx_host, + const char *tx_host, switch_port_t tx_port, switch_payload_t payload, uint32_t samples_per_interval, @@ -128,7 +128,7 @@ \param port the remote port \param err pointer for error messages */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); /*! \brief Assign a local address to the RTP session @@ -138,7 +138,7 @@ \param err pointer for error messages \note this call also binds the RTP session's socket to the new address */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); /*! \brief Kill the socket on an existing RTP session Modified: freeswitch/trunk/src/include/switch_scheduler.h ============================================================================== --- freeswitch/trunk/src/include/switch_scheduler.h (original) +++ freeswitch/trunk/src/include/switch_scheduler.h Sat May 12 10:48:14 2007 @@ -62,7 +62,7 @@ */ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime, switch_scheduler_func_t func, - char *desc, char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags); + const char *desc, const char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags); /*! \brief Delete a scheduled task @@ -76,7 +76,7 @@ \param group the group name \return the number of jobs deleted */ -SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(char *group); +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group); /*! Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat May 12 10:48:14 2007 @@ -1018,7 +1018,7 @@ typedef switch_status_t (*switch_state_handler_t) (switch_core_session_t *); typedef struct switch_stream_handle switch_stream_handle_t; typedef switch_status_t (*switch_stream_handle_write_function_t) (switch_stream_handle_t *handle, const char *fmt, ...); -typedef switch_status_t (*switch_api_function_t) (char *in, switch_core_session_t *session, switch_stream_handle_t *stream); +typedef switch_status_t (*switch_api_function_t) (const char *in, switch_core_session_t *session, switch_stream_handle_t *stream); typedef switch_status_t (*switch_input_callback_function_t) (switch_core_session_t *session, void *input, switch_input_type_t input_type, void *buf, unsigned int buflen); typedef struct switch_say_interface switch_say_interface_t; Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Sat May 12 10:48:14 2007 @@ -55,7 +55,7 @@ #define switch_is_file_path(file) ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR)) #endif -static inline switch_bool_t switch_is_digit_string(char *s) { +static inline switch_bool_t switch_is_digit_string(const char *s) { while(s && *s) { if (*s < 48 || *s > 57) { @@ -104,7 +104,7 @@ \param priority the priority to get the name of \return the printable form of the priority */ -SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority); +SWITCH_DECLARE(const char *) switch_priority_name(switch_priority_t priority); /*! \brief Return the RFC2833 character based on an event id @@ -260,7 +260,7 @@ \param in the string \return the epoch time in usec */ -SWITCH_DECLARE(switch_time_t) switch_str_time(char *in); +SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in); /*! \brief Declares a function designed to set a dymaic global string @@ -288,7 +288,7 @@ \param esc the escape character \return the escaped string */ -SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, char *delim, char esc); +SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, const char *delim, char esc); /*! \brief Wait for a socket 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 Sat May 12 10:48:14 2007 @@ -57,7 +57,7 @@ static switch_api_interface_t sched_transfer_api_interface; static switch_api_interface_t sched_hangup_api_interface; -static switch_status_t status_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t status_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { uint8_t html = 0; switch_core_time_duration_t duration; @@ -107,7 +107,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t ctl_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t ctl_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { int argc; char *mydata, *argv[5]; @@ -149,7 +149,7 @@ } -static switch_status_t load_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t load_function(const char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; @@ -171,7 +171,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t unload_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t unload_function(const char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; @@ -193,7 +193,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t reload_function(char *args, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t reload_function(const char *args, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; switch_xml_t xml_root; @@ -211,7 +211,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t kill_function(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t kill_function(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; @@ -233,56 +233,62 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t transfer_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (argc >= 2 && argc <= 4) { + char *uuid = argv[0]; + char *dest = argv[1]; + char *dp = argv[2]; + char *context = argv[3]; + + if ((session = switch_core_session_locate(uuid))) { + + if (switch_ivr_session_transfer(session, dest, dp, context) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "OK\n"); + } else { + stream->write_function(stream, "ERROR\n"); + } - if (switch_strlen_zero(cmd) || argc < 2 || argc > 4) { - stream->write_function(stream, "USAGE: %s\n", transfer_api_interface.syntax); - } else { - char *uuid = argv[0]; - char *dest = argv[1]; - char *dp = argv[2]; - char *context = argv[3]; + switch_core_session_rwunlock(session); - if ((session = switch_core_session_locate(uuid))) { - - if (switch_ivr_session_transfer(session, dest, dp, context) == SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "OK\n"); } else { - stream->write_function(stream, "ERROR\n"); + stream->write_function(stream, "No Such Channel!\n"); } - - switch_core_session_rwunlock(session); - - } else { - stream->write_function(stream, "No Such Channel!\n"); + goto done; } } + stream->write_function(stream, "USAGE: %s\n", transfer_api_interface.syntax); + +done: + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_transfer_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[6] = { 0 }; + char *mycmd = NULL, *argv[6] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2 || argc > 5) { stream->write_function(stream, "USAGE: %s\n", sched_transfer_api_interface.syntax); @@ -308,20 +314,23 @@ } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_hangup_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_hangup_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", sched_hangup_api_interface.syntax); @@ -350,13 +359,14 @@ } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_media_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t uuid_media_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; @@ -364,7 +374,9 @@ return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", media_api_interface.syntax); @@ -382,13 +394,14 @@ stream->write_function(stream, "-ERR Operation Failed\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_broadcast_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t uuid_broadcast_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; @@ -396,7 +409,9 @@ return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2) { stream->write_function(stream, "USAGE: %s\n", broadcast_api_interface.syntax); @@ -419,13 +434,14 @@ stream->write_function(stream, "+OK Message Sent\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_broadcast_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_broadcast_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; @@ -433,7 +449,9 @@ return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 3) { stream->write_function(stream, "USAGE: %s\n", sched_broadcast_api_interface.syntax); @@ -463,12 +481,13 @@ stream->write_function(stream, "+OK Message Scheduled\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_hold_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t uuid_hold_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; @@ -476,7 +495,9 @@ return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", hold_api_interface.syntax); @@ -494,19 +515,22 @@ stream->write_function(stream, "-ERR Operation Failed\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_bridge_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t uuid_bridge_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc != 2) { stream->write_function(stream, "USAGE: %s\n", uuid_bridge_api_interface.syntax); @@ -516,13 +540,14 @@ } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t session_record_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t session_record_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; char *uuid = NULL, *action = NULL, *path = NULL; int argc = 0; @@ -534,7 +559,11 @@ goto usage; } - if ((argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 3) { + if (!(mycmd = strdup(cmd))) { + goto usage; + } + + if ((argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 3) { goto usage; } @@ -564,6 +593,7 @@ usage: stream->write_function(stream, "USAGE: %s\n", session_record_api_interface.syntax); + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; done: @@ -572,20 +602,23 @@ switch_core_session_rwunlock(session); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t pause_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t pause_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2) { stream->write_function(stream, "USAGE: %s\n", pause_api_interface.syntax); @@ -609,14 +642,15 @@ } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t originate_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t originate_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_channel_t *caller_channel; switch_core_session_t *caller_session = NULL; - char *argv[7] = { 0 }; + char *mycmd = NULL, *argv[7] = { 0 }; int i = 0, x, argc = 0; char *aleg, *exten, *dp, *context, *cid_name, *cid_num; uint32_t timeout = 60; @@ -628,10 +662,13 @@ return SWITCH_STATUS_SUCCESS; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2 || argc > 7) { stream->write_function(stream, "USAGE: %s\n", originate_api_interface.syntax); + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -671,6 +708,7 @@ } else { stream->write_function(stream, "Cannot Create Outgoing Channel! [%s] cause: %s\n", aleg, switch_channel_cause2str(cause)); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -694,6 +732,7 @@ if ((extension = switch_caller_extension_new(caller_session, app_name, arg)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_safe_free(mycmd); return SWITCH_STATUS_MEMERR; } switch_caller_extension_add_application(caller_session, extension, app_name, arg); @@ -713,6 +752,7 @@ switch_core_session_rwunlock(caller_session); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -735,7 +775,7 @@ switch_safe_free(stream.data); } -static switch_status_t sched_del_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_del_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { uint32_t cnt = 0; @@ -754,7 +794,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t xml_wrap_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t xml_wrap_api_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *dcommand, *edata = NULL, *send = NULL, *command, *arg = NULL; switch_stream_handle_t mystream = { 0 }; @@ -803,7 +843,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_api_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *tm = NULL, *dcmd, *group; time_t when; @@ -939,7 +979,7 @@ return 0; } -static switch_status_t show_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t show_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { char sql[1024]; char *errmsg; @@ -954,11 +994,8 @@ return SWITCH_STATUS_FALSE; } - if (data) { - if ((mydata = strdup(data))) { - argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - } - + if (data && (mydata = strdup(data))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); cmd = argv[0]; if (argv[2] && !strcasecmp(argv[1], "as")) { as = argv[2]; @@ -1063,7 +1100,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t version_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t version_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { char version_string[1024]; snprintf(version_string, sizeof(version_string) - 1, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); @@ -1072,7 +1109,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t help_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t help_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { char showcmd[1024]; int all = 0; 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 Sat May 12 10:48:14 2007 @@ -292,7 +292,7 @@ static switch_status_t conference_play_file(conference_obj_t * conference, char *file, uint32_t leadin, switch_channel_t *channel, uint8_t async); static switch_status_t conference_say(conference_obj_t * conference, const char *text, uint32_t leadin); static void conference_list(conference_obj_t * conference, switch_stream_handle_t *stream, char *delim); -static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t conf_api_main(const char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t audio_bridge_on_ring(switch_core_session_t *session); static switch_status_t conference_outcall(conference_obj_t * conference, char *conference_name, @@ -3445,7 +3445,7 @@ } /* API Interface Function */ -static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t conf_api_main(const char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) { char *lbuf = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; 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 Sat May 12 10:48:14 2007 @@ -502,7 +502,7 @@ } -static switch_status_t strepoch_api_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t strepoch_api_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_time_t out; @@ -517,7 +517,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t strftime_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_size_t retsize; @@ -531,7 +531,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t presence_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t presence_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_event_t *event; char *lbuf, *argv[4]; @@ -568,7 +568,7 @@ } -static switch_status_t chat_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t chat_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) { char *lbuf, *argv[4]; int argc = 0; Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Sat May 12 10:48:14 2007 @@ -625,7 +625,7 @@ } -static switch_status_t enum_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t enum_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { int argc = 0; @@ -649,7 +649,7 @@ dest = argv[0]; root = argv[1] ? argv[1] : globals.root; - if (!enum_lookup(root, data, &results) == SWITCH_STATUS_SUCCESS) { + if (!enum_lookup(root, dest, &results) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Sat May 12 10:48:14 2007 @@ -1522,7 +1522,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t pa_cmd(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *argv[1024] = { 0 }; int argc = 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sat May 12 10:48:14 2007 @@ -191,10 +191,10 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string) SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string) -static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_pres(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_debug(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_login(const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_logout(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_pres(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_debug(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_hangup(switch_core_session_t *session); static switch_status_t channel_on_ring(switch_core_session_t *session); @@ -2028,7 +2028,7 @@ } } -static switch_status_t dl_debug(char *tf, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t dl_debug(const char *tf, switch_core_session_t *session, switch_stream_handle_t *stream) { int on, cur; @@ -2049,7 +2049,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_pres(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t dl_pres(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) { mdl_profile_t *profile; @@ -2076,7 +2076,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t dl_logout(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) { mdl_profile_t *profile; @@ -2099,7 +2099,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t dl_login(const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { char *argv[10] = { 0 }; int argc = 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Sat May 12 10:48:14 2007 @@ -155,8 +155,8 @@ static switch_status_t load_config(void); static int get_dev_by_name(char *name, int in); static int get_dev_by_number(int number, int in); - static switch_status_t pa_cmd(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); - static switch_status_t padep(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t pa_cmd(const char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t padep(const char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); /* @@ -1711,13 +1711,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t padep(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t padep(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { stream->write_function(stream, "This command no longer exists (try 'pa help')\n"); return SWITCH_STATUS_SUCCESS; } -static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t pa_cmd(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *argv[1024] = { 0 }; int argc = 0; 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 Sat May 12 10:48:14 2007 @@ -1175,7 +1175,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t sofia_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sofia_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *argv[1024] = { 0 }; int argc = 0; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h Sat May 12 10:48:14 2007 @@ -90,7 +90,7 @@ switch_time_t callenddate; switch_time_t calltransferdate; switch_call_cause_t hangupcause; - char *hangupcause_text; + const char *hangupcause_text; char clid[80]; bool originated; // Did they originate this call? char dialplan[80]; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Sat May 12 10:48:14 2007 @@ -45,11 +45,11 @@ static CDRContainer *newcdrcontainer; static switch_memory_pool_t *module_pool; static switch_status_t my_on_hangup(switch_core_session_t *session); -static switch_status_t modcdr_reload(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_queue_pause(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_queue_resume(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_show_active(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_show_available(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_reload(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_queue_pause(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_queue_resume(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_show_active(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_show_available(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); static switch_thread_rwlock_t *cdr_rwlock; /* Now begins the glue that will tie this into the system. @@ -151,7 +151,7 @@ return RUNNING ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_TERM; } -static switch_status_t modcdr_reload(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_reload(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { #ifdef SWITCH_QUEUE_ENHANCED switch_thread_rwlock_wrlock(cdr_rwlock); @@ -164,7 +164,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_queue_pause(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_queue_pause(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { #ifdef SWITCH_QUEUE_ENHANCED newcdrcontainer->queue_pause(stream); @@ -174,7 +174,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_queue_resume(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_queue_resume(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { #ifdef SWITCH_QUEUE_ENHANCED newcdrcontainer->queue_resume(stream); @@ -184,13 +184,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_show_active(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_show_active(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { newcdrcontainer->active(stream); return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_show_available(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_show_available(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { newcdrcontainer->available(stream); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Sat May 12 10:48:14 2007 @@ -161,7 +161,7 @@ return NULL; } -static switch_status_t launch_python(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t launch_python(const char *text, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; 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 May 12 10:48:14 2007 @@ -2720,7 +2720,7 @@ static switch_memory_pool_t *module_pool = NULL; -static void js_thread_launch(char *text) +static void js_thread_launch(const char *text) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; @@ -2739,7 +2739,7 @@ } -static switch_status_t launch_async(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t launch_async(const char *text, switch_core_session_t *session, switch_stream_handle_t *stream) { if (switch_strlen_zero(text)) { Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Sat May 12 10:48:14 2007 @@ -193,7 +193,7 @@ return reading; } -SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, void *data, switch_size_t datalen) +SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, const void *data, switch_size_t datalen) { switch_size_t freespace, actual_freespace; Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Sat May 12 10:48:14 2007 @@ -92,7 +92,7 @@ return profile; } -SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, char *name) +SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name) { if (!strcasecmp(name, "dialplan")) { return caller_profile->dialplan; @@ -136,7 +136,7 @@ return NULL; } -SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event) +SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, const char *prefix, switch_event_t *event) { char header_name[1024]; @@ -207,7 +207,7 @@ } -SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, char *extension_name, char *extension_number) +SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number) { switch_caller_extension_t *caller_extension = NULL; @@ -222,7 +222,7 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session_t *session, - switch_caller_extension_t *caller_extension, char *application_name, char *application_data) + switch_caller_extension_t *caller_extension, const char *application_name, const char *application_data) { switch_caller_application_t *caller_application = NULL; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat May 12 10:48:14 2007 @@ -119,21 +119,21 @@ }; -SWITCH_DECLARE(char *) switch_channel_cause2str(switch_call_cause_t cause) +SWITCH_DECLARE(const char *) switch_channel_cause2str(switch_call_cause_t cause) { uint8_t x; - char *str = "UNKNOWN"; + const char *str = "UNKNOWN"; for (x = 0; CAUSE_CHART[x].name; x++) { if (CAUSE_CHART[x].cause == cause) { - str = (char *) CAUSE_CHART[x].name; + str = CAUSE_CHART[x].name; } } return str; } -SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(char *str) +SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(const char *str) { uint8_t x; switch_call_cause_t cause = SWITCH_CAUSE_UNALLOCATED; @@ -198,12 +198,12 @@ return has; } -SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, char *dtmf) +SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, const char *dtmf) { switch_status_t status; register switch_size_t len, inuse; switch_size_t wr = 0; - char *p; + const char *p; assert(channel != NULL); @@ -270,7 +270,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rpid, char *status) +SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status) { char *id = switch_channel_get_variable(channel, "presence_id"); switch_event_t *event; @@ -302,7 +302,7 @@ } -SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, char *varname) +SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname) { char *v = NULL; assert(channel != NULL); @@ -343,7 +343,7 @@ return hi; } -SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, char *key, void *private_info) +SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info) { assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); @@ -352,7 +352,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, char *key) +SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; assert(channel != NULL); @@ -362,7 +362,7 @@ return val; } -SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, char *name) +SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name) { assert(channel != NULL); channel->name = NULL; @@ -532,7 +532,7 @@ } -SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(char *name) +SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(const char *name) { uint32_t x = 0; for (x = 0; state_names[x]; x++) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat May 12 10:48:14 2007 @@ -80,7 +80,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_core_set_console(char *console) +SWITCH_DECLARE(switch_status_t) switch_core_set_console(const char *console) { if ((runtime.console = fopen(console, "a")) == 0) { fprintf(stderr, "Cannot open output file %s.\n", console); @@ -135,12 +135,12 @@ } -SWITCH_DECLARE(char *) switch_core_get_variable(char *varname) +SWITCH_DECLARE(char *) switch_core_get_variable(const char *varname) { return (char *) switch_core_hash_find(runtime.global_vars, varname); } -SWITCH_DECLARE(void) switch_core_set_variable(char *varname, char *value) +SWITCH_DECLARE(void) switch_core_set_variable(const char *varname, const char *value) { switch_core_hash_insert(runtime.global_vars, switch_core_strdup(runtime.memory_pool, varname), switch_core_strdup(runtime.memory_pool, value)); } @@ -392,7 +392,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err) +SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, const char **err) { switch_xml_t xml = NULL, cfg = NULL; switch_uuid_t uuid; @@ -538,7 +538,7 @@ if (sig); return; } -SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err) +SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(const char *console, const char **err) { switch_event_t *event; if (switch_core_init(console, err) != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Sat May 12 10:48:14 2007 @@ -45,9 +45,9 @@ #ifdef SWITCH_DEBUG_RWLOCKS -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(char *uuid_str, const char *file, const char *func, int line) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(const char *uuid_str, const char *file, const char *func, int line) #else -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(char *uuid_str) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(const char *uuid_str) #endif { switch_core_session_t *session = NULL; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sat May 12 10:48:14 2007 @@ -1110,7 +1110,7 @@ } -SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(char *name) +SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(const char *name) { switch_endpoint_interface_t *ptr; @@ -1121,7 +1121,7 @@ return ptr; } -SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(char *name) +SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(const char *name) { char altname[256] = ""; switch_codec_interface_t *codec; @@ -1143,57 +1143,57 @@ return codec; } -SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(char *name) +SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.dialplan_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(char *name) +SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.timer_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(char *name) +SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.application_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(char *name) +SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.api_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(char *name) +SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.file_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(char *name) +SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.speech_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(char *name) +SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.asr_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(char *name) +SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.directory_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name) +SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.chat_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(char *name) +SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.say_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(char *relative_oid) +SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(const char *relative_oid) { return switch_core_hash_find_locked(loadable_modules.management_hash, relative_oid, loadable_modules.mutex); } @@ -1319,7 +1319,7 @@ return i; } -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_api_interface_t *api; switch_status_t status; Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Sat May 12 10:48:14 2007 @@ -32,12 +32,19 @@ #include <switch.h> #include <pcre.h> - SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern, - int options, const char **errorptr, int *erroroffset, const unsigned char *tables) + + +SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern, + int options, const char **errorptr, int *erroroffset, +const unsigned char *tables) { - return pcre_compile(pattern, options, errorptr, erroroffset, tables); - } - SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size) + +return pcre_compile(pattern, options, errorptr, erroroffset, tables); + +} + + +SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size) { return pcre_copy_substring(subject, ovector, stringcount, stringnumber, buffer, size); } @@ -45,7 +52,10 @@ SWITCH_DECLARE(void) switch_regex_free(void *data) { pcre_free(data); - } SWITCH_DECLARE(int) switch_regex_perform(char *field, char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen) + +} + +SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen) { const char *error = NULL; int erroffset = 0; @@ -87,7 +97,7 @@ } -SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, char *data, char *field_data, +SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data, char *substituted, uint32_t len, int *ovector) { char index[10] = ""; @@ -124,7 +134,8 @@ } substituted[y++] = '\0'; } - SWITCH_DECLARE(switch_status_t) switch_regex_match(char *target, char *expression) + +SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression) { const char *error = NULL; //Used to hold any errors int error_offset = 0; //Holds the offset of an error Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat May 12 10:48:14 2007 @@ -319,7 +319,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) +SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) { switch_socket_t *new_sock = NULL, *old_sock = NULL; switch_status_t status = SWITCH_STATUS_FALSE; @@ -389,7 +389,7 @@ return status; } -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) { *err = "Success"; @@ -545,9 +545,9 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(char *rx_host, +SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host, switch_port_t rx_port, - char *tx_host, + const char *tx_host, switch_port_t tx_port, switch_payload_t payload, uint32_t samples_per_interval, Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Sat May 12 10:48:14 2007 @@ -149,7 +149,7 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime, switch_scheduler_func_t func, - char *desc, char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags) + const char *desc, const char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags) { switch_scheduler_task_container_t *container, *tp; switch_event_t *event; @@ -223,7 +223,7 @@ return delcnt; } -SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(char *group) +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group) { switch_scheduler_task_container_t *tp; switch_event_t *event; Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sat May 12 10:48:14 2007 @@ -177,7 +177,7 @@ } -SWITCH_DECLARE(switch_time_t) switch_str_time(char *in) +SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in) { switch_time_exp_t tm = { 0 }; int proceed = 0, ovector[30]; @@ -229,7 +229,7 @@ } -SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) +SWITCH_DECLARE(const char *) switch_priority_name(switch_priority_t priority) { switch (priority) { /*lol */ case SWITCH_PRIORITY_NORMAL: @@ -284,9 +284,10 @@ return '\0'; } -SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, char *delim, char esc) +SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, const char *delim, char esc) { - char *data, *p, *d; + char *data; + const char *p, *d; int count = 1, i = 0; p = in;

1 0

[commit] r5164 - in freeswitch/trunk: src w32/Library
by Freeswitch SVN 12 May '07

12 May '07

Author: mikej Date: Sat May 12 03:29:12 2007 New Revision: 5164 Modified: freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: add switch_cpp.cpp to msvc build. Fix some build issues and a bug. Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Sat May 12 03:29:12 2007 @@ -1,6 +1,10 @@ #include <switch.h> #include <switch_cpp.h> +#ifdef _MSC_VER +#pragma warning(disable:4127 4003) +#endif + #define sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) #define init_vars() do { session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; memset(&args, 0, sizeof(args)); ap = NULL;} while(0) @@ -45,7 +49,7 @@ { switch_status_t status; sanity_check(-1); - switch_channel_pre_answer(channel); + status = switch_channel_pre_answer(channel); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Sat May 12 03:29:12 2007 @@ -340,6 +340,30 @@ > </File> <File + RelativePath="..\..\src\switch_cpp.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\src\switch_event.c" > </File> @@ -450,11 +474,11 @@ > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File @@ -466,6 +490,10 @@ > </File> <File + RelativePath="..\..\src\include\switch_cpp.h" + > + </File> + <File RelativePath="..\..\src\include\switch_event.h" > </File>

1 0

[commit] r5163 - in freeswitch/trunk: libs/iax/src src/mod/endpoints/mod_iax
by Freeswitch SVN 12 May '07

12 May '07

Author: mikej Date: Fri May 11 22:40:32 2007 New Revision: 5163 Modified: freeswitch/trunk/libs/iax/src/iax-client.h freeswitch/trunk/libs/iax/src/iax.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: inital stubs for a few inbound reg helper functions. prototypes likely to change. Modified: freeswitch/trunk/libs/iax/src/iax-client.h ============================================================================== --- freeswitch/trunk/libs/iax/src/iax-client.h (original) +++ freeswitch/trunk/libs/iax/src/iax-client.h Fri May 11 22:40:32 2007 @@ -162,6 +162,9 @@ extern int iax_send_ping(struct iax_session *session); extern int iax_load_complete(struct iax_session *session); extern int iax_reject(struct iax_session *session, char *reason); +int iax_reject_registration(struct iax_session *session, char *reason); +int iax_ack_registration(struct iax_session *session); +int iax_auth_registration(struct iax_session *session); extern int iax_busy(struct iax_session *session); extern int iax_congestion(struct iax_session *session); extern int iax_hangup(struct iax_session *session, char *byemsg); Modified: freeswitch/trunk/libs/iax/src/iax.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax.c (original) +++ freeswitch/trunk/libs/iax/src/iax.c Fri May 11 22:40:32 2007 @@ -1255,7 +1255,11 @@ #endif int r; r = __send_command(i, type, command, ts, data, datalen, seqno, 0, 0, 1, 0); - if (r >= 0) destroy_session(i); + if (r >= 0) { + iax_mutex_lock(session_mutex); + destroy_session(i); + iax_mutex_unlock(session_mutex); + } return r; } @@ -1669,6 +1673,24 @@ return res; } +int iax_reject_registration(struct iax_session *session, char *reason) +{ + struct iax_ie_data ied; + memset(&ied, 0, sizeof(ied)); + iax_ie_append_str(&ied, IAX_IE_CAUSE, reason ? (unsigned char *) reason : (unsigned char *) "Unspecified"); + return send_command_final(session, AST_FRAME_IAX, IAX_COMMAND_REGREJ, 0, ied.buf, ied.pos, -1); +} + +int iax_ack_registration(struct iax_session *session) +{ + return send_command_final(session, AST_FRAME_IAX, IAX_COMMAND_REGACK, 0, NULL, 0, -1); +} + +int iax_auth_registration(struct iax_session *session) +{ + return send_command_final(session, AST_FRAME_IAX, IAX_COMMAND_REGAUTH, 0, NULL, 0, -1); +} + int iax_reject(struct iax_session *session, char *reason) { struct iax_ie_data ied; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Fri May 11 22:40:32 2007 @@ -1038,9 +1038,7 @@ break; case IAX_EVENT_REGREQ: /* what is the right way to handle this? */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registration request ignored, not implemented.\n"); - iax_destroy(iaxevent->session); - iaxevent->session = NULL; + iax_reject_registration(iaxevent->session, NULL); break; case IAX_EVENT_TIMEOUT: break;

1 0

[commit] r5162 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 12 May '07

12 May '07

Author: mikej Date: Fri May 11 22:17:45 2007 New Revision: 5162 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: better log level Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Fri May 11 22:17:45 2007 @@ -1038,7 +1038,7 @@ break; case IAX_EVENT_REGREQ: /* what is the right way to handle this? */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registration request ignored, not implemented.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registration request ignored, not implemented.\n"); iax_destroy(iaxevent->session); iaxevent->session = NULL; break;

1 0

[commit] r5161 - in freeswitch/trunk: libs/iax/src src/mod/endpoints/mod_iax
by Freeswitch SVN 12 May '07

12 May '07

Author: mikej Date: Fri May 11 22:09:59 2007 New Revision: 5161 Modified: freeswitch/trunk/libs/iax/src/iax.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: expose a few more iax packets to the application and kindof handle them. Modified: freeswitch/trunk/libs/iax/src/iax.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax.c (original) +++ freeswitch/trunk/libs/iax/src/iax.c Fri May 11 22:09:59 2007 @@ -1586,7 +1586,7 @@ case IAX_EVENT_POKE: event->etype = IAX_EVENT_PONG; iax_send_pong(event->session, event->ts); - destroy_session(event->session); + iax_destroy(event->session); iax_event_free(event); break; default: @@ -2683,7 +2683,8 @@ case IAX_COMMAND_POKE: e->etype = IAX_EVENT_POKE; e->ts = ts; - break; case IAX_COMMAND_PING: + break; + case IAX_COMMAND_PING: /* PINGS and PONGS don't get scheduled; */ e->etype = IAX_EVENT_PING; e->ts = ts; @@ -2718,6 +2719,14 @@ } e = schedule_delivery(e, ts, updatehistory); break; + case IAX_COMMAND_REGREQ: + e->etype = IAX_EVENT_REGREQ; + e = schedule_delivery(e, ts, updatehistory); + break; + case IAX_COMMAND_REGREL: + e->etype = IAX_EVENT_REGREQ; + e = schedule_delivery(e, ts, updatehistory); + break; case IAX_COMMAND_REGACK: e->etype = IAX_EVENT_REGACK; e = schedule_delivery(e, ts, updatehistory); Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Fri May 11 22:09:59 2007 @@ -1036,6 +1036,12 @@ case IAX_EVENT_REGREJ: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registration failed.\n"); break; + case IAX_EVENT_REGREQ: + /* what is the right way to handle this? */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registration request ignored, not implemented.\n"); + iax_destroy(iaxevent->session); + iaxevent->session = NULL; + break; case IAX_EVENT_TIMEOUT: break; case IAX_EVENT_ACCEPT:

1 0