- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6201 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:15:20 2007 New Revision: 6201 Added: freeswitch/trunk/conf/dialplan/default.xml - copied unchanged from r6200, /freeswitch/trunk/conf/dialplan/default_context.xml Removed: freeswitch/trunk/conf/dialplan/default_context.xml Log: we know its a context because its in dialplan/

1 0

[commit] r6200 - in freeswitch/trunk/conf: . dialplan
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:14:32 2007 New Revision: 6200 Added: freeswitch/trunk/conf/dialplan/default_context.xml - copied unchanged from r6194, /freeswitch/trunk/conf/default_context.xml Removed: freeswitch/trunk/conf/default_context.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: again with the fun fun fun stuff Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Fri Nov 9 13:14:32 2007 @@ -92,7 +92,7 @@ </section> <section name="dialplan" description="Regex/XML Dialplan"> -  +  </section>

1 0

[commit] r6199 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:12:02 2007 New Revision: 6199 Added: freeswitch/trunk/conf/dialplan/ Log: more fun stuff

1 0

[commit] r6198 - in freeswitch/trunk/conf: . sip_profiles
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 13:03:53 2007 New Revision: 6198 Added: freeswitch/trunk/conf/sip_profiles/ freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/conf/vars.xml Log: house keeping.. moving things around a bit more to demo various things you can do Added: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/default.xml Fri Nov 9 13:03:53 2007 @@ -0,0 +1,106 @@ +<profile name="default"> +  +  +  +  +  + <gateways> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + </gateways> + + <domains> +  +  + </domains> + + <settings> + <param name="debug" value="1"/> + <param name="rfc2833-pt" value="101"/> + <param name="sip-port" value="5062"/> + <param name="dialplan" value="XML,enum"/> + <param name="dtmf-duration" value="100"/> + <param name="codec-prefs" value="$${global_codec_prefs}"/> + <param name="use-rtp-timer" value="true"/> + <param name="rtp-timer-name" value="soft"/> + <param name="rtp-ip" value="$${local_ip_v4}"/> + <param name="sip-ip" value="$${local_ip_v4}"/> +  + <param name="manage-presence" value="true"/> +  +  +  +  +  +  + <param name="inbound-codec-negotiation" value="generous"/> +  +  + +  +  + +  +  + +  +  + +  +  + +  +  +  + +  + <param name="nonce-ttl" value="60"/> +  +  + <param name="auth-calls" value="true"/> +  +  + +  +  +  +  +  +  +  +  +  +  +  + </settings> +</profile> + Added: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Fri Nov 9 13:03:53 2007 @@ -0,0 +1,19 @@ +<profile name="nat"> + <settings> + <param name="debug" value="1"/> + <param name="rfc2833-pt" value="101"/> + <param name="sip-port" value="5061"/> + <param name="dialplan" value="XML,enum"/> + <param name="dtmf-duration" value="100"/> + <param name="codec-prefs" value="$${global_codec_prefs}"/> + <param name="use-rtp-timer" value="true"/> + <param name="rtp-timer-name" value="soft"/> + <param name="rtp-ip" value="$${local_ip_v4}"/> + <param name="sip-ip" value="$${local_ip_v4}"/> + <param name="manage-presence" value="true"/> + <param name="inbound-codec-negotiation" value="generous"/> + <param name="nonce-ttl" value="60"/> + <param name="auth-calls" value="true"/> + <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> + </settings> +</profile> Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Fri Nov 9 13:03:53 2007 @@ -1,130 +1,5 @@ <configuration name="sofia.conf" description="sofia Endpoint"> <profiles> - <profile name="$${sip_profile}"> -  - <aliases> - <alias name="default"/> - </aliases> -  - <gateways> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - </gateways> - - <domains> -  -  - </domains> - - <settings> - <param name="debug" value="1"/> - <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5060"/> - <param name="dialplan" value="XML,enum"/> - <param name="dtmf-duration" value="100"/> - <param name="codec-prefs" value="$${global_codec_prefs}"/> - <param name="use-rtp-timer" value="true"/> - <param name="rtp-timer-name" value="soft"/> - <param name="rtp-ip" value="$${local_ip_v4}"/> - <param name="sip-ip" value="$${local_ip_v4}"/> -  - <param name="manage-presence" value="true"/> -  -  -  -  -  -  - <param name="inbound-codec-negotiation" value="generous"/> -  -  - -  -  - -  -  - -  -  - -  -  - -  -  -  - -  - <param name="nonce-ttl" value="60"/> -  -  - <param name="auth-calls" value="true"/> -  -  - -  -  -  -  -  -  -  -  -  -  -  - </settings> - </profile> - - <profile name="nat"> - <settings> - <param name="debug" value="1"/> - <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5061"/> - <param name="dialplan" value="XML,enum"/> - <param name="dtmf-duration" value="100"/> - <param name="codec-prefs" value="$${global_codec_prefs}"/> - <param name="use-rtp-timer" value="true"/> - <param name="rtp-timer-name" value="soft"/> - <param name="rtp-ip" value="$${local_ip_v4}"/> - <param name="sip-ip" value="$${local_ip_v4}"/> - <param name="manage-presence" value="true"/> - <param name="inbound-codec-negotiation" value="generous"/> - <param name="nonce-ttl" value="60"/> - <param name="auth-calls" value="true"/> - <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> - </settings> - </profile> - +  </profiles> </configuration> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Nov 9 13:03:53 2007 @@ -8,6 +8,7 @@ used by: sofia.conf.xml enum.conf.xml default_context.xml directory.xml -->  +  <!-- xmpp_client_profile and xmpp_server_profile xmpp_client_profile can be any string. xmpp_server_profile is appended to "dingaling_" to form the database name

