- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7775 - in freeswitch/trunk/src: . include
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthm Date: Mon Mar 3 14:32:42 2008 New Revision: 7775 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_xml.cpp Log: add reloadxml event Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 3 14:32:42 2008 @@ -988,6 +988,7 @@ SWITCH_EVENT_DEL_SCHEDULE - Something has been unscheduled SWITCH_EVENT_EXE_SCHEDULE - Something scheduled has been executed SWITCH_EVENT_RE_SCHEDULE - Something scheduled has been rescheduled + SWITCH_EVENT_RELOADXML - XML registry has been reloaded SWITCH_EVENT_ALL - All events at once </pre> @@ -1041,6 +1042,7 @@ SWITCH_EVENT_DEL_SCHEDULE, SWITCH_EVENT_EXE_SCHEDULE, SWITCH_EVENT_RE_SCHEDULE, + SWITCH_EVENT_RELOADXML, SWITCH_EVENT_ALL } switch_event_types_t; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Mar 3 14:32:42 2008 @@ -126,6 +126,7 @@ "DEL_SCHEDULE", "EXE_SCHEDULE", "RE_SCHEDULE", + "RELOADXML", "ALL" }; Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Mon Mar 3 14:32:42 2008 @@ -1479,7 +1479,17 @@ } switch_mutex_unlock(XML_LOCK); - return errcnt == 0 ? switch_xml_root() : NULL; + if (errcnt == 0) { + switch_event_t *event; + if (switch_event_create(&event, SWITCH_EVENT_RELOADXML) == SWITCH_STATUS_SUCCESS) { + if (switch_event_fire(&event) != SWITCH_STATUS_SUCCESS) { + switch_event_destroy(&event); + } + } + return switch_xml_root(); + } + + return NULL; } SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, const char **err)

1 0

