July 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r5547 - freeswitch/trunk/src
by Freeswitch SVN 27 Jul '07

27 Jul '07

Author: silik0n Date: Fri Jul 27 10:47:07 2007 New Revision: 5547 Modified: freeswitch/trunk/src/switch_xml.c Log: All wildcard support for configuration include files ie:  Contributed by CopperCom Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Fri Jul 27 10:47:07 2007 @@ -65,9 +65,14 @@ #endif #endif +#include <dirent.h> +#include <glob.h> + #define SWITCH_XML_WS "\t\r\n " // whitespace #define SWITCH_XML_ERRL 128 // maximum error string length +static int preprocess(const char *file, int write_fd, int rlevel); + typedef struct switch_xml_root *switch_xml_root_t; struct switch_xml_root { // additional data for the root tag struct switch_xml xml; // is a super-struct built on top of switch_xml struct @@ -933,6 +938,49 @@ } +static int preprocess_glob(const char *pattern, int write_fd, int rlevel) +{ + glob_t globbuf; + int i; + + if (glob(pattern, GLOB_NOCHECK|GLOB_MARK, NULL, &globbuf)) { + globfree(&globbuf); + return -1; + } + + for (i = 0; i < globbuf.gl_pathc; i++) { + char *path = globbuf.gl_pathv[i]; + if (*(path + strlen(path)) != '/') { + if (preprocess(path, write_fd, rlevel) < 0) { + fprintf(stderr, "Error including %s (%s)\n", path, strerror(errno)); + } + + } else { + char *filename = NULL; + struct dirent *entry; + DIR *dir; + + dir = opendir(path); + if (!dir) { + fprintf(stderr, "Error including %s (%s)\n", path, strerror(errno)); + continue; + } + while ((entry = readdir(dir)) != NULL) { + if (strcmp(entry->d_name, ".") == 0) continue; + if (strcmp(entry->d_name, "..") == 0) continue; + filename = switch_mprintf("%s%s", path, entry->d_name); + if (preprocess(filename, write_fd, rlevel) < 0) { + fprintf(stderr, "Error including %s (%s)\n", filename, strerror(errno)); + } + switch_safe_free(filename); + } + closedir(dir); + } + } + globfree(&globbuf); + return write_fd; +} + static int preprocess(const char *file, int write_fd, int rlevel) { int read_fd = -1; @@ -1018,9 +1066,7 @@ fme = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, arg); ifile = fme; } - if (preprocess(ifile, write_fd, rlevel + 1) < 0) { - fprintf(stderr, "Error including %s (%s)\n", ifile, strerror(errno)); - } + preprocess_glob(ifile, write_fd, rlevel + 1); switch_safe_free(fme); } /* else NO OP */ }

1 0

[Freeswitch-svn] [commit] r5546 - freeswitch/trunk/src
by Freeswitch SVN 26 Jul '07

26 Jul '07

Author: anthm Date: Wed Jul 25 20:51:32 2007 New Revision: 5546 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: small tweak to last commit Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Jul 25 20:51:32 2007 @@ -187,22 +187,23 @@ msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); + if (switch_channel_get_state(chan_a) < CS_HANGUP) { + if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) { + switch_caller_extension_t *extension = NULL; + if ((extension = switch_caller_extension_new(session_a, app_name, app_name)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + goto end; + } + app_arg = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE); - if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) { - switch_caller_extension_t *extension = NULL; - if ((extension = switch_caller_extension_new(session_a, app_name, app_name)) == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); - goto end; - } - app_arg = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE); - - switch_caller_extension_add_application(session_a, extension, (char *) app_name, app_arg); - switch_channel_set_caller_extension(chan_a, extension); + switch_caller_extension_add_application(session_a, extension, (char *) app_name, app_arg); + switch_channel_set_caller_extension(chan_a, extension); - if (switch_channel_get_state(chan_a) == CS_EXECUTE) { - switch_channel_set_flag(chan_a, CF_RESET); - } else { - switch_channel_set_state(chan_a, CS_EXECUTE); + if (switch_channel_get_state(chan_a) == CS_EXECUTE) { + switch_channel_set_flag(chan_a, CF_RESET); + } else { + switch_channel_set_state(chan_a, CS_EXECUTE); + } } }

1 0

[Freeswitch-svn] [commit] r5545 - in freeswitch/trunk/src: . include
by Freeswitch SVN 26 Jul '07

26 Jul '07