1 0

[commit] r6197 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 12:46:20 2007 New Revision: 6197 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: thx stkn 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 Fri Nov 9 12:46:20 2007 @@ -1341,12 +1341,12 @@ #define SCHED_TRANSF_DESCR "Schedule a transfer in the future" #define SCHED_BROADCAST_DESCR "Schedule a broadcast in the future" #define SCHED_HANGUP_DESCR "Schedule a hangup in the future" -#define UNSET_LONG_DESC "Unset a channel varaible for the channel calling the application." -#define SET_LONG_DESC "Set a channel varaible for the channel calling the application." -#define SET_GLOBAL_LONG_DESC "Set a global varaible." -#define SET_PROFILE_VAR_LONG_DESC "Set a caller profile varaible for the channel calling the application." -#define EXPORT_LONG_DESC "Set and export a channel varaible for the channel calling the application." -#define LOG_LONG_DESC "Logs a channel varaible for the channel calling the application." +#define UNSET_LONG_DESC "Unset a channel variable for the channel calling the application." +#define SET_LONG_DESC "Set a channel variable for the channel calling the application." +#define SET_GLOBAL_LONG_DESC "Set a global variable." +#define SET_PROFILE_VAR_LONG_DESC "Set a caller profile variable for the channel calling the application." +#define EXPORT_LONG_DESC "Set and export a channel variable for the channel calling the application." +#define LOG_LONG_DESC "Logs a channel variable for the channel calling the application." #define TRANSFER_LONG_DESC "Immediatly transfer the calling channel to a new extension" #define SLEEP_LONG_DESC "Pause the channel for a given number of milliseconds, consuming the audio for that period of time." SWITCH_MODULE_LOAD_FUNCTION(mod_dptools_load) @@ -1371,14 +1371,14 @@ SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "hangup", "Hangup the call", "Hangup the call for a channel.", hangup_function, "[<cause>]", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "log", "Logs a channel varaible", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "log", "Logs a channel variable", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "info", "Display Call Info", "Display Call Info", info_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "event", "Fire an event", "Fire an event", event_function, "", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "export", "Export a channel varaible across a bridge", EXPORT_LONG_DESC, export_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "set", "Set a channel varaible", SET_LONG_DESC, set_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "set_global", "Set a global varaible", SET_GLOBAL_LONG_DESC, set_global_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "set_profile_var", "Set a caller profile varaible", SET_PROFILE_VAR_LONG_DESC, set_profile_var_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "unset", "Unset a channel varaible", UNSET_LONG_DESC, unset_function, "<varname>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "export", "Export a channel variable across a bridge", EXPORT_LONG_DESC, export_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set", "Set a channel variable", SET_LONG_DESC, set_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set_global", "Set a global variable", SET_GLOBAL_LONG_DESC, set_global_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set_profile_var", "Set a caller profile variable", SET_PROFILE_VAR_LONG_DESC, set_profile_var_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "unset", "Unset a channel variable", UNSET_LONG_DESC, unset_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "ring_ready", "Indicate Ring_Ready", "Indicate Ring_Ready on a channel.", ring_ready_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "break", "Break", "Set the break flag.", break_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "detect_speech", "Detect speech", "Detect speech on a channel.", detect_speech_function, DETECT_SPEECH_SYNTAX, SAF_NONE);