[commit] r7774 - freeswitch/trunk/src
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthm Date: Mon Mar 3 14:02:36 2008 New Revision: 7774 Modified: freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core.c Log: add patch from FSCORE-101 Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Mar 3 14:02:36 2008 @@ -35,6 +35,55 @@ #include <switch_version.h> #define CMD_BUFLEN 1024; +/* + * store a strdup() of the string configured in XML + * bound to each of the 12 function key + */ +static char *console_fnkeys[12]; + +/* + * Load from console.conf XML file the section: + * <keybindings> + * <key name="1" value="show calls"/> + * </keybindings> + */ +static switch_status_t console_xml_config(void) +{ + char *cf = "switch.conf"; + switch_xml_t cfg, xml, settings, param; + + /* clear the keybind array */ + int i; + + for (i = 0; i < 12; i++) { + console_fnkeys[i] = NULL; + } + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "cli-keybindings"))) { + for (param = switch_xml_child(settings, "key"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + int i = atoi(var); + if ((i < 1) || (i > 12)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "keybind %s is invalid, range is from 1 to 12\n", var); + } else { + // Add the command to the fnkey array + console_fnkeys[i - 1] = switch_core_permanent_strdup(val); + } + } + } + + switch_xml_free(xml); + + return SWITCH_STATUS_SUCCESS; +} + + SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) { switch_size_t nwrite; @@ -199,6 +248,67 @@ #include <histedit.h> static char prompt_str[512] = ""; +/* + * If a fnkey is configured then process the command + */ +static unsigned char console_fnkey_pressed(int i) { + char *c; + + assert((i > 0) && (i <= 12)); + + c = console_fnkeys[i-1]; + + // This new line is necessary to avoid output to begin after the ">" of the CLI's prompt + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE,"\n"); + + if (c == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "FUNCTION KEY F%d IS NOT BOUND, please edit switch.conf XML file\n", i); + return CC_REDISPLAY; + } + + switch_console_process(c); + + return CC_REDISPLAY; +} + +static unsigned char console_f1key(EditLine *el, int ch) { + return console_fnkey_pressed(1); +} +static unsigned char console_f2key(EditLine *el, int ch) { + return console_fnkey_pressed(2); +} +static unsigned char console_f3key(EditLine *el, int ch) { + return console_fnkey_pressed(3); +} +static unsigned char console_f4key(EditLine *el, int ch) { + return console_fnkey_pressed(4); +} +static unsigned char console_f5key(EditLine *el, int ch) { + return console_fnkey_pressed(5); +} +static unsigned char console_f6key(EditLine *el, int ch) { + return console_fnkey_pressed(6); +} +static unsigned char console_f7key(EditLine *el, int ch) { + return console_fnkey_pressed(7); +} +static unsigned char console_f8key(EditLine *el, int ch) { + return console_fnkey_pressed(8); +} +static unsigned char console_f9key(EditLine *el, int ch) { + return console_fnkey_pressed(9); +} +static unsigned char console_f10key(EditLine *el, int ch) { + return console_fnkey_pressed(10); +} +static unsigned char console_f11key(EditLine *el, int ch) { + return console_fnkey_pressed(11); +} +static unsigned char console_f12key(EditLine *el, int ch) { + return console_fnkey_pressed(12); +} + + char * prompt(EditLine *e) { if (*prompt_str == '\0') { gethostname(hostname, sizeof(hostname)); @@ -256,15 +366,53 @@ switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; switch_memory_pool_t *pool; - + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); return; } - + el = el_init(__FILE__, switch_core_get_console(), switch_core_get_console(), switch_core_get_console()); el_set(el, EL_PROMPT, &prompt); el_set(el, EL_EDITOR, "emacs"); + /* AGX: Bind Keyboard function keys. This has been tested with: + * - linux console keyabord + * - putty.exe connected via ssh to linux + */ + /* Load/Init the config first */ + console_xml_config(); + /* Bind the functions to the key */ + el_set(el, EL_ADDFN, "f1-key", "F1 KEY PRESS", console_f1key ); + el_set(el, EL_ADDFN, "f2-key", "F2 KEY PRESS", console_f2key ); + el_set(el, EL_ADDFN, "f3-key", "F3 KEY PRESS", console_f3key ); + el_set(el, EL_ADDFN, "f4-key", "F4 KEY PRESS", console_f4key ); + el_set(el, EL_ADDFN, "f5-key", "F5 KEY PRESS", console_f5key ); + el_set(el, EL_ADDFN, "f6-key", "F6 KEY PRESS", console_f6key ); + el_set(el, EL_ADDFN, "f7-key", "F7 KEY PRESS", console_f7key ); + el_set(el, EL_ADDFN, "f8-key", "F8 KEY PRESS", console_f8key ); + el_set(el, EL_ADDFN, "f9-key", "F9 KEY PRESS", console_f9key ); + el_set(el, EL_ADDFN, "f10-key", "F10 KEY PRESS", console_f10key ); + el_set(el, EL_ADDFN, "f11-key", "F11 KEY PRESS", console_f11key ); + el_set(el, EL_ADDFN, "f12-key", "F12 KEY PRESS", console_f12key ); + + el_set(el, EL_BIND, "\033OP", "f1-key", NULL); + el_set(el, EL_BIND, "\033OQ", "f2-key", NULL); + el_set(el, EL_BIND, "\033OR", "f3-key", NULL); + el_set(el, EL_BIND, "\033OS", "f4-key", NULL); + + + el_set(el, EL_BIND, "\033[11~", "f1-key", NULL); + el_set(el, EL_BIND, "\033[12~", "f2-key", NULL); + el_set(el, EL_BIND, "\033[13~", "f3-key", NULL); + el_set(el, EL_BIND, "\033[14~", "f4-key", NULL); + el_set(el, EL_BIND, "\033[15~", "f5-key", NULL); + el_set(el, EL_BIND, "\033[17~", "f6-key", NULL); + el_set(el, EL_BIND, "\033[18~", "f7-key", NULL); + el_set(el, EL_BIND, "\033[19~", "f8-key", NULL); + el_set(el, EL_BIND, "\033[20~", "f9-key", NULL); + el_set(el, EL_BIND, "\033[21~", "f10-key", NULL); + el_set(el, EL_BIND, "\033[23~", "f11-key", NULL); + el_set(el, EL_BIND, "\033[24~", "f12-key", NULL); myhistory = history_init(); if (myhistory == 0) { @@ -275,7 +423,6 @@ hfile = switch_mprintf("%s%sfreeswitch.history", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR); assert(hfile != NULL); - history(myhistory, &ev, H_SETSIZE, 800); el_set(el, EL_HIST, history, myhistory); history(myhistory, &ev, H_LOAD, hfile); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Mar 3 14:02:36 2008 @@ -824,6 +824,16 @@ return SWITCH_STATUS_SUCCESS; } + +#ifdef SIGQUIT +static void handle_SIGQUIT(int sig) +{ + if (sig); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig Quit!\n"); + return; +} +#endif + #ifdef SIGPIPE static void handle_SIGPIPE(int sig) { @@ -891,6 +901,9 @@ #ifdef SIGPIPE signal(SIGPIPE, handle_SIGPIPE); #endif +#ifdef SIGQUIT + signal(SIGQUIT, handle_SIGQUIT); +#endif #ifdef SIGPOLL signal(SIGPOLL, handle_SIGPOLL); #endif