Author: anthm Date: Wed Jul 25 20:49:02 2007 New Revision: 5545 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c Log: add exec_after_bridge_app and exec_after_bridge_arg and fix the hangup command in event parse Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Jul 25 20:49:02 2007 @@ -117,6 +117,8 @@ #define SWITCH_LOCAL_VIDEO_IP_VARIABLE "local_video_ip" #define SWITCH_LOCAL_VIDEO_PORT_VARIABLE "local_video_port" #define SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE "hangup_after_bridge" +#define SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE "exec_after_bridge_app" +#define SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE "exec_after_bridge_arg" #define SWITCH_MAX_FORWARDS_VARIABLE "max_forwards" #define SWITCH_SPEECH_KEY "speech" #define SWITCH_UUID_BRIDGE "uuid_bridge" @@ -576,6 +578,7 @@ CF_UNICAST = (1 << 21) - Channel has a unicast connection CF_VIDEO = (1 << 22) - Channel has video CF_EVENT_LOCK = (1 << 23) - Don't parse events +CF_RESET = (1 << 24) - Tell extension parser to reset </pre> */ @@ -603,7 +606,8 @@ CF_BROADCAST = (1 << 20), CF_UNICAST = (1 << 21), CF_VIDEO = (1 << 22), - CF_EVENT_LOCK = (1 << 23) + CF_EVENT_LOCK = (1 << 23), + CF_RESET = (1 << 24) } switch_channel_flag_t; Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Wed Jul 25 20:49:02 2007 @@ -120,6 +120,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard EXECUTE\n"); + top: + switch_channel_clear_flag(session->channel, CF_RESET); + if ((extension = switch_channel_get_caller_extension(session->channel)) == 0) { switch_channel_hangup(session->channel, SWITCH_CAUSE_NORMAL_CLEARING); return; @@ -169,6 +172,11 @@ if (expanded != extension->current_application->application_data) { switch_safe_free(expanded); } + + if (switch_channel_test_flag(session->channel, CF_RESET)) { + goto top; + } + extension->current_application = extension->current_application->next; } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Jul 25 20:49:02 2007 @@ -283,7 +283,6 @@ return SWITCH_STATUS_FALSE; } - hlen = (switch_size_t) strlen(cmd); cmd_hash = switch_hashfunc_default(cmd, &hlen); switch_channel_set_flag(channel, CF_EVENT_PARSE); Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Jul 25 20:49:02 2007 @@ -56,6 +56,7 @@ switch_frame_t *read_frame; switch_core_session_t *session_a, *session_b; uint32_t loop_count = 0; + char *app_name = NULL, *app_arg = NULL; session_a = data->session; if (!(session_b = switch_core_session_locate(data->b_uuid))) { @@ -186,6 +187,27 @@ msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); + + if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) { + switch_caller_extension_t *extension = NULL; + if ((extension = switch_caller_extension_new(session_a, app_name, app_name)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + goto end; + } + app_arg = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE); + + switch_caller_extension_add_application(session_a, extension, (char *) app_name, app_arg); + switch_channel_set_caller_extension(chan_a, extension); + + if (switch_channel_get_state(chan_a) == CS_EXECUTE) { + switch_channel_set_flag(chan_a, CF_RESET); + } else { + switch_channel_set_state(chan_a, CS_EXECUTE); + } + } + + end: + switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); switch_core_session_reset(session_a); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); @@ -641,8 +663,8 @@ done: - if (switch_channel_get_state(caller_channel) < CS_HANGUP - && switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { + if (switch_channel_get_state(caller_channel) < CS_HANGUP && + switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); }

1 0

[Freeswitch-svn] [commit] r5544 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 24 Jul '07

24 Jul '07