1 0

[commit] r6196 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 11:50:37 2007 New Revision: 6196 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: add db api cmd and db_insert dialplan app Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Nov 9 11:50:37 2007 @@ -59,6 +59,15 @@ ");\n"; +static char db_sql[] = + "CREATE TABLE db_data (\n" + " hostname VARCHAR(255),\n" + " realm VARCHAR(255),\n" + " data_key VARCHAR(255),\n" + " data VARCHAR(255)\n" + ");\n"; + + static switch_status_t limit_execute_sql(char *sql, switch_mutex_t *mutex) { @@ -221,11 +230,21 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.odbc_dsn); - switch_odbc_handle_exec(globals.master_odbc, limit_sql, NULL); + if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from limit_data", NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_odbc_handle_exec(globals.master_odbc, limit_sql, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Create SQL Database!\n"); + } + } + if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from db_data", NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_odbc_handle_exec(globals.master_odbc, db_sql, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Create SQL Database!\n"); + } + } } else { #endif if ((db = switch_core_db_open_file(globals.dbname))) { switch_core_db_test_reactive(db, "select * from limit_data", NULL, limit_sql); + switch_core_db_test_reactive(db, "select * from db_data", NULL, db_sql); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n"); status = SWITCH_STATUS_FALSE; @@ -289,6 +308,96 @@ } +SWITCH_STANDARD_API(db_api_function) +{ + int argc = 0; + char *argv[4] = { 0 }; + char *mydata = NULL; + char *sql; + + switch_mutex_lock(globals.mutex); + + if (!switch_strlen_zero(cmd)) { + mydata = strdup(cmd); + argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc < 1) { + goto error; + } + + if (!strcasecmp(argv[0], "set")) { + if (argc < 4) { + goto error; + } + sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); + assert(sql); + limit_execute_sql(sql, NULL); + switch_safe_free(sql); + sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); + assert(sql); + limit_execute_sql(sql, NULL); + switch_safe_free(sql); + stream->write_function(stream, "+OK"); + goto done; + } else if (!strcasecmp(argv[0], "get")) { + char buf[256] = ""; + callback_t cbt = { 0 }; + if (argc < 3) { + goto error; + } + cbt.buf = buf; + cbt.len = sizeof(buf); + sql = switch_mprintf("select data from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); + limit_execute_sql_callback(NULL, sql, sql2str_callback, &cbt); + stream->write_function(stream, "%s", buf); + goto done; + } + + + error: + stream->write_function(stream, "!err!"); + + done: + + switch_mutex_unlock(globals.mutex); + switch_safe_free(mydata); + return SWITCH_STATUS_SUCCESS; + +} + + +#define DB_USAGE "<realm>/<key>/<val>" +#define DB_DESC "save data" + +SWITCH_STANDARD_APP(db_function) +{ + switch_channel_t *channel; + int argc = 0; + char *argv[3] = { 0 }; + char *mydata = NULL; + char *sql; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!switch_strlen_zero(data)) { + mydata = switch_core_session_strdup(session, data); + argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc < 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: db_insert %s\n", DB_USAGE); + return; + } + + + sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[0], argv[1], argv[2]); + assert(sql); + limit_execute_sql(sql, globals.mutex); + switch_safe_free(sql); +} + #define LIMIT_USAGE "<realm> <id> <max>" #define LIMIT_DESC "limit access to an extension" @@ -363,6 +472,7 @@ { switch_status_t status; switch_application_interface_t *app_interface; + switch_api_interface_t *commands_api_interface; memset(&globals, 0, sizeof(&globals)); gethostname(globals.hostname, sizeof(globals.hostname)); @@ -378,6 +488,9 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_NONE); + SWITCH_ADD_APP(app_interface, "db_insert", "Insert to the db", DB_DESC, db_function, DB_USAGE, SAF_NONE); + + SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[get|set]/<realm>/<key>/<value>"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r6195 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 11:12:11 2007 New Revision: 6195 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core.c Log: add global_setvar/getvar api command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Nov 9 11:12:11 2007 @@ -1658,6 +1658,50 @@ switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } + + + +#define GLOBAL_SETVAR_SYNTAX "<var> <value>" +SWITCH_STANDARD_API(global_setvar_function) +{ + char *mycmd = NULL, *argv[3] = { 0 }; + int argc = 0; + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, '=', argv, (sizeof(argv) / sizeof(argv[0]))); + if (argc > 0) { + char *var_name = argv[0]; + char *var_value = argv[1]; + + if (switch_strlen_zero(var_value)) { + var_value = NULL; + } + switch_core_set_variable(var_name, var_value); + stream->write_function(stream, "+OK"); + goto done; + } + } + + stream->write_function(stream, "USAGE: %s\n", GLOBAL_SETVAR_SYNTAX); + +done: + switch_safe_free(mycmd); + return SWITCH_STATUS_SUCCESS; +} + +#define GLOBAL_GETVAR_SYNTAX "<var>" +SWITCH_STANDARD_API(global_getvar_function) +{ + + if (!switch_strlen_zero(cmd)) { + stream->write_function(stream, "%s", switch_str_nil(switch_core_get_variable(cmd))); + goto done; + } + + stream->write_function(stream, "USAGE: %s\n", GLOBAL_GETVAR_SYNTAX); + done: + return SWITCH_STATUS_SUCCESS; +} SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load) { @@ -1678,6 +1722,8 @@ SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, ""); SWITCH_ADD_API(commands_api_interface, "uuid_setvar", "uuid_setvar", uuid_setvar_function, SETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "global_setvar", "global_setvar", global_setvar_function, GLOBAL_SETVAR_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "global_getvar", "global_getvar", global_getvar_function, GLOBAL_GETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); SWITCH_ADD_API(commands_api_interface, "session_record", "session record", session_record_function, SESS_REC_SYNTAX); SWITCH_ADD_API(commands_api_interface, "broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Nov 9 11:12:11 2007 @@ -152,15 +152,19 @@ { char *val; - switch_mutex_lock(runtime.throttle_mutex); - val = (char *) switch_core_hash_find(runtime.global_vars, varname); - if (val) { - free(val); - } - if (value) { - switch_core_hash_insert(runtime.global_vars, varname, strdup(value)); + if (varname) { + switch_mutex_lock(runtime.throttle_mutex); + val = (char *) switch_core_hash_find(runtime.global_vars, varname); + if (val) { + free(val); + } + if (value) { + switch_core_hash_insert(runtime.global_vars, varname, strdup(value)); + } else { + switch_core_hash_delete(runtime.global_vars, varname); + } + switch_mutex_unlock(runtime.throttle_mutex); } - switch_mutex_unlock(runtime.throttle_mutex); } SWITCH_DECLARE(char *) switch_core_get_uuid(void)

1 0

[commit] r6194 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 10:55:40 2007 New Revision: 6194 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_core.c Log: add set_global 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 Fri Nov 9 10:55:40 2007 @@ -360,6 +360,30 @@ } } +SWITCH_STANDARD_APP(set_global_function) +{ + char *var, *val = NULL; + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); + } else { + var = strdup(data); + assert(var); + val = strchr(var, '='); + + if (val) { + *val++ = '\0'; + if (switch_strlen_zero(val)) { + val = NULL; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET GLOBAL [%s]=[%s]\n", var, val ? val : "UNDEF"); + switch_core_set_variable(var, val); + free(var); + } +} + SWITCH_STANDARD_APP(set_profile_var_function) { @@ -1319,6 +1343,7 @@ #define SCHED_HANGUP_DESCR "Schedule a hangup in the future" #define UNSET_LONG_DESC "Unset a channel varaible for the channel calling the application." #define SET_LONG_DESC "Set a channel varaible for the channel calling the application." +#define SET_GLOBAL_LONG_DESC "Set a global varaible." #define SET_PROFILE_VAR_LONG_DESC "Set a caller profile varaible for the channel calling the application." #define EXPORT_LONG_DESC "Set and export a channel varaible for the channel calling the application." #define LOG_LONG_DESC "Logs a channel varaible for the channel calling the application." @@ -1351,6 +1376,7 @@ SWITCH_ADD_APP(app_interface, "event", "Fire an event", "Fire an event", event_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "export", "Export a channel varaible across a bridge", EXPORT_LONG_DESC, export_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set", "Set a channel varaible", SET_LONG_DESC, set_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set_global", "Set a global varaible", SET_GLOBAL_LONG_DESC, set_global_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set_profile_var", "Set a caller profile varaible", SET_PROFILE_VAR_LONG_DESC, set_profile_var_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "unset", "Unset a channel varaible", UNSET_LONG_DESC, unset_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "ring_ready", "Indicate Ring_Ready", "Indicate Ring_Ready on a channel.", ring_ready_function, "", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Nov 9 10:55:40 2007 @@ -141,12 +141,26 @@ SWITCH_DECLARE(char *) switch_core_get_variable(const char *varname) { - return (char *) switch_core_hash_find(runtime.global_vars, varname); + char *val; + switch_mutex_lock(runtime.throttle_mutex); + val = (char *) switch_core_hash_find(runtime.global_vars, varname); + switch_mutex_unlock(runtime.throttle_mutex); + return val; } 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)); + char *val; + + switch_mutex_lock(runtime.throttle_mutex); + val = (char *) switch_core_hash_find(runtime.global_vars, varname); + if (val) { + free(val); + } + if (value) { + switch_core_hash_insert(runtime.global_vars, varname, strdup(value)); + } + switch_mutex_unlock(runtime.throttle_mutex); } SWITCH_DECLARE(char *) switch_core_get_uuid(void)