1 0

[commit] r7773 - freeswitch/trunk/src
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthm Date: Mon Mar 3 13:05:07 2008 New Revision: 7773 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix FSCORE-104 Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Mar 3 13:05:07 2008 @@ -34,14 +34,27 @@ static const switch_state_handler_table_t originate_state_handlers; +static switch_status_t originate_on_hold(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + + while(switch_channel_get_state(channel) == CS_HOLD) { + switch_ivr_sleep(session, 10); + } + + /* clear this handler so it only works once (next time (a.k.a. Transfer) we will do the real ring and hold states) */ + switch_channel_clear_state_handler(channel, &originate_state_handlers); + + return SWITCH_STATUS_FALSE; +} + static switch_status_t originate_on_ring(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); - /* put the channel in a passive state so we can loop audio to it */ - /* clear this handler so it only works once (next time (a.k.a. Transfer) we will do the real ring state) */ - switch_channel_clear_state_handler(channel, &originate_state_handlers); + /* put the channel in a passive state until it is answered */ switch_channel_set_state(channel, CS_HOLD); + return SWITCH_STATUS_FALSE; } @@ -52,7 +65,7 @@ /*.on_hangup */ NULL, /*.on_loopback */ NULL, /*.on_transmit */ NULL, - /*.on_hold */ NULL + /*.on_hold */ originate_on_hold }; typedef enum {

1 0

[commit] r7772 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Mar '08

02 Mar '08

Author: mikej Date: Sun Mar 2 12:45:14 2008 New Revision: 7772 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sun Mar 2 12:45:14 2008 @@ -767,7 +767,7 @@ ip_ptr = p + 9; } - if (!strncmp(ip_ptr, "0.0.0.0", 7) || switch_stristr("sendonly", tech_pvt->local_sdp_str)) { + if ((ip_ptr && !strncmp(ip_ptr, "0.0.0.0", 7)) || switch_stristr("sendonly", tech_pvt->local_sdp_str)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Skip patch on hold SDP\n"); return; }

1 0

[commit] r7771 - freeswitch/trunk/src
by Freeswitch SVN 02 Mar '08

02 Mar '08

Author: mikej Date: Sun Mar 2 12:42:24 2008 New Revision: 7771 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: msvc build fix (code before declaration) Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sun Mar 2 12:42:24 2008 @@ -591,9 +591,9 @@ if ((var_count = switch_separate_string(vars, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { int x = 0; for (x = 0; x < var_count; x++) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"variable string %d = [%s]\n", x, var_array[x]); char *inner_var_array[2] = { 0 }; int inner_var_count; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"variable string %d = [%s]\n", x, var_array[x]); if ((inner_var_count = switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) {

1 0

[commit] r7770 - freeswitch/trunk/scripts/socket/freepy
by Freeswitch SVN 02 Mar '08

02 Mar '08

Author: greenlizard Date: Sun Mar 2 12:23:02 2008 New Revision: 7770 Added: freeswitch/trunk/scripts/socket/freepy/globals.py Log: forgot to check something in Added: freeswitch/trunk/scripts/socket/freepy/globals.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/socket/freepy/globals.py Sun Mar 2 12:23:02 2008 @@ -0,0 +1,2 @@ + +DEBUG_ON = True

1 0

[commit] r7769 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp
by Freeswitch SVN 02 Mar '08

02 Mar '08

Author: mikej Date: Sat Mar 1 23:13:51 2008 New Revision: 7769 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Log: break rfc3264 rejected m line support so t.38 works (will need to work this into an option) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Sat Mar 1 23:13:51 2008 @@ -565,6 +565,7 @@ { char const *media, *proto; sdp_rtpmap_t *rm; + int print_rejected = 0; sdp_mode_t session_mode = sdp_sendrecv; @@ -593,11 +594,13 @@ default: proto = m->m_proto_name; break; } + if (print_rejected || m->m_rtpmaps || m->m_format) { if (m->m_number_of_ports <= 1) sdp_printf(p, "m=%s %u %s", media, m->m_port, proto); else sdp_printf(p, "m=%s %u/%u %s", media, m->m_port, m->m_number_of_ports, proto); + } if (m->m_rtpmaps) { for (rm = m->m_rtpmaps; rm; rm = rm->rm_next) { @@ -612,13 +615,13 @@ for (; l; l = l->l_next) sdp_printf(p, " %s", l->l_text); } - else { + else if (print_rejected) { sdp_printf(p, " 19"); /* SDP syntax requires at least one format. 19 is used by nobody, right?. */ } - sdp_printf(p, CRLF); + if (print_rejected || m->m_rtpmaps || m->m_format) sdp_printf(p, CRLF); if (m->m_information) print_information(p, m->m_information);

1 0

[commit] r7768 - freeswitch/trunk/scripts/socket/freepy
by Freeswitch SVN 01 Mar '08

01 Mar '08

Author: greenlizard Date: Sat Mar 1 15:36:38 2008 New Revision: 7768 Modified: freeswitch/trunk/scripts/socket/freepy/__init__.py freeswitch/trunk/scripts/socket/freepy/request.py Log: improve logging a bit Modified: freeswitch/trunk/scripts/socket/freepy/__init__.py ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/__init__.py (original) +++ freeswitch/trunk/scripts/socket/freepy/__init__.py Sat Mar 1 15:36:38 2008 @@ -63,6 +63,13 @@ print "connectionLost: %s" % reason + def log(self, msg): + """ + print a message to stdout if debug enabled + """ + if freepy.globals.DEBUG_ON: + print msg + def login(self, passwd): """ send login request @@ -71,8 +78,7 @@ req = request.LoginRequest() self.requestq.put(req) self.transport.write("%s\n\n" % msg) - if freepy.globals.DEBUG_ON: - print msg + self.log(">> %s" % msg) return req.getDeferred() def confdialout(self, conf_name, sofia_url, bgapi=True): @@ -95,6 +101,7 @@ req = request.DialoutRequest() self.requestq.put(req) self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def originate(self, party2dial, dest_ext_app, bgapi=True): @@ -109,6 +116,7 @@ req = request.DialoutRequest() self.requestq.put(req) self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def listconf(self, conf_name): @@ -122,6 +130,7 @@ req = request.ListConfRequest() self.requestq.put(req) self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() @@ -143,6 +152,7 @@ req = request.ConfKickRequest() self.requestq.put(req) self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def confdtmf(self, member_id, conf_name, dtmf, bgapi=False): @@ -166,8 +176,8 @@ (conf_name, member_id, dtmf) req = request.ApiRequest() self.requestq.put(req) - print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def confsay(self, conf_name, text2speak, bgapi=False): @@ -189,8 +199,8 @@ (conf_name, text2speak) req = request.ApiRequest() self.requestq.put(req) - print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def confplay(self, conf_name, snd_url, bgapi=False): @@ -212,8 +222,8 @@ (conf_name, snd_url) req = request.ApiRequest() self.requestq.put(req) - print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def confstop(self, conf_name, bgapi=False): @@ -234,8 +244,8 @@ (conf_name) req = request.ApiRequest() self.requestq.put(req) - print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() @@ -273,6 +283,7 @@ req = request.ApiRequest() self.requestq.put(req) self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def sofia_status_profile(self, profile_name, bgapi=False): @@ -299,8 +310,8 @@ (sofia_profile_name) req = request.ApiRequest() self.requestq.put(req) - print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() @@ -312,8 +323,8 @@ msg = "api killchan %s" % (uuid) req = request.ApiRequest() self.requestq.put(req) - print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def broadcast(self, uuid, path, legs, bgapi = False): @@ -324,8 +335,8 @@ msg = "api broadcast %s %s %s" % (uuid, path, legs) req = request.ApiRequest() self.requestq.put(req) - print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def transfer(self, uuid, dest_ext, legs, bgapi = False): @@ -339,11 +350,12 @@ msg = "api transfer %s %s %s" % (uuid, legs, dest_ext) req = request.ApiRequest() self.requestq.put(req) - print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) + self.log(">> %s" % msg) return req.getDeferred() def lineReceived(self, line): + self.log("<< %s" % line) if not self.active_request: # if no active request, dequeue a new one if self.requestq.empty(): Modified: freeswitch/trunk/scripts/socket/freepy/request.py ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/request.py (original) +++ freeswitch/trunk/scripts/socket/freepy/request.py Sat Mar 1 15:36:38 2008 @@ -83,9 +83,6 @@ otherwise, if the fs response is incomplete, just buffer the data """ - if freepy.globals.DEBUG_ON: - print line - if not line or len(line) == 0: self._fsm.BlankLine() return self.isRequestFinished()

1 0

[commit] r7767 - freeswitch/trunk/src
by Freeswitch SVN 29 Feb '08

29 Feb '08

Author: anthm Date: Fri Feb 29 12:11:40 2008 New Revision: 7767 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: add debug line Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Feb 29 12:11:40 2008 @@ -591,6 +591,7 @@ if ((var_count = switch_separate_string(vars, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { int x = 0; for (x = 0; x < var_count; x++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"variable string %d = [%s]\n", x, var_array[x]); char *inner_var_array[2] = { 0 }; int inner_var_count; if ((inner_var_count =

1 0

[commit] r7766 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 29 Feb '08

29 Feb '08

Author: mikej Date: Fri Feb 29 10:39:56 2008 New Revision: 7766 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: tweak error handling on socket app 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 Fri Feb 29 10:39:56 2008 @@ -223,18 +223,18 @@ return; } - switch_channel_set_variable(channel, "socket_host", host); - if ((port_name = strchr(host, ':'))) { *port_name++ = '\0'; port = (switch_port_t) atoi(port_name); } - if ((path = strchr(port_name, '/'))) { + if ((path = strchr((port_name ? port_name : host), '/'))) { *path++ = '\0'; switch_channel_set_variable(channel, "socket_path", path); } + switch_channel_set_variable(channel, "socket_host", host); + if (switch_sockaddr_info_get(&sa, host, AF_INET, port, 0, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n"); return;

1 0