December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6504 - in freeswitch/trunk/src/mod: applications/mod_voicemail loggers/mod_logfile loggers/mod_syslog
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 17:36:05 2007 New Revision: 6504 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Log: update logger code Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Dec 4 17:36:05 2007 @@ -1140,7 +1140,7 @@ message_count(profile, cbt->user, cbt->domain, cbt->in_folder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); - switch_time_exp_lt(&tm, atoi(cbt->created_epoch)); + switch_time_exp_lt(&tm, atoi(cbt->created_epoch) * 1000000); switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); snprintf(tmp,sizeof(tmp), "%d", total_new_messages); Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Tue Dec 4 17:36:05 2007 @@ -38,7 +38,7 @@ #define DEFAULT_FORMAT "${data}" #define DEFAULT_LIMIT 0x7FFFFFFF -#define WARM_FUZZY_OFFSET 64 +#define WARM_FUZZY_OFFSET 256 #define MAX_ROT 4096 /* why not */ static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; @@ -107,21 +107,52 @@ return; } +static switch_status_t mod_logfile_rotate(void); + +static switch_status_t mod_logfile_openlogfile(switch_bool_t check) +{ + unsigned int flags = 0; + switch_file_t *afd; + switch_status_t stat; + + flags |= SWITCH_FOPEN_CREATE; + flags |= SWITCH_FOPEN_READ; + flags |= SWITCH_FOPEN_WRITE; + flags |= SWITCH_FOPEN_APPEND; + + stat = switch_file_open(&afd, globals.logfile, flags, SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, module_pool); + if (stat != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + + globals.log_afd = afd; + + globals.log_size = switch_file_get_size(globals.log_afd); + + if (check && globals.log_size >= globals.roll_size) { + mod_logfile_rotate(); + } + + return SWITCH_STATUS_SUCCESS; +} + + /* rotate the log file */ static switch_status_t mod_logfile_rotate(void) { unsigned int i = 0; - unsigned int flags = 0; char *p = NULL; - char *q = NULL; switch_status_t stat = 0; - switch_size_t nbytes = 1024; - switch_file_t *l_afd = NULL; - switch_memory_pool_t *pool = NULL; int64_t offset = 0; + switch_memory_pool_t *pool; + switch_time_exp_t tm; + char date[80] = ""; + switch_size_t retsize; + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm); globals.log_size = 0; - switch_core_new_memory_pool(&pool); stat = switch_file_seek(globals.log_afd, SWITCH_SEEK_SET, &offset); @@ -129,78 +160,34 @@ return SWITCH_STATUS_FALSE; p = malloc(strlen(globals.logfile)+WARM_FUZZY_OFFSET); - if (!p) { - return SWITCH_STATUS_FALSE; - } - - q = malloc(1024); - if (!q) { - free(p); - return SWITCH_STATUS_FALSE; - } + assert(p); memset(p, '\0', strlen(globals.logfile)+WARM_FUZZY_OFFSET); + switch_core_new_memory_pool(&pool); + for (i=1; i < MAX_ROT; i++) { - sprintf((char *)p, "%s.%i", globals.logfile, i); - - stat = switch_file_open(&l_afd, p, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD, pool); - - if (stat == SWITCH_STATUS_SUCCESS) { - switch_file_close(l_afd); - continue; - } - flags |= SWITCH_FOPEN_READ; - flags |= SWITCH_FOPEN_WRITE; - flags |= SWITCH_FOPEN_CREATE; - - stat = switch_file_open(&l_afd, p, flags , SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE ,pool); - if (stat == SWITCH_STATUS_SUCCESS) - break; - } - - while ((stat = switch_file_read(globals.log_afd, q, &nbytes)) == SWITCH_STATUS_SUCCESS) { - switch_file_write(l_afd, q, &nbytes); - memset(q, '\0', 1024); - nbytes = 1024; + sprintf((char *)p, "%s.%s.%i", globals.logfile, date, i); + if (switch_file_exists(p, pool) == SWITCH_STATUS_SUCCESS) { + continue; + } + + switch_file_close(globals.log_afd); + switch_file_rename(globals.logfile, p, pool); + mod_logfile_openlogfile(SWITCH_FALSE); + break; } - offset = 0; - stat = switch_file_seek(globals.log_afd, SWITCH_SEEK_SET, &offset); free(p); - free(q); - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t mod_logfile_openlogfile(void) -{ - unsigned int flags = 0; - switch_file_t *afd; - switch_status_t stat; - switch_memory_pool_t *pool; - - flags |= SWITCH_FOPEN_CREATE; - flags |= SWITCH_FOPEN_READ; - flags |= SWITCH_FOPEN_WRITE; - flags |= SWITCH_FOPEN_APPEND; - - switch_core_new_memory_pool(&pool); - stat = switch_file_open(&afd, globals.logfile,flags,SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, pool); - if (stat != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } + - globals.log_afd = afd; - - globals.log_size = switch_file_get_size(globals.log_afd); - - if (globals.log_size >= globals.roll_size) { - mod_logfile_rotate(); - } + switch_core_destroy_memory_pool(&pool); return SWITCH_STATUS_SUCCESS; } + +#if 0 /* write to the actual logfile */ static switch_status_t mod_logfile_write(char *fmt, ...) { @@ -219,47 +206,43 @@ globals.log_size += len; - /* we may want to hold back on this for preformance reasons */ if (globals.log_size >= globals.roll_size) { mod_logfile_rotate(); } return SWITCH_STATUS_SUCCESS; } +#endif -static switch_status_t mod_logfile_logger(const switch_log_node_t *node, switch_log_level_t level) +/* write to the actual logfile */ +static switch_status_t mod_logfile_raw_write(char *log_data) { - char line_no[sizeof(int)*8+1]; - char date[80] = ""; - switch_time_exp_t time; - switch_size_t retsize; - char *message = NULL; - - if (!levels[node->level].on) { - return SWITCH_STATUS_SUCCESS; - } + switch_size_t len; + len = strlen(log_data); - message = (char *)malloc(strlen(globals.format)+2); - switch_copy_string(message, globals.format, strlen(globals.format)+1); + if (len <= 0) + return SWITCH_STATUS_FALSE; - message = switch_string_replace(message, "${message}", node->content); + if (switch_file_write(globals.log_afd, log_data, &len) != SWITCH_STATUS_SUCCESS) { + switch_file_close(globals.log_afd); + mod_logfile_openlogfile(SWITCH_TRUE); + } + + globals.log_size += len; - if (switch_time_exp_lt(&time, node->timestamp) != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; + if (globals.log_size >= globals.roll_size) { + mod_logfile_rotate(); } - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &time); - - message = switch_string_replace(message, "${time}", date); - message = switch_string_replace(message, "${file}", node->file); - message = switch_string_replace(message, "${func}", node->func); + return SWITCH_STATUS_SUCCESS; +} - snprintf(line_no, sizeof(line_no), "%d", node->line); - message = switch_string_replace(message, "${line}", line_no); +static switch_status_t mod_logfile_logger(const switch_log_node_t *node, switch_log_level_t level) +{ - if (!switch_strlen_zero(message)) { - mod_logfile_write("%s", message); - } + if (levels[node->level].on) { + mod_logfile_raw_write(node->data); + } return SWITCH_STATUS_SUCCESS; } @@ -316,7 +299,7 @@ return status; } - mod_logfile_openlogfile(); + mod_logfile_openlogfile(SWITCH_TRUE); switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG); Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Tue Dec 4 17:36:05 2007 @@ -69,31 +69,8 @@ static switch_status_t mod_syslog_logger(const switch_log_node_t *node, switch_log_level_t level) { char *message = NULL; - char line_no[sizeof(int) * 8 + 1]; - char date[80] = ""; - switch_time_exp_t time; - switch_size_t retsize; int syslog_level; - message = (char *) malloc(strlen(globals.format) + 2); - - switch_copy_string(message, globals.format, strlen(globals.format) + 1); - - message = switch_string_replace(message, "${message}", node->content); - - if (switch_time_exp_lt(&time, node->timestamp) != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } - - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &time); - message = switch_string_replace(message, "${time}", date); - - message = switch_string_replace(message, "${file}", node->file); - message = switch_string_replace(message, "${func}", node->func); - - snprintf(line_no, sizeof(line_no), "%d", node->line); - message = switch_string_replace(message, "${line}", line_no); - switch (level) { case SWITCH_LOG_DEBUG: syslog_level = LOG_DEBUG; @@ -122,10 +99,10 @@ } if (!switch_strlen_zero(message)) { - syslog(syslog_level, "%s", message); + syslog(syslog_level, "%s", node->data); } - free(message); + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r6503 - freeswitch/trunk/src
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 16:55:48 2007 New Revision: 6503 Modified: freeswitch/trunk/src/switch_rtp.c Log: fix possible block in rtp setup Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Dec 4 16:55:48 2007 @@ -329,7 +329,9 @@ switch_socket_t *new_sock = NULL, *old_sock = NULL; switch_status_t status = SWITCH_STATUS_FALSE; char o[5] = "TEST", i[5] = ""; - switch_size_t len; + switch_size_t len, ilen = 0; + int x; + *err = NULL; if (switch_sockaddr_info_get(&rtp_session->local_addr, host, SWITCH_UNSPEC, port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS) { @@ -357,10 +359,28 @@ } len = sizeof(i); + switch_socket_opt_set(new_sock, SWITCH_SO_NONBLOCK, TRUE); + switch_socket_sendto(new_sock, rtp_session->local_addr, 0, (void *) o, &len); - switch_socket_recvfrom(rtp_session->from_addr, new_sock, 0, (void *) i, &len); - if (!len) { + x = 0; + while(!ilen) { + ilen = len; + switch_status_t status = switch_socket_recvfrom(rtp_session->from_addr, new_sock, 0, (void *) i, &ilen); + + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + break; + } + + if (++x > 500) { + break; + } + switch_yield(1000); + } + switch_socket_opt_set(new_sock, SWITCH_SO_NONBLOCK, FALSE); + + if (!ilen) { + *err = "Send myself a packet failed!"; goto done; }

1 0

[commit] r6502 - in freeswitch/trunk/src: . include
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: mikej Date: Tue Dec 4 16:05:10 2007 New Revision: 6502 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/switch_apr.c Log: add switch_file_rename Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Tue Dec 4 16:05:10 2007 @@ -720,6 +720,8 @@ */ SWITCH_DECLARE(switch_status_t) switch_file_remove(const char *path, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_file_rename(const char *from_path, const char *to_path, switch_memory_pool_t *pool); + /** * Read data from the specified file. * @param thefile The file descriptor to read from. Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Tue Dec 4 16:05:10 2007 @@ -328,6 +328,11 @@ return apr_file_close(thefile); } +SWITCH_DECLARE(switch_status_t) switch_file_rename(const char *from_path, const char *to_path, switch_memory_pool_t *pool) +{ + return apr_file_rename(from_path, to_path, pool); +} + SWITCH_DECLARE(switch_status_t) switch_file_remove(const char *path, switch_memory_pool_t *pool) { return apr_file_remove(path, pool);

1 0

[commit] r6501 - in freeswitch/trunk/src/mod/applications: mod_commands mod_dptools
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 14:39:14 2007 New Revision: 6501 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add some user stuff 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 Dec 4 14:39:14 2007 @@ -41,6 +41,84 @@ SWITCH_MODULE_DEFINITION(mod_commands, mod_commands_load, NULL, NULL); +SWITCH_STANDARD_API(user_data_function) +{ + switch_xml_t x_domain, xml = NULL, x_user, x_param, x_params; + int argc; + char *mydata = NULL, *argv[3]; + char *key = NULL, *type = NULL, *user, *domain; + char delim = ' '; + const char *err = NULL; + const char *container = "params", *elem = "param"; + char *params = NULL; + + if (!cmd) { + err = "bad args"; + goto end; + } + + mydata = strdup(cmd); + assert(mydata); + + argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc < 3) { + err = "bad args"; + goto end; + } + + user = argv[0]; + type = argv[1]; + key = argv[2]; + + if ((domain = strchr(user, '@'))) { + *domain++ = '\0'; + } else { + domain = "cluecon.com"; + } + + params = switch_mprintf("user=%s&domain=%s&type=%s&key=%s", user, domain, type, key); + + if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, params) != SWITCH_STATUS_SUCCESS) { + err = "can't find user"; + goto end; + } + + + end: + + if (xml) { + if (err) { + //stream->write_function(stream, "-Error %s\n", err); + } else { + if (!strcmp(type, "var")) { + container = "variables"; + elem = "variable"; + } + + if ((x_params = switch_xml_child(x_user, container))) { + for (x_param = switch_xml_child(x_params, elem); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + + if (!strcasecmp(var, key)) { + stream->write_function(stream, "%s", val); + break; + } + + } + } + } + switch_xml_free(xml); + } + + free(mydata); + switch_safe_free(params); + + return SWITCH_STATUS_SUCCESS; + +} + SWITCH_STANDARD_API(find_user_function) { switch_xml_t x_domain = NULL, x_user = NULL, xml = NULL; @@ -1949,6 +2027,7 @@ SWITCH_ADD_API(commands_api_interface, "uuid_chat", "Send a chat message", uuid_chat, UUID_CHAT_SYNTAX); SWITCH_ADD_API(commands_api_interface, "find_user_xml", "find a user", find_user_function, "<key> <user>@<domain>"); SWITCH_ADD_API(commands_api_interface, "xml_locate", "find some xml", xml_locate_function, "[root | <section> <tag> <tag_attr_name> <tag_attr_val>]"); + SWITCH_ADD_API(commands_api_interface, "user_data", "find user data", user_data_function, "<user>@<domain> [var|param] <name>"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD; 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 Dec 4 14:39:14 2007 @@ -1420,6 +1420,78 @@ } + +/* fake chan_user */ +switch_endpoint_interface_t *user_endpoint_interface; +static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool); +switch_io_routines_t user_io_routines = { + /*.outgoing_channel */ user_outgoing_channel +}; + +static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool) +{ + switch_xml_t x_domain, xml = NULL, x_user, x_param, x_params; + char *user = NULL, *domain = NULL; + const char *dest = NULL; + static switch_call_cause_t cause; + unsigned int timelimit = 60; + + user = switch_core_session_strdup(session, outbound_profile->destination_number); + + if (!(domain = strchr(user, '@'))) { + goto done; + } + + *domain++ = '\0'; + + if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, "as_channel=true") != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain); + goto done; + } + + if ((x_params = switch_xml_child(x_user, "params"))) { + for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + + if (!strcasecmp(var, "dial-string")) { + dest = val; + break; + } + + } + } + + done: + + if (dest) { + const char *var; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + if ((var = switch_channel_get_variable(channel, "call_timeout"))) { + timelimit = atoi(var); + } + + if (switch_ivr_originate(session, new_session, &cause, dest, timelimit, NULL, NULL, NULL, NULL) == SWITCH_STATUS_SUCCESS) { + switch_core_session_rwunlock(*new_session); + } + } + + if (xml) { + switch_xml_free(xml); + } + + + return cause; + +} + + #define SPEAK_DESC "Speak text to a channel via the tts interface" #define DISPLACE_DESC "Displace audio from a file to the channels input" #define SESS_REC_DESC "Starts a background recording of the entire session" @@ -1443,6 +1515,11 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + user_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); + user_endpoint_interface->interface_name = "USER"; + user_endpoint_interface->io_routines = &user_io_routines; + + SWITCH_ADD_API(api_interface, "strepoch", "Convert a date string into epoch time", strepoch_api_function, "<string>"); SWITCH_ADD_API(api_interface, "chat", "chat", chat_api_function, "<proto>|<from>|<to>|<message>"); SWITCH_ADD_API(api_interface, "strftime", "strftime", strftime_api_function, "<format_string>");

