January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11170 - freeswitch/trunk/conf
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Tue Jan 13 17:57:45 2009 New Revision: 11170 Log: testing pre-commit hook Modified: freeswitch/trunk/conf/freeswitch.xml Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue Jan 13 17:57:45 2009 @@ -16,6 +16,7 @@ NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE --> + <?xml version="1.0"?> <document type="freeswitch/xml"> <!--#comment

1 0

[commit] r11169 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 17:57:12 2009 New Revision: 11169 Log: tab cleanup Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Jan 13 17:57:12 2009 @@ -389,16 +389,16 @@ { switch_hash_index_t *hi; void *val; - const void *var; + const void *var; switch_core_session_t *session; - switch_channel_t *channel; + switch_channel_t *channel; int total = 0; switch_mutex_lock(node->mutex); for (hi = switch_hash_first(NULL, node->consumer_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &var, NULL, &val); session = (switch_core_session_t *) val; - channel = switch_core_session_get_channel(session); + channel = switch_core_session_get_channel(session); if (!switch_channel_test_flag(channel, CF_BRIDGED)) { total++; } @@ -469,7 +469,7 @@ switch_channel_set_state(channel, CS_EXECUTE); switch_core_session_rwunlock(session); - end: + end: switch_core_destroy_memory_pool(&h->pool); @@ -1607,7 +1607,7 @@ stream->write_function(stream, "-ERR Usage: %s\n", FIFO_API_SYNTAX); } - done: + done: switch_mutex_unlock(globals.mutex); return SWITCH_STATUS_SUCCESS; @@ -1814,7 +1814,7 @@ } switch_xml_free(xml); - done: + done: if (reload) { switch_hash_index_t *hi; @@ -1863,8 +1863,8 @@ sql = switch_mprintf("delete from fifo_outbound where fifo_name='%q' and uuid = '%q'", fifo_name, digest); switch_assert(sql); - fifo_execute_sql(sql, globals.sql_mutex); - free(sql); + fifo_execute_sql(sql, globals.sql_mutex); + free(sql); switch_mutex_lock(globals.mutex); @@ -1895,8 +1895,8 @@ sql = switch_mprintf("delete from fifo_outbound where fifo_name='%q' and uuid = '%q' and hostname='%q'", fifo_name, digest, globals.hostname); switch_assert(sql); - fifo_execute_sql(sql, globals.sql_mutex); - free(sql); + fifo_execute_sql(sql, globals.sql_mutex); + free(sql); } #define FIFO_MEMBER_API_SYNTAX "[add <fifo_name> <originate_string> [<simo_count>] [<timeout>] [<lag>] | del <fifo_name> <originate_string>]" @@ -1956,10 +1956,10 @@ stream->write_function(stream, "%s", "+OK\n"); } else { stream->write_function(stream, "%s", "-ERR Invalid!\n"); - goto done; + goto done; } - done: + done: free(mydata);

1 0