1 0

[commit] r6193 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_expr
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: anthm Date: Fri Nov 9 10:26:32 2007 New Revision: 6193 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c freeswitch/trunk/src/switch_utils.c Log: add regex api func Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Nov 9 10:26:32 2007 @@ -302,6 +302,7 @@ SWITCH_DECLARE(char *) switch_strip_spaces(const char *str); SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr); SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip); +SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup); /*! \brief Escape a string by prefixing a list of characters with an escape character 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 Fri Nov 9 10:26:32 2007 @@ -41,6 +41,61 @@ SWITCH_MODULE_DEFINITION(mod_commands, mod_commands_load, NULL, NULL); +SWITCH_STANDARD_API(regex_function) +{ + switch_regex_t *re = NULL; + int ovector[30]; + int argc; + char *mydata = NULL, *argv[3]; + size_t len = 0; + char *substituted = NULL; + int proceed = 0; + + if (!cmd) { + goto error; + } + + mydata = strdup(cmd); + assert(mydata); + + argc = switch_separate_string(mydata, '|', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc < 2) { + goto error; + } + + + if ((proceed = switch_regex_perform(argv[0], argv[1], &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { + if (argc > 2) { + len = strlen(argv[0]) * 3; + substituted = malloc(len); + assert(substituted); + memset(substituted, 0, len); + switch_replace_char(argv[2], '%','$', SWITCH_FALSE); + switch_perform_substitution(re, proceed, argv[2], argv[0], substituted, len, ovector); + + stream->write_function(stream, "%s", substituted); + free(substituted); + } else { + stream->write_function(stream, "true"); + } + } else { + stream->write_function(stream, "false"); + } + + goto ok; + + error: + stream->write_function(stream, "!err!"); + ok: + + switch_regex_safe_free(re); + switch_safe_free(mydata); + + return SWITCH_STATUS_SUCCESS; + +} + typedef enum { O_NONE, O_EQ, @@ -1640,6 +1695,7 @@ SWITCH_ADD_API(commands_api_interface, "xml_wrap", "Wrap another api command in xml", xml_wrap_api_function, "<command> <args>"); SWITCH_ADD_API(commands_api_interface, "is_lan_addr", "see if an ip is a lan addr", lan_addr_function, "<ip>"); SWITCH_ADD_API(commands_api_interface, "qq", "Eval a conditional", qq_function, "<expr> ? <true val> : <false val>"); + SWITCH_ADD_API(commands_api_interface, "regex", "Eval a regex", regex_function, "<data>|<pattern>[|<subst string>]"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD; Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Fri Nov 9 10:26:32 2007 @@ -111,7 +111,7 @@ /* Parse expression */ err = exprParse(e, (char *)expr); - printf("WTF %s\n", expr); + if(err != EXPR_ERROR_NOERROR) goto error; Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Nov 9 10:26:32 2007 @@ -223,6 +223,26 @@ } +SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup) +{ + char *p; + + if (dup) { + p = strdup(str); + assert(p); + } else { + p = str; + } + + for(;p && *p; p++) { + if (*p == from) { + *p = to; + } + } + + return p; +} + SWITCH_DECLARE(char *) switch_strip_spaces(const char *str) { const char *sp = str;

1 0

[commit] r6192 - freeswitch/trunk/conf
by Freeswitch SVN 09 Nov '07

09 Nov '07

Author: brian Date: Fri Nov 9 05:30:24 2007 New Revision: 6192 Modified: freeswitch/trunk/conf/default_context.xml Log: interesting Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Fri Nov 9 05:30:24 2007 @@ -1,4 +1,9 @@ <context name="default"> + <extension name="global"> + <condition> + <action application="set" data="use_profile=${qq(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> + </condition> + </extension> <!-- if the calling party is the called party, go to their VM if the calling party is NOT the called party dial the extension

1 0