Author: anthm Date: Tue Jul 24 19:11:35 2007 New Revision: 5544 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: update desc 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 Jul 24 19:11:35 2007 @@ -1192,7 +1192,7 @@ SWITCH_ADD_APP(app_interface, "playback", "Playback File", "Playback a file to the channel", playback_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_record_session", "Stop Record Session", STOP_SESS_REC_DESC, stop_record_session_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "record_session", "Record Session", SESS_REC_DESC, record_session_function, "<path>", SAF_NONE); - SWITCH_ADD_APP(app_interface, "record", "Record File", "Record a file from the channels input", record_function, "<path> [<time_limit_ms>] [<silence_thresh>] [<silence_hits>]", SAF_NONE); + SWITCH_ADD_APP(app_interface, "record", "Record File", "Record a file from the channels input", record_function, "<path> [<time_limit_secs>] [<silence_thresh>] [<silence_hits>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_displace_session", "Stop Displace File", "Stop Displacing to a file", stop_displace_session_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "displace_session", "Displace File", DISPLACE_DESC, displace_session_function, "<path> [+time_limit_ms] [mux]", SAF_NONE); SWITCH_ADD_APP(app_interface, "speak", "Speak text", SPEAK_DESC, speak_function, "<engine>|<voice>|<text>", SAF_NONE);

1 0

[Freeswitch-svn] [commit] r5543 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 24 Jul '07

24 Jul '07

Author: anthm Date: Tue Jul 24 17:51:00 2007 New Revision: 5543 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add record params (update desc) 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 Jul 24 17:51:00 2007 @@ -1192,7 +1192,7 @@ SWITCH_ADD_APP(app_interface, "playback", "Playback File", "Playback a file to the channel", playback_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_record_session", "Stop Record Session", STOP_SESS_REC_DESC, stop_record_session_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "record_session", "Record Session", SESS_REC_DESC, record_session_function, "<path>", SAF_NONE); - SWITCH_ADD_APP(app_interface, "record", "Record File", "Record a file from the channels input", record_function, "<path> [+time_limit_ms]", SAF_NONE); + SWITCH_ADD_APP(app_interface, "record", "Record File", "Record a file from the channels input", record_function, "<path> [<time_limit_ms>] [<silence_thresh>] [<silence_hits>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_displace_session", "Stop Displace File", "Stop Displacing to a file", stop_displace_session_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "displace_session", "Displace File", DISPLACE_DESC, displace_session_function, "<path> [+time_limit_ms] [mux]", SAF_NONE); SWITCH_ADD_APP(app_interface, "speak", "Speak text", SPEAK_DESC, speak_function, "<engine>|<voice>|<text>", SAF_NONE);

1 0

[Freeswitch-svn] [commit] r5542 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 24 Jul '07

24 Jul '07

Author: anthm Date: Tue Jul 24 17:42:54 2007 New Revision: 5542 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add record params (please test) 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 Jul 24 17:42:54 2007 @@ -953,25 +953,54 @@ switch_status_t status; uint32_t limit = 0; char *path; - char *p; switch_input_args_t args = { 0 }; - + switch_file_handle_t fh = { 0 }; + int argc; + char *mydata, *argv[4] = { 0 }; + char *l = NULL; + channel = switch_core_session_get_channel(session); assert(channel != NULL); + + if (data && (mydata = switch_core_session_strdup(session, data))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No file specified.\n"); + return; + } + + path = argv[0]; + l = argv[1]; - path = switch_core_session_strdup(session, data); - if ((p = strchr(path, '+'))) { - char *q = p - 1; - while(q && *q == ' ') { - *q = '\0'; - q--; + if (l) { + if (*l == '+') { + l++; + if (l) { + limit = atoi(l); + if (limit < 0) { + limit = 0; + } + } + } + } + + + if (argv[2]) { + fh.thresh = atoi(argv[2]); + if (fh.thresh < 0) { + fh.thresh = 0; + } + } + + if (argv[3]) { + fh.silence_hits = atoi(argv[3]); + if (fh.silence_hits < 0) { + fh.silence_hits = 0; } - *p++ = '\0'; - limit = atoi(p); } args.input_callback = on_dtmf; - status = switch_ivr_record_file(session, NULL, path, &args, limit); + status = switch_ivr_record_file(session, &fh, path, &args, limit); if (!switch_channel_ready(channel) || (status != SWITCH_STATUS_SUCCESS && !SWITCH_STATUS_IS_BREAK(status))) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);

1 0

[Freeswitch-svn] [commit] r5541 - in freeswitch/trunk/src: . mod/event_handlers/mod_event_socket mod/languages/mod_spidermonkey
by Freeswitch SVN 24 Jul '07

24 Jul '07

Author: anthm Date: Tue Jul 24 17:26:04 2007 New Revision: 5541 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_event.c Log: fix up some event issues Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Jul 24 17:26:04 2007 @@ -83,10 +83,12 @@ } listen_list; static struct { + switch_mutex_t *mutex; char *ip; uint16_t port; char *password; int done; + int threads; } prefs; SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_pref_ip, prefs.ip) @@ -137,7 +139,7 @@ if (l->event_list[SWITCH_EVENT_ALL]) { send = 1; } else if ((l->event_list[event->event_id])) { - if (event->event_id != SWITCH_EVENT_CUSTOM || (event->subclass && switch_core_hash_find(l->event_hash, event->subclass->name))) { + if (event->event_id != SWITCH_EVENT_CUSTOM || !event->subclass || (switch_core_hash_find(l->event_hash, event->subclass->name))) { send = 1; } } @@ -265,11 +267,19 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_socket_shutdown) { listener_t *l; + int sanity = 0; prefs.done = 1; close_socket(&listen_list.sock); + while(prefs.threads) { + switch_yield(10000); + if (++sanity == 1000) { + break; + } + } + switch_mutex_lock(listen_list.mutex); for (l = listen_list.listeners; l; l = l->next) { close_socket(&l->sock); @@ -346,7 +356,7 @@ start = time(NULL); ptr = mbuf; - while (listener->sock) { + while (listener->sock && !prefs.done) { uint8_t do_sleep = 1; mlen = 1; status = switch_socket_recv(listener->sock, ptr, &mlen); @@ -857,7 +867,7 @@ if (type == SWITCH_EVENT_ALL) { uint32_t x = 0; for (x = 0; x < SWITCH_EVENT_ALL; x++) { - listener->event_list[x] = 0; + listener->event_list[x] = 1; } } listener->event_list[type] = 1; @@ -904,8 +914,9 @@ uint32_t x = 0; key_count++; - if (type == SWITCH_EVENT_ALL) { - + if (type == SWITCH_EVENT_CUSTOM) { + custom++; + } else if (type == SWITCH_EVENT_ALL) { for (x = 0; x <= SWITCH_EVENT_ALL; x++) { listener->event_list[x] = 0; } @@ -918,10 +929,6 @@ } listener->event_list[type] = 0; } - - if (type == SWITCH_EVENT_CUSTOM) { - custom++; - } } cur = next; @@ -980,6 +987,9 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; + switch_mutex_lock(listen_list.mutex); + prefs.threads++; + switch_mutex_unlock(listen_list.mutex); assert(listener != NULL); @@ -1113,6 +1123,9 @@ switch_core_destroy_memory_pool(&pool); } + switch_mutex_lock(listen_list.mutex); + prefs.threads--; + switch_mutex_unlock(listen_list.mutex); return NULL; } @@ -1226,7 +1239,7 @@ switch_log_bind_logger(socket_logger, SWITCH_LOG_DEBUG); - for (;;) { + for(;;) { if (switch_core_new_memory_pool(&listener_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "OH OH no pool\n"); goto fail; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Jul 24 17:26:04 2007 @@ -354,12 +354,12 @@ if (etype == SWITCH_EVENT_CUSTOM) { char *subclass_name; - if (argc < 1) { - *rval = BOOLEAN_TO_JSVAL(JS_FALSE); - return JS_TRUE; + if (argc > 1) { + subclass_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + } else { + subclass_name = "none"; } - subclass_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); if (switch_event_create_subclass(&event, etype, subclass_name) != SWITCH_STATUS_SUCCESS) { *rval = BOOLEAN_TO_JSVAL(JS_FALSE); return JS_TRUE; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Jul 24 17:26:04 2007 @@ -455,7 +455,10 @@ (*event)->event_id = event_id; if (subclass_name) { - (*event)->subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name); + if (!((*event)->subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name))) { + switch_event_reserve_subclass((char *)subclass_name); + (*event)->subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name); + } switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Subclass", "%s", subclass_name); }

1 0

[Freeswitch-svn] [commit] r5540 - freeswitch/trunk/src
by Freeswitch SVN 23 Jul '07

23 Jul '07

Author: mikej Date: Mon Jul 23 13:41:54 2007 New Revision: 5540 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: win32 build tweaks Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Jul 23 13:41:54 2007 @@ -942,10 +942,10 @@ olen = llen; } - write_frame.samples = olen; + write_frame.samples = (uint32_t)olen; if (asis) { - write_frame.datalen = olen; + write_frame.datalen = (uint32_t)olen; } else { write_frame.datalen = write_frame.samples * 2; }

1 0

[Freeswitch-svn] [commit] r5539 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 18 Jul '07

18 Jul '07

Author: trixter Date: Wed Jul 18 06:53:02 2007 New Revision: 5539 Added: freeswitch/trunk/scripts/contrib/trixter/newgcc-2.svndiff Log: another gcc patch to fix warnings Added: freeswitch/trunk/scripts/contrib/trixter/newgcc-2.svndiff ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/newgcc-2.svndiff Wed Jul 18 06:53:02 2007 @@ -0,0 +1,100 @@ +Index: src/switch.c +=================================================================== +--- src/switch.c (revision 5538) ++++ src/switch.c (working copy) +@@ -96,7 +96,9 @@ + } + + /* pull the pid from the file */ +- fscanf(f, "%d", &pid); ++ if(fscanf(f, "%d", &pid)!=1) { ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Unable to get the pid!\n"); ++ } + + /* if we have a valid pid */ + if (pid > 0) { +Index: src/mod/endpoints/mod_iax/mod_iax.c +=================================================================== +--- src/mod/endpoints/mod_iax/mod_iax.c (revision 5538) ++++ src/mod/endpoints/mod_iax/mod_iax.c (working copy) +@@ -278,8 +278,8 @@ + char pref_str[256] = "("; + + for (x = 0; x < len; x++) { +- strncat(pref_str, ast2str(prefs[x]), sizeof(pref_str)); +- strncat(pref_str, x == len - 1 ? ")" : ",", sizeof(pref_str)); ++ strncat(pref_str, ast2str(prefs[x]), sizeof(pref_str)-1); ++ strncat(pref_str, x == len - 1 ? ")" : ",", sizeof(pref_str)-1); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Codec Prefs Detected: %s\n", pref_str); +Index: src/mod/applications/mod_dptools/mod_dptools.c +=================================================================== +--- src/mod/applications/mod_dptools/mod_dptools.c (revision 5538) ++++ src/mod/applications/mod_dptools/mod_dptools.c (working copy) +@@ -724,7 +724,9 @@ + SWITCH_STANDARD_APP(system_session_function) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n",data); +- system(data); ++ if(!system(data)) { ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n",data); ++ } + } + + SWITCH_STANDARD_APP(tone_detect_session_function) +Index: src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +=================================================================== +--- src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (revision 5538) ++++ src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (working copy) +@@ -783,7 +783,10 @@ + + if ((mods = switch_xml_child(cfg, "modules"))) { + for (ld = switch_xml_child(mods, "load"); ld; ld = ld->next) { +- const char *val = switch_xml_attr_soft(ld, "module"); ++ /* newer GCC doesnt like pasing val because it was a const, made it non-const which is potentially bad ++ * but that happens anyway when it goes to sm_load_module ++ */ ++ char *val = (char *)switch_xml_attr_soft(ld, "module"); + if (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val); + continue; +@@ -1527,6 +1530,11 @@ + + CHANNEL_SANITY_CHECK(); + ++ if (argc < 3) { ++ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); ++ return JS_FALSE; ++ } ++ + if (argc > 0) { + tts_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + } +@@ -1964,7 +1972,9 @@ + register unsigned int realsize = (unsigned int) (size * nmemb); + struct config_data *config_data = data; + +- write(config_data->fd, ptr, realsize); ++ if(write(config_data->fd, ptr, realsize)!=realsize) { ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to write all bytes!\n"); ++ } + return realsize; + } + +Index: src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c +=================================================================== +--- src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c (revision 5538) ++++ src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c (working copy) +@@ -180,7 +180,10 @@ + close(ifd); + } + snprintf(buf, B64BUFFLEN, "/bin/cat %s | /usr/sbin/sendmail -tf \"%s\" %s", filename, from, to); +- system(buf); ++ if(!system(buf)) { ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n",buf); ++ } ++ + unlink(filename); + +

1 0

[Freeswitch-svn] [commit] r5538 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 18 Jul '07

18 Jul '07

Author: trixter Date: Wed Jul 18 04:52:00 2007 New Revision: 5538 Modified: freeswitch/trunk/scripts/contrib/trixter/switch_xml.c Log: oops Modified: freeswitch/trunk/scripts/contrib/trixter/switch_xml.c ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/switch_xml.c (original) +++ freeswitch/trunk/scripts/contrib/trixter/switch_xml.c Wed Jul 18 04:52:00 2007 @@ -968,13 +968,13 @@ if ((cmd = strstr(bp, ""))) { *e = '\0'; e += 3; if(write(write_fd, e, (unsigned) strlen(e)) != (unsigned) strlen(e)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n", err); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n"); } } else { ml++; @@ -1033,7 +1033,7 @@ } if(write(write_fd, bp, (unsigned) cur) != (unsigned) cur) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n", err); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n"); } }

1 0