[commit] r11168 - freeswitch/trunk/src/mod/applications/mod_fax
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 17:55:49 2009 New Revision: 11168 Log: tab cleanup Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Tue Jan 13 17:55:49 2009 @@ -89,7 +89,7 @@ /* UNUSED AT THE MOMENT int enable_t38_reinvite; - */ + */ }; @@ -131,7 +131,7 @@ if (!switch_strlen_zero(msg)) { switch_log_printf(SWITCH_CHANNEL_LOG, fs_log_level, "%s", msg); - } + } } /* @@ -149,7 +149,7 @@ pvt = (pvt_t *) user_data; switch_assert(pvt); - + session = pvt->session; switch_assert(session); @@ -166,11 +166,11 @@ if (pvt->app_mode == FUNCTION_TX) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully sent.\n"); - } else if (pvt->app_mode == FUNCTION_RX) { + } else if (pvt->app_mode == FUNCTION_RX) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully received.\n"); - } else { + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully managed. How ?\n"); - } + } switch_channel_set_variable(channel, "fax_success", "1"); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax processing not successful - result (%d) %s.\n", result, @@ -193,8 +193,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); /* - Set our channel variables - */ + Set our channel variables + */ tmp = switch_mprintf("%i", result); if (tmp) { @@ -244,11 +244,11 @@ switch_safe_free(tmp); } - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); +switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); /* - TODO Fire events - */ + TODO Fire events + */ } static switch_status_t spanfax_init(pvt_t * pvt, transport_mode_t trans_mode) @@ -272,10 +272,10 @@ pvt->fax_state = (fax_state_t *) switch_core_session_alloc(pvt->session, sizeof(fax_state_t)); } else { return SWITCH_STATUS_FALSE; - } + } fax = pvt->fax_state; - t30 = fax_get_t30_state(fax); + t30 = fax_get_t30_state(fax); memset(fax, 0, sizeof(fax_state_t)); if (fax_init(fax, pvt->caller) == NULL) { @@ -335,7 +335,7 @@ Here goes the T.38 SpanDSP initializing functions T.38 will require a big effort as it needs a different approach but the pieces are already in place - */ + */ default: assert(0); /* Whaaat ? */ break; @@ -352,14 +352,14 @@ if (pvt->fax_state) { if (pvt->t38_state) { terminate = 0; - } else { + } else { terminate = 1; - } + } - t30 = fax_get_t30_state(pvt->fax_state); + t30 = fax_get_t30_state(pvt->fax_state); if (terminate && t30) { t30_terminate(t30); - } + } fax_release(pvt->fax_state); } @@ -367,14 +367,14 @@ if (pvt->t38_state) { if (pvt->t38_state) { terminate = 1; - } else { + } else { terminate = 0; - } + } - t30 = t38_terminal_get_t30_state(pvt->t38_state); + t30 = t38_terminal_get_t30_state(pvt->t38_state); if (terminate && t30) { t30_terminate(t30); - } + } t38_terminal_release(pvt->t38_state); } @@ -405,10 +405,10 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); - if (!switch_channel_media_ready(channel)) { - switch_channel_answer(channel); - } - + if (!switch_channel_media_ready(channel)) { + switch_channel_answer(channel); + } + /* Allocate our structs */ pvt = switch_core_session_alloc(session, sizeof(pvt_t)); @@ -428,11 +428,11 @@ if (pvt->app_mode == FUNCTION_TX) { pvt->caller = 1; - } else if (pvt->app_mode == FUNCTION_RX) { + } else if (pvt->app_mode == FUNCTION_RX) { pvt->caller = 0; - } else { + } else { assert(0); /* UH ? */ - } + } } @@ -542,12 +542,12 @@ } /* - *** Initialize the SpanDSP elements *** + *** Initialize the SpanDSP elements *** - Note: we could analyze if a fax was already detected in previous stages - and if so, when T.38 will be supported, send a reinvite in T38_MODE, - bypassing AUDIO_MODE. - */ + Note: we could analyze if a fax was already detected in previous stages + and if so, when T.38 will be supported, send a reinvite in T38_MODE, + bypassing AUDIO_MODE. + */ if ((spanfax_init(pvt, AUDIO_MODE) != SWITCH_STATUS_SUCCESS)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot initialize Fax engine\n"); @@ -557,14 +557,14 @@ /* Note: Disable echocan on the channel, remember to call app "disable_ec" in the dialplan before invoking fax applications - */ + */ /* - Note: we are disabling the Jitterbuffer, here, before we answer. - If you have set it to something else and the channel is pre-answered, - it will have no effect. Make sure that if you want more reliable - faxes, it is disabled. - */ + Note: we are disabling the Jitterbuffer, here, before we answer. + If you have set it to something else and the channel is pre-answered, + it will have no effect. Make sure that if you want more reliable + faxes, it is disabled. + */ switch_channel_set_variable(channel, "jitterbuffer_msec", "0"); @@ -608,8 +608,8 @@ goto done; } - switch_ivr_sleep(session, 250, SWITCH_TRUE, NULL); - + switch_ivr_sleep(session, 250, SWITCH_TRUE, NULL); + while (switch_channel_ready(channel)) { int tx = 0; switch_status_t status; @@ -623,7 +623,7 @@ - call t38_terminal_send_timeout(), sleep for a while The T.38 stuff can be placed here (and the audio stuff can be skipped) - */ + */ /* read new audio frame from the channel */ status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); @@ -635,12 +635,12 @@ /* Skip CNG frames (auto-generated by FreeSWITCH, usually) */ if (!switch_test_flag(read_frame, SFF_CNG)) { - /* pass the new incoming audio frame to the fax_rx function */ - if (fax_rx(pvt->fax_state, (int16_t *) read_frame->data, read_frame->samples)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax_rx reported an error\n"); - goto done; - } - } + /* pass the new incoming audio frame to the fax_rx function */ + if (fax_rx(pvt->fax_state, (int16_t *) read_frame->data, read_frame->samples)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax_rx reported an error\n"); + goto done; + } + } if ((tx = fax_tx(pvt->fax_state, buf, write_codec.implementation->samples_per_packet)) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax_tx reported an error\n");