1 0

[commit] r6500 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 13:57:47 2007 New Revision: 6500 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Log: update Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Tue Dec 4 13:57:47 2007 @@ -307,14 +307,14 @@ /* fake chan_sip */ switch_endpoint_interface_t *sip_endpoint_interface; -static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, +static switch_call_cause_t sip_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool); switch_io_routines_t sip_io_routines = { - /*.outgoing_channel */ channel_outgoing_channel + /*.outgoing_channel */ sip_outgoing_channel }; -static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, +static switch_call_cause_t sip_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool) {

1 0

[commit] r6499 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 13:52:13 2007 New Revision: 6499 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core_codec.c Log: add vars 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 Dec 4 13:52:13 2007 @@ -48,23 +48,31 @@ char *mydata = NULL, *argv[3]; char *key, *user, *domain; char *xmlstr; - - if (stream->event && switch_event_get_header(stream->event, "http-host")) { + char *path_info = NULL; + char delim = ' '; + char *host = NULL; + const char *err = NULL; + + if (stream->event && (host = switch_event_get_header(stream->event, "http-host"))) { stream->write_function(stream, "Content-Type: text/xml\r\n\r\n"); + if ((path_info = switch_event_get_header(stream->event, "http-path-info"))) { + cmd = path_info; + delim = '/'; + } } - + if (!cmd) { - stream->write_function(stream, "-ERR bad args\n"); + err = "bad args"; goto end; } mydata = strdup(cmd); assert(mydata); - argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); if (argc < 3) { - stream->write_function(stream, "-ERR bad args\n"); + err = "bad args"; goto end; } @@ -73,18 +81,26 @@ domain = argv[2]; if (!(key && user && domain)) { - stream->write_function(stream, "-ERR bad args\n"); + err = "bad args"; goto end; } if (switch_xml_locate_user(key, user, domain, NULL, &xml, &x_domain, &x_user, NULL) != SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "-ERR can't find user [%s@%s]\n", user, domain); + err = "can't find user"; goto end; } end: + if (err) { + if (host) { + stream->write_function(stream, "<error>%s</error>\n", err); + } else { + stream->write_function(stream, "-Error %s\n", err); + } + } + if (xml && x_user) { xmlstr = switch_xml_toxml(x_user, SWITCH_FALSE); assert(xmlstr); @@ -108,21 +124,28 @@ char *mydata = NULL, *argv[4]; char *section, *tag, *tag_attr_name, *tag_attr_val, *params = NULL; char *xmlstr; + char *path_info, delim = ' '; + char *host = NULL; + const char *err = NULL; + + if (stream->event && (host = switch_event_get_header(stream->event, "http-host"))) { + stream->write_function(stream, "Content-Type: text/xml\r\n\r\n"); + if ((path_info = switch_event_get_header(stream->event, "http-path-info"))) { + cmd = path_info; + delim = '/'; + } + } if (!cmd) { - stream->write_function(stream, "-ERR bad args\n"); + err = "bad args"; goto end; } - if (stream->event && switch_event_get_header(stream->event, "http-host")) { - stream->write_function(stream, "Content-Type: text/xml\r\n\r\n"); - } - mydata = strdup(cmd); assert(mydata); - argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); if (argc == 1 && !strcasecmp(argv[0], "root")) { const char *err; @@ -132,7 +155,7 @@ } if (argc < 4) { - stream->write_function(stream, "-ERR bad args\n"); + err = "bad args"; goto end; } @@ -144,13 +167,21 @@ params = switch_mprintf("section=%s&tag=%s&tag_attr_name=%s&tag_attr_val=%s", section, tag, tag_attr_name, tag_attr_val); assert(params); if (switch_xml_locate(section, tag, tag_attr_name, tag_attr_val, &xml, &obj, params) != SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "-ERR can't find anything\n"); + stream->write_function(stream, "can't find anything\n"); goto end; } end: + if (err) { + if (host) { + stream->write_function(stream, "<error>%s</error>\n", err); + } else { + stream->write_function(stream, "-Error %s\n", err); + } + } + switch_safe_free(params); if (xml && obj) { @@ -168,7 +199,6 @@ } - SWITCH_STANDARD_API(regex_function) { switch_regex_t *re = NULL; @@ -652,7 +682,8 @@ char *mydata = NULL; time_t to = 0; switch_core_session_t *rsession; - + + if (!cmd) { stream->write_function(stream, "-USAGE: %s\n", TONE_DETECT_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -665,11 +696,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "-ERR INVALID ARGS!\n"); } + if (!(rsession = switch_core_session_locate(argv[0]))) { stream->write_function(stream, "-ERR Error Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } + if (argv[4]) { uint32_t mto; if (*argv[4] == '+') { Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Tue Dec 4 13:52:13 2007 @@ -37,8 +37,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_session_t *session, switch_codec_t *codec) { switch_event_t *event; + switch_channel_t *channel; + char tmp[30]; assert(session != NULL); + channel = switch_core_session_get_channel(session); if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); @@ -50,6 +53,10 @@ switch_event_fire(&event); } + switch_channel_set_variable(channel, "read_codec", codec->implementation->iananame); + snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); + switch_channel_set_variable(channel, "read_rate", tmp); + session->read_codec = codec; session->raw_read_frame.codec = session->read_codec; session->raw_write_frame.codec = session->read_codec; @@ -67,7 +74,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_session_t *session, switch_codec_t *codec) { switch_event_t *event; + switch_channel_t *channel; + char tmp[30]; + assert(session != NULL); + channel = switch_core_session_get_channel(session); + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); @@ -79,6 +91,10 @@ switch_event_fire(&event); } + switch_channel_set_variable(channel, "write_codec", codec->implementation->iananame); + snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); + switch_channel_set_variable(channel, "write_rate", tmp); + session->write_codec = codec; return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r6498 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: mikej Date: Tue Dec 4 13:23:41 2007 New Revision: 6498 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: I convention (not a policy) for api command returns for easier parsing. (MODAPP-47) 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 Dec 4 13:23:41 2007 @@ -54,7 +54,7 @@ } if (!cmd) { - stream->write_function(stream, "bad args\n"); + stream->write_function(stream, "-ERR bad args\n"); goto end; } @@ -64,7 +64,7 @@ argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc < 3) { - stream->write_function(stream, "bad args\n"); + stream->write_function(stream, "-ERR bad args\n"); goto end; } @@ -73,12 +73,12 @@ domain = argv[2]; if (!(key && user && domain)) { - stream->write_function(stream, "bad args\n"); + stream->write_function(stream, "-ERR bad args\n"); goto end; } if (switch_xml_locate_user(key, user, domain, NULL, &xml, &x_domain, &x_user, NULL) != SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "can't find user [%s@%s]\n", user, domain); + stream->write_function(stream, "-ERR can't find user [%s@%s]\n", user, domain); goto end; } @@ -110,7 +110,7 @@ char *xmlstr; if (!cmd) { - stream->write_function(stream, "bad args\n"); + stream->write_function(stream, "-ERR bad args\n"); goto end; } @@ -132,7 +132,7 @@ } if (argc < 4) { - stream->write_function(stream, "bad args\n"); + stream->write_function(stream, "-ERR bad args\n"); goto end; } @@ -144,7 +144,7 @@ params = switch_mprintf("section=%s&tag=%s&tag_attr_name=%s&tag_attr_val=%s", section, tag, tag_attr_name, tag_attr_val); assert(params); if (switch_xml_locate(section, tag, tag_attr_name, tag_attr_val, &xml, &obj, params) != SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "can't find anything\n"); + stream->write_function(stream, "-ERR can't find anything\n"); goto end; } @@ -214,7 +214,7 @@ goto ok; error: - stream->write_function(stream, "!err!"); + stream->write_function(stream, "-ERR"); ok: switch_regex_safe_free(re); @@ -343,7 +343,7 @@ } error: - stream->write_function(stream, "!err!"); + stream->write_function(stream, "-ERR"); ok: switch_safe_free(mydata); @@ -420,7 +420,7 @@ int32_t arg = 0; if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "USAGE: %s\n", CTL_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", CTL_SYNTAX); return SWITCH_STATUS_SUCCESS; } @@ -446,7 +446,7 @@ arg = atoi(argv[1]); } switch_core_session_ctl(SCSC_MAX_SESSIONS, &arg); - stream->write_function(stream, "max sessions: %d\n", arg); + stream->write_function(stream, "+OK max sessions: %d\n", arg); } else if (!strcasecmp(argv[0], "loglevel")) { if (argc > 1) { if (*argv[1] > 47 && *argv[1] < 58) { @@ -458,10 +458,10 @@ arg = -1; } switch_core_session_ctl(SCSC_LOGLEVEL, &arg); - stream->write_function(stream, "log level: %s [%d]\n", switch_log_level2str(arg), arg); + stream->write_function(stream, "+OK log level: %s [%d]\n", switch_log_level2str(arg), arg); } else if (!strcasecmp(argv[0], "last_sps")) { switch_core_session_ctl(SCSC_LAST_SPS, &arg); - stream->write_function(stream, "last sessions per second: %d\n", arg); + stream->write_function(stream, "+OK last sessions per second: %d\n", arg); } else if (!strcasecmp(argv[0], "sps")) { if (argc > 1) { arg = atoi(argv[1]); @@ -469,17 +469,17 @@ arg = 0; } switch_core_session_ctl(SCSC_SPS, &arg); - stream->write_function(stream, "sessions per second: %d\n", arg); + stream->write_function(stream, "+OK sessions per second: %d\n", arg); } else { - stream->write_function(stream, "INVALID COMMAND\nUSAGE: fsctl [hupall|pause|resume|shutdown]\n"); + stream->write_function(stream, "-ERR INVALID COMMAND\nUSAGE: fsctl [hupall|pause|resume|shutdown]\n"); goto end; } - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "+OK\n"); end: free(mydata); } else { - stream->write_function(stream, "MEM ERR\n"); + stream->write_function(stream, "-ERR Memory error\n"); } return SWITCH_STATUS_SUCCESS; @@ -496,14 +496,14 @@ } if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "USAGE: %s\n", LOAD_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", LOAD_SYNTAX); return 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"); + stream->write_function(stream, "+OK\n"); } else { - stream->write_function(stream, "ERROR [%s]\n", err); + stream->write_function(stream, "-ERR [%s]\n", err); } return SWITCH_STATUS_SUCCESS; @@ -518,14 +518,14 @@ } if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "USAGE: %s\n", LOAD_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", LOAD_SYNTAX); return 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"); + stream->write_function(stream, "+OK\n"); } else { - stream->write_function(stream, "ERROR [%s]\n", err); + stream->write_function(stream, "-ERR [%s]\n", err); } return SWITCH_STATUS_SUCCESS; @@ -544,7 +544,7 @@ switch_xml_free(xml_root); } - stream->write_function(stream, "OK [%s]\n", err); + stream->write_function(stream, "+OK [%s]\n", err); return SWITCH_STATUS_SUCCESS; } @@ -559,14 +559,14 @@ } if (!cmd) { - stream->write_function(stream, "USAGE: %s\n", KILL_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", KILL_SYNTAX); } 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(ksession); - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "+OK\n"); } else { - stream->write_function(stream, "No Such Channel!\n"); + stream->write_function(stream, "-ERR No Such Channel!\n"); } return SWITCH_STATUS_SUCCESS; @@ -623,21 +623,21 @@ } if (switch_ivr_session_transfer(tsession, dest, dp, context) == SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "+OK\n"); } else { - stream->write_function(stream, "ERROR\n"); + stream->write_function(stream, "-ERR\n"); } switch_core_session_rwunlock(tsession); } else { - stream->write_function(stream, "No Such Channel!\n"); + stream->write_function(stream, "-ERR No Such Channel!\n"); } goto done; } } - stream->write_function(stream, "USAGE: %s\n", TRANSFER_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", TRANSFER_SYNTAX); done: switch_safe_free(mycmd); @@ -654,7 +654,7 @@ switch_core_session_t *rsession; if (!cmd) { - stream->write_function(stream, "USAGE: %s\n", TONE_DETECT_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", TONE_DETECT_SYNTAX); return SWITCH_STATUS_SUCCESS; } @@ -662,11 +662,11 @@ assert(mydata != NULL); if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 3) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "-ERR INVALID ARGS!\n"); } if (!(rsession = switch_core_session_locate(argv[0]))) { - stream->write_function(stream, "-Error Cannot locate session!\n"); + stream->write_function(stream, "-ERR Error Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } @@ -689,7 +689,7 @@ } switch_ivr_tone_detect_session(rsession, argv[1], argv[2], argv[3], to, argv[5], argv[6]); - stream->write_function(stream, "Enabling tone detection '%s' '%s' '%s'\n", argv[1], argv[2], argv[3]); + stream->write_function(stream, "+OK Enabling tone detection '%s' '%s' '%s'\n", argv[1], argv[2], argv[3]); done: @@ -724,7 +724,7 @@ } if (switch_strlen_zero(uuid) || switch_strlen_zero(text)) { - stream->write_function(stream, "USAGE: %s\n", UUID_CHAT_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", UUID_CHAT_SYNTAX); } else { if ((tsession = switch_core_session_locate(uuid))) { switch_event_t *event; @@ -732,14 +732,14 @@ switch_event_add_body(event, "%s", text); if (switch_core_session_receive_event(tsession, &event) != SWITCH_STATUS_SUCCESS) { switch_event_destroy(&event); - stream->write_function(stream, "Send Failed\n"); + stream->write_function(stream, "-ERR Send Failed\n"); } else { - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "+OK\n"); } } switch_core_session_rwunlock(tsession); } else { - stream->write_function(stream, "No Such Channel %s!\n", uuid); + stream->write_function(stream, "-ERR No Such Channel %s!\n", uuid); } } @@ -765,7 +765,7 @@ } if (switch_strlen_zero(cmd) || argc < 2 || argc > 5) { - stream->write_function(stream, "USAGE: %s\n", SCHED_TRANSFER_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", SCHED_TRANSFER_SYNTAX); } else { char *uuid = argv[1]; char *dest = argv[2]; @@ -781,10 +781,10 @@ if ((tsession = switch_core_session_locate(uuid))) { switch_ivr_schedule_transfer(when, uuid, dest, dp, context); - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "+OK\n"); switch_core_session_rwunlock(tsession); } else { - stream->write_function(stream, "No Such Channel!\n"); + stream->write_function(stream, "-ERR No Such Channel!\n"); } } @@ -808,7 +808,7 @@ } if (switch_strlen_zero(cmd) || argc < 1) { - stream->write_function(stream, "USAGE: %s\n", SCHED_HANGUP_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", SCHED_HANGUP_SYNTAX); } else { char *uuid = argv[1]; char *cause_str = argv[2]; @@ -827,10 +827,10 @@ if ((hsession = switch_core_session_locate(uuid))) { switch_ivr_schedule_hangup(when, uuid, cause, SWITCH_FALSE); - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "+OK\n"); switch_core_session_rwunlock(hsession); } else { - stream->write_function(stream, "No Such Channel!\n"); + stream->write_function(stream, "-ERR No Such Channel!\n"); } } @@ -854,7 +854,7 @@ } if (switch_strlen_zero(cmd) || argc < 1) { - stream->write_function(stream, "USAGE: %s\n", MEDIA_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", MEDIA_SYNTAX); } else { if (!strcasecmp(argv[0], "off")) { status = switch_ivr_nomedia(argv[1], SMF_REBRIDGE); @@ -889,7 +889,7 @@ } if (switch_strlen_zero(cmd) || argc < 2) { - stream->write_function(stream, "USAGE: %s\n", BROADCAST_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", BROADCAST_SYNTAX); } else { switch_media_flag_t flags = SMF_NONE; @@ -929,7 +929,7 @@ } if (switch_strlen_zero(cmd) || argc < 3) { - stream->write_function(stream, "USAGE: %s\n", SCHED_BROADCAST_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", SCHED_BROADCAST_SYNTAX); } else { switch_media_flag_t flags = SMF_NONE; time_t when; @@ -976,7 +976,7 @@ } if (switch_strlen_zero(cmd) || argc < 1) { - stream->write_function(stream, "USAGE: %s\n", HOLD_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", HOLD_SYNTAX); } else { if (!strcasecmp(argv[0], "off")) { status = switch_ivr_unhold_uuid(argv[1]); @@ -1010,10 +1010,10 @@ } if (switch_strlen_zero(cmd) || argc != 2) { - stream->write_function(stream, "USAGE: %s\n", UUID_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", UUID_SYNTAX); } else { if (switch_ivr_uuid_bridge(argv[0], argv[1]) != SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "Invalid uuid\n"); + stream->write_function(stream, "-ERR Invalid uuid\n"); } } @@ -1052,7 +1052,7 @@ limit = argv[3] ? atoi(argv[3]) : 0; if (!(rsession = switch_core_session_locate(uuid))) { - stream->write_function(stream, "-Error Cannot locate session!\n"); + stream->write_function(stream, "-ERR Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } @@ -1072,7 +1072,7 @@ usage: - stream->write_function(stream, "USAGE: %s\n", SESS_REC_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", SESS_REC_SYNTAX); switch_safe_free(mycmd); @@ -1119,7 +1119,7 @@ flags = argv[4]; if (!(rsession = switch_core_session_locate(uuid))) { - stream->write_function(stream, "-Error Cannot locate session!\n"); + stream->write_function(stream, "-ERR Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } @@ -1139,7 +1139,7 @@ usage: - stream->write_function(stream, "INVALID SYNTAX\n"); + stream->write_function(stream, "-ERR INVALID SYNTAX\n"); switch_safe_free(mycmd); @@ -1163,14 +1163,14 @@ } if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "USAGE: %s\n", BREAK_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", BREAK_SYNTAX); } else { if ((psession = switch_core_session_locate(cmd))) { switch_channel_t *channel = switch_core_session_get_channel(psession); switch_channel_set_flag(channel, CF_BREAK); switch_core_session_rwunlock(psession); } else { - stream->write_function(stream, "No Such Channel!\n"); + stream->write_function(stream, "-ERR No Such Channel!\n"); } } @@ -1194,7 +1194,7 @@ } if (switch_strlen_zero(cmd) || argc < 2) { - stream->write_function(stream, "USAGE: %s\n", PAUSE_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", PAUSE_SYNTAX); } else { char *uuid = argv[0]; char *dest = argv[1]; @@ -1211,7 +1211,7 @@ switch_core_session_rwunlock(psession); } else { - stream->write_function(stream, "No Such Channel!\n"); + stream->write_function(stream, "-ERR No Such Channel!\n"); } } @@ -1233,7 +1233,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; if (session || switch_strlen_zero(cmd)) { - stream->write_function(stream, "Illegal Usage\n"); + stream->write_function(stream, "-ERR Illegal Usage\n"); return SWITCH_STATUS_SUCCESS; } @@ -1242,7 +1242,7 @@ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc < 2 || argc > 7) { - stream->write_function(stream, "USAGE: %s\n", ORIGINATE_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", ORIGINATE_SYNTAX); goto done; } @@ -1279,9 +1279,9 @@ if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, NULL, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) { if (machine) { - stream->write_function(stream, "fail: %s\n", switch_channel_cause2str(cause)); + stream->write_function(stream, "-ERR %s\n", switch_channel_cause2str(cause)); } else { - stream->write_function(stream, "Cannot Create Outgoing Channel! [%s] cause: %s\n", aleg, switch_channel_cause2str(cause)); + stream->write_function(stream, "-ERR Cannot Create Outgoing Channel! [%s] cause: %s\n", aleg, switch_channel_cause2str(cause)); } goto done; } @@ -1315,9 +1315,9 @@ } if (machine) { - stream->write_function(stream, "success: %s\n", switch_core_session_get_uuid(caller_session)); + stream->write_function(stream, "+OK %s\n", switch_core_session_get_uuid(caller_session)); } else { - stream->write_function(stream, "Created Session: %s\n", switch_core_session_get_uuid(caller_session)); + stream->write_function(stream, "+OK Created Session: %s\n", switch_core_session_get_uuid(caller_session)); } if (caller_session) { @@ -1353,7 +1353,7 @@ uint32_t cnt = 0; if (!cmd) { - stream->write_function(stream, "Invalid syntax\n"); + stream->write_function(stream, "-ERR Invalid syntax\n"); return SWITCH_STATUS_SUCCESS; } @@ -1367,7 +1367,7 @@ cnt = switch_scheduler_del_task_group(cmd); } - stream->write_function(stream, "DELETED: %u\n", cnt); + stream->write_function(stream, "+OK Deleted: %u\n", cnt); return SWITCH_STATUS_SUCCESS; } @@ -1379,7 +1379,7 @@ int encoded = 0, elen = 0; if (!cmd) { - stream->write_function(stream, "Invalid syntax\n"); + stream->write_function(stream, "-ERR Invalid syntax\n"); return SWITCH_STATUS_SUCCESS; } @@ -1432,7 +1432,7 @@ time_t when; if (!cmd) { - stream->write_function(stream, "Invalid syntax\n"); + stream->write_function(stream, "-ERR Invalid syntax\n"); return SWITCH_STATUS_SUCCESS; } tm = strdup(cmd); @@ -1453,12 +1453,12 @@ } id = switch_scheduler_add_task(when, sch_api_callback, (char *) __SWITCH_FUNC__, group, 0, strdup(dcmd), SSHF_FREE_ARG); - stream->write_function(stream, "ADDED: %u\n", id); + stream->write_function(stream, "+OK Added: %u\n", id); goto good; } } - stream->write_function(stream, "Invalid syntax\n"); + stream->write_function(stream, "-ERR Invalid syntax\n"); good: @@ -1602,14 +1602,14 @@ holder.print_title = 1; if (!(cflags & SCF_USE_SQL) && !strcasecmp(command, "channels")) { - stream->write_function(stream, "SQL DISABLED NO CHANNEL DATA AVAILABLE!\n"); + stream->write_function(stream, "-ERR SQL DISABLED NO CHANNEL DATA AVAILABLE!\n"); return SWITCH_STATUS_SUCCESS; } // 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 (!command) { - stream->write_function(stream, "USAGE: %s\n", SHOW_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX); return SWITCH_STATUS_SUCCESS; } else if (!strcasecmp(command, "codec") || !strcasecmp(command, "dialplan") || !strcasecmp(command, "file") || !strcasecmp(command, "timer")) { sprintf(sql, "select type, name from interfaces where type = '%s'", command); @@ -1633,7 +1633,7 @@ snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api'"); } } else { - stream->write_function(stream, "USAGE: %s\n", SHOW_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX); return SWITCH_STATUS_SUCCESS; } @@ -1661,12 +1661,12 @@ } if (errmsg) { - stream->write_function(stream, "SQL ERR [%s]\n", errmsg); + stream->write_function(stream, "-ERR SQL Error [%s]\n", errmsg); switch_core_db_free(errmsg); errmsg = NULL; } else if (help) { if (holder.count == 0) - stream->write_function(stream, "No such command.\n"); + stream->write_function(stream, "-ERR No such command.\n"); } else { stream->write_function(stream, "\n%u total.\n", holder.count); } @@ -1691,7 +1691,7 @@ holder.stream->write_function(holder.stream, "<result row_count=\"0\"/>\n"); } } else { - holder.stream->write_function(holder.stream, "Cannot find format %s\n", as); + holder.stream->write_function(holder.stream, "-ERR Cannot find format %s\n", as); } switch_safe_free(mydata); @@ -1754,22 +1754,22 @@ if (switch_strlen_zero(var_name)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); - stream->write_function(stream, "No variable specified\n"); + stream->write_function(stream, "-ERR No variable specified\n"); } else { switch_channel_set_variable(channel, var_name, var_value); - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "+OK\n"); } switch_core_session_rwunlock(psession); } else { - stream->write_function(stream, "No Such Channel!\n"); + stream->write_function(stream, "-ERR No Such Channel!\n"); } goto done; } } - stream->write_function(stream, "USAGE: %s\n", SETVAR_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", SETVAR_SYNTAX); done: switch_safe_free(mycmd); @@ -1801,7 +1801,7 @@ assert(channel != NULL); if (switch_strlen_zero(var_name)) { - stream->write_function(stream, "No variable name specified!\n"); + stream->write_function(stream, "-ERR No variable name specified!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); } else { var_value = switch_channel_get_variable(channel, var_name); @@ -1815,13 +1815,13 @@ switch_core_session_rwunlock(psession); } else { - stream->write_function(stream, "No Such Channel!\n"); + stream->write_function(stream, "-ERR No Such Channel!\n"); } goto done; } } - stream->write_function(stream, "USAGE: %s\n", GETVAR_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", GETVAR_SYNTAX); done: switch_safe_free(mycmd); @@ -1851,7 +1851,7 @@ } } - stream->write_function(stream, "USAGE: %s\n", GLOBAL_SETVAR_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", GLOBAL_SETVAR_SYNTAX); done: switch_safe_free(mycmd); @@ -1867,7 +1867,7 @@ goto done; } - stream->write_function(stream, "USAGE: %s\n", GLOBAL_GETVAR_SYNTAX); + stream->write_function(stream, "-USAGE: %s\n", GLOBAL_GETVAR_SYNTAX); done: return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r6497 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 13:17:33 2007 New Revision: 6497 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: minor tweaks 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 Dec 4 13:17:33 2007 @@ -49,6 +49,10 @@ char *key, *user, *domain; char *xmlstr; + if (stream->event && switch_event_get_header(stream->event, "http-host")) { + stream->write_function(stream, "Content-Type: text/xml\r\n\r\n"); + } + if (!cmd) { stream->write_function(stream, "bad args\n"); goto end;

1 0

[commit] r6496 - in freeswitch/trunk/src/mod/applications: mod_commands mod_expr
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 13:10:04 2007 New Revision: 6496 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Log: minor tweaks 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 Dec 4 13:10:04 2007 @@ -110,6 +110,11 @@ goto end; } + + if (stream->event && switch_event_get_header(stream->event, "http-host")) { + stream->write_function(stream, "Content-Type: text/xml\r\n\r\n"); + } + mydata = strdup(cmd); assert(mydata); 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 Tue Dec 4 13:10:04 2007 @@ -51,7 +51,13 @@ int err; char val[512] = "", *p; char *m_cmd = NULL; - size_t len = strlen(cmd) + 3; + size_t len; + + if (switch_strlen_zero(cmd)) { + goto error; + } + + len = strlen(cmd) + 3; m_cmd = malloc(len);

1 0

[commit] r6495 - in freeswitch/trunk: conf/autoload_configs src/mod/applications/mod_enum
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 12:44:03 2007 New Revision: 6495 Modified: freeswitch/trunk/conf/autoload_configs/enum.conf.xml freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: fix MODAPP-54 Modified: freeswitch/trunk/conf/autoload_configs/enum.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/enum.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/enum.conf.xml Tue Dec 4 12:44:03 2007 @@ -2,6 +2,7 @@ <settings> <param name="default-root" value="e164.org"/> <param name="default-isn-root" value="freenum.org"/> + <param name="query-timeout" value="10"/> </settings> <routes> 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 Tue Dec 4 12:44:03 2007 @@ -75,6 +75,7 @@ switch_hash_t *routes; enum_route_t *route_order; switch_memory_pool_t *pool; + int timeout; } globals; SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_root, globals.root); @@ -127,6 +128,8 @@ char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "default-root")) { set_global_root(val); + } else if (!strcasecmp(var, "query-timeout")) { + globals.timeout = atoi(val); } else if (!strcasecmp(var, "default-isn-root")) { set_global_isn_root(val); } else if (!strcasecmp(var, "log-level-trace")) { @@ -486,7 +489,7 @@ FD_ZERO(&fds); now = 0; - while ((i = dns_timeouts(nctx, -1, now)) > 0) { + while ((i = dns_timeouts(nctx, globals.timeout, now)) > 0) { #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable: 4389 4127) @@ -702,7 +705,7 @@ memset(&globals, 0, sizeof(globals)); globals.pool = pool; - + globals.timeout = 10; load_config(); /* connect my internal structure to the blank pointer passed to me */

1 0