1 0

[commit] r11167 - freeswitch/trunk/conf
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Tue Jan 13 17:54:56 2009 New Revision: 11167 Log: testing pre-commit hook Modified: freeswitch/trunk/conf/freeswitch.xml Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue Jan 13 17:54:56 2009 @@ -16,7 +16,6 @@ NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE --> - <?xml version="1.0"?> <document type="freeswitch/xml"> <!--#comment

1 0

[commit] r11166 - freeswitch/trunk/conf
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Tue Jan 13 17:51:17 2009 New Revision: 11166 Log: test Modified: freeswitch/trunk/conf/freeswitch.xml Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue Jan 13 17:51:17 2009 @@ -16,6 +16,7 @@ NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE --> + <?xml version="1.0"?> <document type="freeswitch/xml"> <!--#comment

1 0

[commit] r11165 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 17:48:55 2009 New Revision: 11165 Log: tab cleanup Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 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 Tue Jan 13 17:48:55 2009 @@ -603,14 +603,14 @@ SWITCH_STANDARD_APP(presence_function) { char *argv[6] = { 0 }; - int argc; - char *mydata = NULL; + int argc; + char *mydata = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); - return; - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); + return; + } if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 2) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); @@ -2105,7 +2105,7 @@ } - done: + done: if (dest && dest != template) { switch_safe_free(dest);

1 0

[commit] r11164 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 17:38:12 2009 New Revision: 11164 Log: Brian is getting new earrings Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Jan 13 17:38:12 2009 @@ -44,11 +44,11 @@ typedef struct easyroute_results{ char limit[16]; - char destnum[16]; - char dialstring[256]; - char group[16]; + char destnum[16]; + char dialstring[256]; + char group[16]; char acctcode[17]; - char translated[17]; + char translated[17]; } easyroute_results_t; @@ -170,7 +170,7 @@ if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from gateways", NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the gateways table\?\?)\n"); } - } else { + } else { #endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Connection (did you enable it?!)\n"); #ifdef SWITCH_HAVE_ODBC @@ -257,7 +257,7 @@ switch_set_string(results->acctcode, pdata.acctcode); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "DB Error Setting Default Route!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DB Error Setting Default Route!\n"); switch_set_string(results->limit, "9999"); switch_snprintf(results->dialstring, 256, "%s/%s@%s", globals.default_techprofile, dn, globals.default_gateway); switch_set_string(results->group, ""); @@ -290,7 +290,7 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; route_lookup(destnum, &results); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "EASY ROUTE DEST: [%s]\n", results.dialstring); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "EASY ROUTE DEST: [%s]\n", results.dialstring); switch_channel_set_variable(channel, "easy_destnum", results.destnum); switch_channel_set_variable(channel, "easy_dialstring", results.dialstring); switch_channel_set_variable(channel, "easy_group", results.group); @@ -319,14 +319,34 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; + if (argc < 1 || argc > 2){ + stream->write_function(stream, "Invalid Input!\n"); + return SWITCH_STATUS_SUCCESS; + } if (!route_lookup(destnum, &results) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); return SWITCH_STATUS_SUCCESS; } - - stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); - stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); + if (argc != 2){ + stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); + stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); + } else { + if (!strncasecmp(argv[1], "dialstring", 10)) { + stream->write_function(stream, "%s", results.dialstring); + } else if (!strncasecmp(argv[1], "translated", 10)) { + stream->write_function(stream, "%s", results.translated); + } else if (!strncasecmp(argv[1], "limit", 5)) { + stream->write_function(stream, "%s", results.limit); + } else if (!strncasecmp(argv[1], "group", 5)) { + stream->write_function(stream, "%s", results.group); + } else if (!strncasecmp(argv[1], "acctcode", 8)) { + stream->write_function(stream, "%s", results.acctcode); + } else { + stream->write_function(stream, "Invalid Input!\n"); + return SWITCH_STATUS_SUCCESS; + } + } } else { stream->write_function(stream, "Invalid Input!\n"); } @@ -354,7 +374,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_easyroute_shutdown) { - switch_odbc_handle_connect(globals.master_odbc); + switch_odbc_handle_disconnect(globals.master_odbc); return SWITCH_STATUS_UNLOAD; }

1 0

[commit] r11075 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 18:27:54 2009 New Revision: 11075 Log: clean up formatting Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Jan 13 18:27:54 2009 @@ -389,16 +389,16 @@ { switch_hash_index_t *hi; void *val; - const void *var; + const void *var; switch_core_session_t *session; - switch_channel_t *channel; + switch_channel_t *channel; int total = 0; switch_mutex_lock(node->mutex); for (hi = switch_hash_first(NULL, node->consumer_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &var, NULL, &val); session = (switch_core_session_t *) val; - channel = switch_core_session_get_channel(session); + channel = switch_core_session_get_channel(session); if (!switch_channel_test_flag(channel, CF_BRIDGED)) { total++; } @@ -1863,8 +1863,8 @@ sql = switch_mprintf("delete from fifo_outbound where fifo_name='%q' and uuid = '%q'", fifo_name, digest); switch_assert(sql); - fifo_execute_sql(sql, globals.sql_mutex); - free(sql); + fifo_execute_sql(sql, globals.sql_mutex); + free(sql); switch_mutex_lock(globals.mutex); @@ -1895,8 +1895,8 @@ sql = switch_mprintf("delete from fifo_outbound where fifo_name='%q' and uuid = '%q' and hostname='%q'", fifo_name, digest, globals.hostname); switch_assert(sql); - fifo_execute_sql(sql, globals.sql_mutex); - free(sql); + fifo_execute_sql(sql, globals.sql_mutex); + free(sql); } #define FIFO_MEMBER_API_SYNTAX "[add <fifo_name> <originate_string> [<simo_count>] [<timeout>] [<lag>] | del <fifo_name> <originate_string>]" @@ -1956,7 +1956,7 @@ stream->write_function(stream, "%s", "+OK\n"); } else { stream->write_function(stream, "%s", "-ERR Invalid!\n"); - goto done; + goto done; } done:

1 0

[commit] r11074 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 18:25:47 2009 New Revision: 11074 Log: clean up formatting Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 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 Tue Jan 13 18:25:47 2009 @@ -603,14 +603,14 @@ SWITCH_STANDARD_APP(presence_function) { char *argv[6] = { 0 }; - int argc; - char *mydata = NULL; + int argc; + char *mydata = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); - return; - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); + return; + } if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 2) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); @@ -2105,7 +2105,7 @@ } - done: + done: if (dest && dest != template) { switch_safe_free(dest);

1 0

[commit] r11073 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 18:22:04 2009 New Revision: 11073 Log: clean up formatting Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 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 Tue Jan 13 18:22:04 2009 @@ -253,7 +253,7 @@ switch_event_destroy(&params); } - end: + end: switch_safe_free(group_name); @@ -485,7 +485,7 @@ stream->write_function(stream, "%s", digest); } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(url_decode_function) @@ -502,7 +502,7 @@ stream->write_function(stream, "%s", reply); switch_safe_free(data); - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(eval_function) @@ -546,7 +546,7 @@ free(expanded); } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(module_exists_function) @@ -559,7 +559,7 @@ } } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(domain_exists_function) @@ -594,7 +594,7 @@ stream->write_function(stream, "%s", reply); switch_safe_free(data); - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } @@ -1151,7 +1151,7 @@ p++; } } - end: + end: if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX); @@ -1194,7 +1194,7 @@ p++; } } - end: + end: if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX); @@ -2270,7 +2270,7 @@ } } - bad: + bad: stream->write_function(stream, "-ERR Invalid syntax. USAGE: %s\n", SCHED_SYNTAX); @@ -2682,7 +2682,7 @@ holder.stream->write_function(holder.stream, "-ERR Cannot find format %s\n", as); } - end: + end: switch_safe_free(mydata); @@ -3100,17 +3100,17 @@ #define SYSTEM_SYNTAX "<command>" SWITCH_STANDARD_API(system_function) { - if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "-USAGE: %s\n", SYSTEM_SYNTAX); - return SWITCH_STATUS_SUCCESS; - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd); - if (switch_system(cmd, SWITCH_TRUE) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd); - } - stream->write_function(stream, "+OK\n"); - return SWITCH_STATUS_SUCCESS; + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "-USAGE: %s\n", SYSTEM_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd); + if (switch_system(cmd, SWITCH_TRUE) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd); + } + stream->write_function(stream, "+OK\n"); + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(strftime_tz_api_function) @@ -3246,7 +3246,7 @@ switch_console_set_complete("add fsctl shutdown restart asap"); switch_console_set_complete("add fsctl shutdown cancel"); switch_console_set_complete("add fsctl sps"); - switch_console_set_complete("add fsctl sync_clock"); + switch_console_set_complete("add fsctl sync_clock"); switch_console_set_complete("add fsctl reclaim_mem"); switch_console_set_complete("add fsctl max_sessions"); switch_console_set_complete("add fsctl max_dtmf_duration");

1 0