- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[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

[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

[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

[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

[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

[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

[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

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

18 Jul '07

Author: trixter Date: Wed Jul 18 04:25:12 2007 New Revision: 5537 Added: freeswitch/trunk/scripts/contrib/trixter/switch_xml.c Log: patch for newer GCC versions with better error checking Added: freeswitch/trunk/scripts/contrib/trixter/switch_xml.c ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/switch_xml.c Wed Jul 18 04:25:12 2007 @@ -0,0 +1,1783 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * + * switch_xml.c -- XML PARSER + * + * Derived from ezxml http://ezxml.sourceforge.net + * Original Copyright + * + * Copyright 2004, 2006 Aaron Voisine <aaron(a)voisine.org> + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include <switch.h> +#ifndef WIN32 +#include <switch_private.h> +#endif + +#ifdef HAVE_MMAP +#include <sys/mman.h> +#ifdef __sun +extern int madvise(caddr_t, size_t, int); +#endif +#endif + +#define SWITCH_XML_WS "\t\r\n " // whitespace +#define SWITCH_XML_ERRL 128 // maximum error string length + +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 + switch_xml_t cur; // current xml tree insertion point + char *m; // original xml string + switch_size_t len; // length of allocated memory for mmap + uint8_t dynamic; + char *u; // UTF-8 conversion of string if original was UTF-16 + char *s; // start of work area + char *e; // end of work area + char **ent; // general entities (ampersand sequences) + char ***attr; // default attributes + char ***pi; // processing instructions + short standalone; // non-zero if <?xml standalone="yes"?> + char err[SWITCH_XML_ERRL]; // error string +}; + +char *SWITCH_XML_NIL[] = { NULL }; // empty, null terminated array of strings + +struct switch_xml_binding { + switch_xml_search_function_t function; + switch_xml_section_t sections; + void *user_data; + struct switch_xml_binding *next; +}; + +typedef struct switch_xml_binding switch_xml_binding_t; +static switch_xml_binding_t *BINDINGS = NULL; +static switch_xml_t MAIN_XML_ROOT = NULL; +static switch_memory_pool_t *XML_MEMORY_POOL; +static switch_mutex_t *XML_LOCK; +static switch_thread_rwlock_t *RWLOCK; +static uint32_t lock_count = 0; + +struct xml_section_t { + const char *name; + switch_xml_section_t section; +}; + + +static struct xml_section_t SECTIONS[] = { + {"result", SWITCH_XML_SECTION_RESULT}, + {"config", SWITCH_XML_SECTION_CONFIG}, + {"directory", SWITCH_XML_SECTION_DIRECTORY}, + {"dialplan", SWITCH_XML_SECTION_DIALPLAN}, + {"phrases", SWITCH_XML_SECTION_PHRASES}, + {NULL, 0} +}; + +SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(const char *str) +{ + size_t x; + char buf[1024] = ""; + switch_xml_section_t sections = SWITCH_XML_SECTION_RESULT; + + if (str) { + for (x = 0; x < strlen(str); x++) { + buf[x] = (char) tolower((int) str[x]); + } + for (x = 0;; x++) { + if (!SECTIONS[x].name) { + break; + } + if (strstr(buf, SECTIONS[x].name)) { + sections |= SECTIONS[x].section; + } + } + } + return sections; +} + +SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data) +{ + switch_xml_binding_t *binding = NULL, *ptr = NULL; + assert(function != NULL); + + if (!(binding = switch_core_alloc(XML_MEMORY_POOL, sizeof(*binding)))) { + return SWITCH_STATUS_MEMERR; + } + + binding->function = function; + binding->sections = sections; + binding->user_data = user_data; + + switch_mutex_lock(XML_LOCK); + for (ptr = BINDINGS; ptr && ptr->next; ptr = ptr->next); + + if (ptr) { + ptr->next = binding; + } else { + BINDINGS = binding; + } + switch_mutex_unlock(XML_LOCK); + + return SWITCH_STATUS_SUCCESS; +} + + +SWITCH_DECLARE(switch_xml_t) switch_xml_find_child(switch_xml_t node, const char *childname, const char *attrname, const char *value) +{ + switch_xml_t p = NULL; + + if (!(childname && attrname && value)) { + return node; + } + + for (p = switch_xml_child(node, childname); p; p = p->next) { + const char *aname = switch_xml_attr(p, attrname); + if (aname && value && !strcasecmp(aname, value)) { + break; + } + } + + return p; +} + +// returns the first child tag with the given name or NULL if not found +SWITCH_DECLARE(switch_xml_t) switch_xml_child(switch_xml_t xml, const char *name) +{ + xml = (xml) ? xml->child : NULL; + while (xml && strcmp(name, xml->name)) + xml = xml->sibling; + return xml; +} + +// returns the Nth tag with the same name in the same subsection or NULL if not +// found +switch_xml_t switch_xml_idx(switch_xml_t xml, int idx) +{ + for (; xml && idx; idx--) + xml = xml->next; + return xml; +} + +// returns the value of the requested tag attribute or "" if not found +SWITCH_DECLARE(const char *) switch_xml_attr_soft(switch_xml_t xml, const char *attr) +{ + const char *ret = switch_xml_attr(xml, attr); + + return ret ? ret : ""; +} + +// returns the value of the requested tag attribute or NULL if not found +SWITCH_DECLARE(const char *) switch_xml_attr(switch_xml_t xml, const char *attr) +{ + int i = 0, j = 1; + switch_xml_root_t root = (switch_xml_root_t) xml; + + if (!xml || !xml->attr) + return NULL; + while (xml->attr[i] && strcmp(attr, xml->attr[i])) + i += 2; + if (xml->attr[i]) + return xml->attr[i + 1]; // found attribute + + while (root->xml.parent) + root = (switch_xml_root_t) root->xml.parent; // root tag + for (i = 0; root->attr[i] && strcmp(xml->name, root->attr[i][0]); i++); + if (!root->attr[i]) + return NULL; // no matching default attributes + while (root->attr[i][j] && strcmp(attr, root->attr[i][j])) + j += 3; + return (root->attr[i][j]) ? root->attr[i][j + 1] : NULL; // found default +} + +// same as switch_xml_get but takes an already initialized va_list +static switch_xml_t switch_xml_vget(switch_xml_t xml, va_list ap) +{ + char *name = va_arg(ap, char *); + int idx = -1; + + if (name && *name) { + idx = va_arg(ap, int); + xml = switch_xml_child(xml, name); + } + return (idx < 0) ? xml : switch_xml_vget(switch_xml_idx(xml, idx), ap); +} + +// Traverses the xml tree to retrieve a specific subtag. Takes a variable +// length list of tag names and indexes. The argument list must be terminated +// by either an index of -1 or an empty string tag name. Example: +// title = switch_xml_get(library, "shelf", 0, "book", 2, "title", -1); +// This retrieves the title of the 3rd book on the 1st shelf of library. +// Returns NULL if not found. +SWITCH_DECLARE(switch_xml_t) switch_xml_get(switch_xml_t xml,...) +{ + va_list ap; + switch_xml_t r; + + va_start(ap, xml); + r = switch_xml_vget(xml, ap); + va_end(ap); + return r; +} + +// returns a null terminated array of processing instructions for the given +// target +SWITCH_DECLARE(const char **) switch_xml_pi(switch_xml_t xml, const char *target) +{ + switch_xml_root_t root = (switch_xml_root_t) xml; + int i = 0; + + if (!root) + return (const char **) SWITCH_XML_NIL; + while (root->xml.parent) + root = (switch_xml_root_t) root->xml.parent; // root tag + while (root->pi[i] && strcmp(target, root->pi[i][0])) + i++; // find target + return (const char **) ((root->pi[i]) ? root->pi[i] + 1 : SWITCH_XML_NIL); +} + +// set an error string and return root +static switch_xml_t switch_xml_err(switch_xml_root_t root, char *s, const char *err, ...) +{ + va_list ap; + int line = 1; + char *t, fmt[SWITCH_XML_ERRL]; + + for (t = root->s; t && t < s; t++) + if (*t == '\n') + line++; + snprintf(fmt, SWITCH_XML_ERRL, "[error near line %d]: %s", line, err); + + va_start(ap, err); + vsnprintf(root->err, SWITCH_XML_ERRL, fmt, ap); + va_end(ap); + + return &root->xml; +} + +// Recursively decodes entity and character references and normalizes new lines +// ent is a null terminated array of alternating entity names and values. set t +// to '&' for general entity decoding, '%' for parameter entity decoding, 'c' +// for cdata sections, ' ' for attribute normalization, or '*' for non-cdata +// attribute normalization. Returns s, or if the decoded string is longer than +// s, returns a malloced string that must be freed. +static char *switch_xml_decode(char *s, char **ent, char t) +{ + char *e, *r = s, *m = s; + long b, c, d, l; + + for (; *s; s++) { // normalize line endings + while (*s == '\r') { + *(s++) = '\n'; + if (*s == '\n') + memmove(s, (s + 1), strlen(s)); + } + } + + for (s = r;;) { + while (*s && *s != '&' && (*s != '%' || t != '%') && !isspace((int) (*s))) + s++; + + if (!*s) + break; + else if (t != 'c' && !strncmp(s, "&#", 2)) { // character reference + if (s[2] == 'x') + c = strtol(s + 3, &e, 16); // base 16 + else + c = strtol(s + 2, &e, 10); // base 10 + if (!c || *e != ';') { + s++; + continue; + } // not a character ref + + if (c < 0x80) + *(s++) = (char) c; // US-ASCII subset + else { // multi-byte UTF-8 sequence + for (b = 0, d = c; d; d /= 2) + b++; // number of bits in c + b = (b - 2) / 5; // number of bytes in payload + *(s++) = (char) ((0xFF << (7 - b)) | (c >> (6 * b))); // head + while (b) + *(s++) = (char) (0x80 | ((c >> (6 * --b)) & 0x3F)); // payload + } + + memmove(s, strchr(s, ';') + 1, strlen(strchr(s, ';'))); + } else if ((*s == '&' && (t == '&' || t == ' ' || t == '*')) || (*s == '%' && t == '%')) { // entity reference + for (b = 0; ent[b] && strncmp(s + 1, ent[b], strlen(ent[b])); b += 2); // find entity in entity list + + if (ent[b++]) { // found a match + if ((c = (long) strlen(ent[b])) - 1 > (e = strchr(s, ';')) - s) { + l = (d = (long) (s - r)) + c + (long) strlen(e); // new length + r = (r == m) ? strcpy(malloc(l), r) : realloc(r, l); + e = strchr((s = r + d), ';'); // fix up pointers + } + + memmove(s + c, e + 1, strlen(e)); // shift rest of string + strncpy(s, ent[b], c); // copy in replacement text + } else + s++; // not a known entity + } else if ((t == ' ' || t == '*') && isspace((int) (*s))) + *(s++) = ' '; + else + s++; // no decoding needed + } + + if (t == '*') { // normalize spaces for non-cdata attributes + for (s = r; *s; s++) { + if ((l = (long) strspn(s, " "))) + memmove(s, s + l, strlen(s + l) + 1); + while (*s && *s != ' ') + s++; + } + if (--s >= r && *s == ' ') + *s = '\0'; // trim any trailing space + } + return r; +} + +// called when parser finds start of new tag +static void switch_xml_open_tag(switch_xml_root_t root, char *name, char **attr) +{ + switch_xml_t xml = root->cur; + + if (xml->name) + xml = switch_xml_add_child(xml, name, strlen(xml->txt)); + else + xml->name = name; // first open tag + + xml->attr = attr; + root->cur = xml; // update tag insertion point +} + +// called when parser finds character content between open and closing tag +static void switch_xml_char_content(switch_xml_root_t root, char *s, switch_size_t len, char t) +{ + switch_xml_t xml = root->cur; + char *m = s; + switch_size_t l; + + if (!xml || !xml->name || !len) + return; // sanity check + + s[len] = '\0'; // null terminate text (calling functions anticipate this) + len = strlen(s = switch_xml_decode(s, root->ent, t)) + 1; + + if (!*(xml->txt)) + xml->txt = s; // initial character content + else { // allocate our own memory and make a copy + xml->txt = (xml->flags & SWITCH_XML_TXTM) // allocate some space + ? realloc(xml->txt, (l = strlen(xml->txt)) + len) + : strcpy(malloc((l = strlen(xml->txt)) + len), xml->txt); + strcpy(xml->txt + l, s); // add new char content + if (s != m) + free(s); // free s if it was malloced by switch_xml_decode() + } + + if (xml->txt != m) + switch_xml_set_flag(xml, SWITCH_XML_TXTM); +} + +// called when parser finds closing tag +static switch_xml_t switch_xml_close_tag(switch_xml_root_t root, char *name, char *s) +{ + if (!root->cur || !root->cur->name || strcmp(name, root->cur->name)) + return switch_xml_err(root, s, "unexpected closing tag </%s>", name); + + root->cur = root->cur->parent; + return NULL; +} + +// checks for circular entity references, returns non-zero if no circular +// references are found, zero otherwise +static int switch_xml_ent_ok(char *name, char *s, char **ent) +{ + int i; + + for (;; s++) { + while (*s && *s != '&') + s++; // find next entity reference + if (!*s) + return 1; + if (!strncmp(s + 1, name, strlen(name))) + return 0; // circular ref. + for (i = 0; ent[i] && strncmp(ent[i], s + 1, strlen(ent[i])); i += 2); + if (ent[i] && !switch_xml_ent_ok(name, ent[i + 1], ent)) + return 0; + } +} + +// called when the parser finds a processing instruction +static void switch_xml_proc_inst(switch_xml_root_t root, char *s, switch_size_t len) +{ + int i = 0, j = 1; + char *target = s; + + s[len] = '\0'; // null terminate instruction + if (*(s += strcspn(s, SWITCH_XML_WS))) { + *s = '\0'; // null terminate target + s += strspn(s + 1, SWITCH_XML_WS) + 1; // skip whitespace after target + } + + if (!strcmp(target, "xml")) { // <?xml ... ?> + if ((s = strstr(s, "standalone")) && !strncmp(s + strspn(s + 10, SWITCH_XML_WS "='\"") + 10, "yes", 3)) + root->standalone = 1; + return; + } + + if (!root->pi[0]) + *(root->pi = malloc(sizeof(char **))) = NULL; //first pi + + while (root->pi[i] && strcmp(target, root->pi[i][0])) + i++; // find target + if (!root->pi[i]) { // new target + root->pi = realloc(root->pi, sizeof(char **) * (i + 2)); + root->pi[i] = malloc(sizeof(char *) * 3); + root->pi[i][0] = target; + root->pi[i][1] = (char *) (root->pi[i + 1] = NULL); // terminate pi list + root->pi[i][2] = strdup(""); // empty document position list + } + + while (root->pi[i][j]) + j++; // find end of instruction list for this target + root->pi[i] = realloc(root->pi[i], sizeof(char *) * (j + 3)); + root->pi[i][j + 2] = realloc(root->pi[i][j + 1], j + 1); + strcpy(root->pi[i][j + 2] + j - 1, (root->xml.name) ? ">" : "<"); + root->pi[i][j + 1] = NULL; // null terminate pi list for this target + root->pi[i][j] = s; // set instruction +} + +// called when the parser finds an internal doctype subset +static short switch_xml_internal_dtd(switch_xml_root_t root, char *s, switch_size_t len) +{ + char q, *c, *t, *n = NULL, *v, **ent, **pe; + int i, j; + + pe = memcpy(malloc(sizeof(SWITCH_XML_NIL)), SWITCH_XML_NIL, sizeof(SWITCH_XML_NIL)); + + for (s[len] = '\0'; s;) { + while (*s && *s != '<' && *s != '%') + s++; // find next declaration + + if (!*s) + break; + else if (!strncmp(s, "<!ENTITY", 8)) { // parse entity definitions + c = s += strspn(s + 8, SWITCH_XML_WS) + 8; // skip white space separator + n = s + strspn(s, SWITCH_XML_WS "%"); // find name + *(s = n + strcspn(n, SWITCH_XML_WS)) = ';'; // append ; to name + + v = s + strspn(s + 1, SWITCH_XML_WS) + 1; // find value + if ((q = *(v++)) != '"' && q != '\'') { // skip externals + s = strchr(s, '>'); + continue; + } + + for (i = 0, ent = (*c == '%') ? pe : root->ent; ent[i]; i++); + ent = realloc(ent, (i + 3) * sizeof(char *)); // space for next ent + if (*c == '%') + pe = ent; + else + root->ent = ent; + + *(++s) = '\0'; // null terminate name + if ((s = strchr(v, q))) + *(s++) = '\0'; // null terminate value + ent[i + 1] = switch_xml_decode(v, pe, '%'); // set value + ent[i + 2] = NULL; // null terminate entity list + if (!switch_xml_ent_ok(n, ent[i + 1], ent)) { // circular reference + if (ent[i + 1] != v) + free(ent[i + 1]); + switch_xml_err(root, v, "circular entity declaration &%s", n); + break; + } else + ent[i] = n; // set entity name + } else if (!strncmp(s, "<!ATTLIST", 9)) { // parse default attributes + t = s + strspn(s + 9, SWITCH_XML_WS) + 9; // skip whitespace separator + if (!*t) { + switch_xml_err(root, t, "unclosed <!ATTLIST"); + break; + } + if (*(s = t + strcspn(t, SWITCH_XML_WS ">")) == '>') + continue; + else + *s = '\0'; // null terminate tag name + for (i = 0; root->attr[i] && strcmp(n, root->attr[i][0]); i++); + + while (*(n = ++s + strspn(s, SWITCH_XML_WS)) && *n != '>') { + if (*(s = n + strcspn(n, SWITCH_XML_WS))) + *s = '\0'; // attr name + else { + switch_xml_err(root, t, "malformed <!ATTLIST"); + break; + } + + s += strspn(s + 1, SWITCH_XML_WS) + 1; // find next token + c = (strncmp(s, "CDATA", 5)) ? "*" : " "; // is it cdata? + if (!strncmp(s, "NOTATION", 8)) + s += strspn(s + 8, SWITCH_XML_WS) + 8; + s = (*s == '(') ? strchr(s, ')') : s + strcspn(s, SWITCH_XML_WS); + if (!s) { + switch_xml_err(root, t, "malformed <!ATTLIST"); + break; + } + + s += strspn(s, SWITCH_XML_WS ")"); // skip white space separator + if (!strncmp(s, "#FIXED", 6)) + s += strspn(s + 6, SWITCH_XML_WS) + 6; + if (*s == '#') { // no default value + s += strcspn(s, SWITCH_XML_WS ">") - 1; + if (*c == ' ') + continue; // cdata is default, nothing to do + v = NULL; + } else if ((*s == '"' || *s == '\'') && // default value + (s = strchr(v = s + 1, *s))) + *s = '\0'; + else { + switch_xml_err(root, t, "malformed <!ATTLIST"); + break; + } + + if (!root->attr[i]) { // new tag name + root->attr = (!i) ? malloc(2 * sizeof(char **)) + : realloc(root->attr, (i + 2) * sizeof(char **)); + root->attr[i] = malloc(2 * sizeof(char *)); + root->attr[i][0] = t; // set tag name + root->attr[i][1] = (char *) (root->attr[i + 1] = NULL); + } + + for (j = 1; root->attr[i][j]; j += 3); // find end of list + root->attr[i] = realloc(root->attr[i], (j + 4) * sizeof(char *)); + + root->attr[i][j + 3] = NULL; // null terminate list + root->attr[i][j + 2] = c; // is it cdata? + root->attr[i][j + 1] = (v) ? switch_xml_decode(v, root->ent, *c) + : NULL; + root->attr[i][j] = n; // attribute name + } + } else if (!strncmp(s, ""); // comments + else if (!strncmp(s, "<?", 2)) { // processing instructions + if ((s = strstr(c = s + 2, "?>"))) + switch_xml_proc_inst(root, c, s++ - c); + } else if (*s == '<') + s = strchr(s, '>'); // skip other declarations + else if (*(s++) == '%' && !root->standalone) + break; + } + + free(pe); + return !*root->err; +} + +// Converts a UTF-16 string to UTF-8. Returns a new string that must be freed +// or NULL if no conversion was needed. +static char *switch_xml_str2utf8(char **s, switch_size_t *len) +{ + char *u; + switch_size_t l = 0, sl, max = *len; + long c, d; + int b, be = (**s == '\xFE') ? 1 : (**s == '\xFF') ? 0 : -1; + + if (be == -1) + return NULL; // not UTF-16 + + u = malloc(max); + for (sl = 2; sl < *len - 1; sl += 2) { + c = (be) ? (((*s)[sl] & 0xFF) << 8) | ((*s)[sl + 1] & 0xFF) //UTF-16BE + : (((*s)[sl + 1] & 0xFF) << 8) | ((*s)[sl] & 0xFF); //UTF-16LE + if (c >= 0xD800 && c <= 0xDFFF && (sl += 2) < *len - 1) { // high-half + d = (be) ? (((*s)[sl] & 0xFF) << 8) | ((*s)[sl + 1] & 0xFF) + : (((*s)[sl + 1] & 0xFF) << 8) | ((*s)[sl] & 0xFF); + c = (((c & 0x3FF) << 10) | (d & 0x3FF)) + 0x10000; + } + + while (l + 6 > max) + u = realloc(u, max += SWITCH_XML_BUFSIZE); + if (c < 0x80) + u[l++] = (char) c; // US-ASCII subset + else { // multi-byte UTF-8 sequence + for (b = 0, d = c; d; d /= 2) + b++; // bits in c + b = (b - 2) / 5; // bytes in payload + u[l++] = (char) ((0xFF << (7 - b)) | (c >> (6 * b))); // head + while (b) + u[l++] = (char) (0x80 | ((c >> (6 * --b)) & 0x3F)); // payload + } + } + return *s = realloc(u, *len = l); +} + +// frees a tag attribute list +static void switch_xml_free_attr(char **attr) +{ + int i = 0; + char *m; + + if (!attr || attr == SWITCH_XML_NIL) + return; // nothing to free + while (attr[i]) + i += 2; // find end of attribute list + m = attr[i + 1]; // list of which names and values are malloced + for (i = 0; m[i]; i++) { + if (m[i] & SWITCH_XML_NAMEM) + free(attr[i * 2]); + if (m[i] & SWITCH_XML_TXTM) + free(attr[(i * 2) + 1]); + } + free(m); + free(attr); +} + +// parse the given xml string and return an switch_xml structure +SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str(char *s, switch_size_t len) +{ + switch_xml_root_t root = (switch_xml_root_t) switch_xml_new(NULL); + char q, e, *d, **attr, **a = NULL; // initialize a to avoid compile warning + int l, i, j; + + root->m = s; + if (!len) + return switch_xml_err(root, s, "root tag missing"); + root->u = switch_xml_str2utf8(&s, &len); // convert utf-16 to utf-8 + root->e = (root->s = s) + len; // record start and end of work area + + e = s[len - 1]; // save end char + s[len - 1] = '\0'; // turn end char into null terminator + + while (*s && *s != '<') + s++; // find first tag + if (!*s) + return switch_xml_err(root, s, "root tag missing"); + + for (;;) { + attr = (char **) SWITCH_XML_NIL; + d = ++s; + + if (isalpha((int) (*s)) || *s == '_' || *s == ':' || (int8_t) *s < '\0') { // new tag + if (!root->cur) + return switch_xml_err(root, d, "markup outside of root element"); + + s += strcspn(s, SWITCH_XML_WS "/>"); + while (isspace((int) (*s))) + *(s++) = '\0'; // null terminate tag name + + if (*s && *s != '/' && *s != '>') // find tag in default attr list + for (i = 0; (a = root->attr[i]) && strcmp(a[0], d); i++); + + for (l = 0; *s && *s != '/' && *s != '>'; l += 2) { // new attrib + attr = (l) ? realloc(attr, (l + 4) * sizeof(char *)) + : malloc(4 * sizeof(char *)); // allocate space + attr[l + 3] = (l) ? realloc(attr[l + 1], (l / 2) + 2) + : malloc(2); // mem for list of maloced vals + strcpy(attr[l + 3] + (l / 2), " "); // value is not malloced + attr[l + 2] = NULL; // null terminate list + attr[l + 1] = ""; // temporary attribute value + attr[l] = s; // set attribute name + + s += strcspn(s, SWITCH_XML_WS "=/>"); + if (*s == '=' || isspace((int) (*s))) { + *(s++) = '\0'; // null terminate tag attribute name + q = *(s += strspn(s, SWITCH_XML_WS "=")); + if (q == '"' || q == '\'') { // attribute value + attr[l + 1] = ++s; + while (*s && *s != q) + s++; + if (*s) + *(s++) = '\0'; // null terminate attribute val + else { + switch_xml_free_attr(attr); + return switch_xml_err(root, d, "missing %c", q); + } + + for (j = 1; a && a[j] && strcmp(a[j], attr[l]); j += 3); + attr[l + 1] = switch_xml_decode(attr[l + 1], root->ent, (a && a[j]) ? *a[j + 2] : ' '); + if (attr[l + 1] < d || attr[l + 1] > s) + attr[l + 3][l / 2] = SWITCH_XML_TXTM; // value malloced + } + } + while (isspace((int) (*s))) + s++; + } + + if (*s == '/') { // self closing tag + *(s++) = '\0'; + if ((*s && *s != '>') || (!*s && e != '>')) { + if (l) + switch_xml_free_attr(attr); + return switch_xml_err(root, d, "missing >"); + } + switch_xml_open_tag(root, d, attr); + switch_xml_close_tag(root, d, s); + } else if ((q = *s) == '>' || (!*s && e == '>')) { // open tag + *s = '\0'; // temporarily null terminate tag name + switch_xml_open_tag(root, d, attr); + *s = q; + } else { + if (l) + switch_xml_free_attr(attr); + return switch_xml_err(root, d, "missing >"); + } + } else if (*s == '/') { // close tag + s += strcspn(d = s + 1, SWITCH_XML_WS ">") + 1; + if (!(q = *s) && e != '>') + return switch_xml_err(root, d, "missing >"); + *s = '\0'; // temporarily null terminate tag name + if (switch_xml_close_tag(root, d, s)) + return &root->xml; + if (isspace((int) (*s = q))) + s += strspn(s, SWITCH_XML_WS); + } else if (!strncmp(s, "!--", 3)) { // xml comment + if (!(s = strstr(s + 3, "--")) || (*(s += 2) != '>' && *s) || (!*s && e != '>')) + return switch_xml_err(root, d, "unclosed "))) { + ml = 0; + bp = e + 3; + cur = strlen(bp); + } else { + continue; + } + } + + 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); + } + } else { + ml++; + } + + cmd += 5; + if ((e = strchr(cmd, '\r')) || (e = strchr(cmd, '\n'))) { + *e = '\0'; + } + + if ((arg = strchr(cmd, ' '))) { + *arg++ = '\0'; + if ((q = strchr(arg, '"'))) { + char *qq = q + 1; + + if ((qq = strchr(qq, '"'))) { + *qq = '\0'; + arg = q + 1; + } + } + + if (!strcasecmp(cmd, "set")) { + char *name = arg; + char *val = strchr(name, '='); + + if (val) { + char *ve = val++; + while (*val && *val == ' ') { + val++; + } + *ve-- = '\0'; + while (*ve && *ve == ' ') { + *ve-- = '\0'; + } + } + + if (name && val) { + switch_core_set_variable(name, val); + } + + } else if (!strcasecmp(cmd, "include")) { + char *fme = NULL, *ifile = arg; + + if (!switch_is_file_path(ifile)) { + 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)); + } + switch_safe_free(fme); + } /* else NO OP */ + } + + continue; + } + + if(write(write_fd, bp, (unsigned) cur) != (unsigned) cur) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n", err); + } + + } + + close(read_fd); + return write_fd; +} + +SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file_simple(const char *file) +{ + int fd = -1; + struct stat st; + switch_size_t l; + void *m; + switch_xml_root_t root; + + if ((fd = open(file, O_RDONLY, 0)) > -1) { + fstat(fd, &st); + l = read(fd, m = malloc(st.st_size), st.st_size); + root = (switch_xml_root_t) switch_xml_parse_str(m, l); + root->dynamic = 1; + close(fd); + return &root->xml; + } + + return NULL; +} + +SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file) +{ + int fd = -1, write_fd = -1; + switch_xml_t xml = NULL; + char *new_file = NULL; + const char *abs; + + if ((abs = strrchr(file, '/')) || (abs = strrchr(file, '\\'))) { + abs++; + } else { + abs = file; + } + + if (!(new_file = switch_mprintf("%s%s%s.fsxml", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, abs))) { + return NULL; + } + + if ((write_fd = open(new_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) { + goto done; + } + + if (preprocess(file, write_fd, 0) > -1) { + close(write_fd); + write_fd = -1; + if ((fd = open(new_file, O_RDONLY, 0)) > -1) { + if ((xml = switch_xml_parse_fd(fd))) { + xml->free_path = new_file; + new_file = NULL; + } + close(fd); + fd = -1; + } + } + + done: + if (write_fd > -1) { + close(write_fd); + } + if (fd > -1) { + close(fd); + } + switch_safe_free(new_file); + return xml; +} + + +SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section, + const char *tag_name, + const char *key_name, const char *key_value, switch_xml_t * root, switch_xml_t * node, + const char *params) +{ + switch_xml_t conf = NULL; + switch_xml_t tag = NULL; + switch_xml_t xml = NULL; + switch_xml_binding_t *binding; + uint8_t loops = 0; + + switch_mutex_lock(XML_LOCK); + + for (binding = BINDINGS; binding; binding = binding->next) { + switch_xml_section_t sections = switch_xml_parse_section_string(section); + + if (binding->sections && !(sections & binding->sections)) { + continue; + } + + if ((xml = binding->function(section, tag_name, key_name, key_value, params, binding->user_data))) { + const char *err = NULL; + + err = switch_xml_error(xml); + if (switch_strlen_zero(err)) { + if ((conf = switch_xml_find_child(xml, "section", "name", "result"))) { + switch_xml_t p; + const char *aname; + + if ((p = switch_xml_child(conf, "result"))) { + aname = switch_xml_attr(p, "status"); + if (aname && !strcasecmp(aname, "not found")) { + switch_xml_free(xml); + xml = NULL; + continue; + } + } + } + break; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error[%s]\n", err); + switch_xml_free(xml); + xml = NULL; + } + } + } + switch_mutex_unlock(XML_LOCK); + + for (;;) { + if (!xml) { + if (!(xml = switch_xml_root())) { + *node = NULL; + *root = NULL; + return SWITCH_STATUS_FALSE; + } + } + + if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { + *node = tag; + *root = xml; + return SWITCH_STATUS_SUCCESS; + } else { + switch_xml_free(xml); + xml = NULL; + *node = NULL; + *root = NULL; + if (loops++ > 1) { + break; + } + } + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(switch_status_t) switch_xml_locate_domain(char *domain_name, char *params, switch_xml_t *root, switch_xml_t *domain) +{ + char my_params[512]; + *domain = NULL; + + if (!params) { + snprintf(my_params, sizeof(my_params), "domain=%s", domain_name); + params = my_params; + } + + return switch_xml_locate("directory", "domain", "name", domain_name, root, domain, params); +} + + +SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(char *user_name, char *domain_name, + char *ip, + switch_xml_t *root, + switch_xml_t *domain, + switch_xml_t *user) +{ + char params[1024] = ""; + switch_status_t status; + *root = NULL; + *user = NULL; + *domain = NULL; + + snprintf(params, sizeof(params), "user=%s&domain=%s&ip=%s", switch_str_nil(user_name), switch_str_nil(domain_name), switch_str_nil(ip)); + if ((status = switch_xml_locate_domain(domain_name, params, root, domain)) != SWITCH_STATUS_SUCCESS) { + return status; + } + + if (ip) { + if ((*user = switch_xml_find_child(*domain, "user", "ip", ip))) { + return SWITCH_STATUS_SUCCESS; + } + } + + if (user_name) { + if (!(*user = switch_xml_find_child(*domain, "user", "id", user_name))) { + return SWITCH_STATUS_FALSE; + } + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + + +SWITCH_DECLARE(switch_xml_t) switch_xml_root(void) +{ + lock_count++; + switch_thread_rwlock_rdlock(RWLOCK); + return MAIN_XML_ROOT; +} + +SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **err) +{ + char path_buf[1024]; + uint8_t hasmain = 0, errcnt = 0; + switch_xml_t new_main; + + switch_mutex_lock(XML_LOCK); + + if (MAIN_XML_ROOT) { + hasmain++; + + if (!reload) { + switch_mutex_unlock(XML_LOCK); + return switch_xml_root(); + } + switch_thread_rwlock_wrlock(RWLOCK); + } + + snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, "freeswitch.xml"); + if ((new_main = switch_xml_parse_file(path_buf))) { + *err = switch_xml_error(new_main); + + if (!switch_strlen_zero(*err)) { + switch_xml_free(new_main); + new_main = NULL; + errcnt++; + } else { + switch_xml_t old_root; + *err = "Success"; + old_root = MAIN_XML_ROOT; + MAIN_XML_ROOT = new_main; + switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT); + switch_xml_free(old_root); + } + } else { + *err = "Cannot Open log directory or XML Root!"; + errcnt++; + } + + if (hasmain) { + switch_thread_rwlock_unlock(RWLOCK); + } + switch_mutex_unlock(XML_LOCK); + + return errcnt == 0 ? switch_xml_root() : NULL; +} + + +SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, const char **err) +{ + switch_xml_t xml; + XML_MEMORY_POOL = pool; + *err = "Success"; + + switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); + switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL); + + assert(pool != NULL); + + if ((xml = switch_xml_open_root(FALSE, err))) { + switch_xml_free(xml); + return SWITCH_STATUS_SUCCESS; + } else { + return SWITCH_STATUS_FALSE; + } +} + +SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void) +{ + if (MAIN_XML_ROOT) { + switch_xml_t xml = MAIN_XML_ROOT; + MAIN_XML_ROOT = NULL; + switch_xml_free(xml); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t * node, const char *params) +{ + switch_xml_t xml = NULL, cfg = NULL; + + *node = NULL; + + assert(MAIN_XML_ROOT != NULL); + + if (switch_xml_locate("configuration", "configuration", "name", file_path, &xml, &cfg, params) == SWITCH_STATUS_SUCCESS) { + *node = cfg; + } + + return xml; + +} + + +// Encodes ampersand sequences appending the results to *dst, reallocating *dst +// if length excedes max. a is non-zero for attribute encoding. Returns *dst +static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst, switch_size_t *dlen, switch_size_t *max, short a) +{ + const char *e = NULL; + + if (len) { + e = s + len; + } + + while (s != e) { + while (*dlen + 10 > *max) + *dst = realloc(*dst, *max += SWITCH_XML_BUFSIZE); + + switch (*s) { + case '\0': + return *dst; + case '&': + *dlen += sprintf(*dst + *dlen, "&"); + break; + case '<': + *dlen += sprintf(*dst + *dlen, "<"); + break; + case '>': + *dlen += sprintf(*dst + *dlen, ">"); + break; + case '"': + *dlen += sprintf(*dst + *dlen, (a) ? """ : "\""); + break; + case '\n': + *dlen += sprintf(*dst + *dlen, (a) ? "
" : "\n"); + break; + case '\t': + *dlen += sprintf(*dst + *dlen, (a) ? "	" : "\t"); + break; + case '\r': + *dlen += sprintf(*dst + *dlen, ""); + break; + default: + (*dst)[(*dlen)++] = *s; + } + s++; + } + return *dst; +} + +#define XML_INDENT " " +// Recursively converts each tag to xml appending it to *s. Reallocates *s if +// its length excedes max. start is the location of the previous tag in the +// parent tag's character content. Returns *s. +static char *switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max, switch_size_t start, char ***attr, uint32_t * count) +{ + int i, j; + char *txt = (xml->parent) ? xml->parent->txt : ""; + switch_size_t off = 0; + uint32_t lcount = 0; + + // parent character content up to this tag + *s = switch_xml_ampencode(txt + start, xml->off - start, s, len, max, 0); + + while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) + 1 > *max) // reallocate s + *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); + + if (*(*s + (*len) - 1) == '>') { + *len += sprintf(*s + *len, "\n"); // indent + } + for (lcount = 0; lcount < *count; lcount++) { + *len += sprintf(*s + *len, "%s", XML_INDENT); // indent + } + + *len += sprintf(*s + *len, "<%s", xml->name); // open tag + for (i = 0; xml->attr[i]; i += 2) { // tag attributes + if (switch_xml_attr(xml, xml->attr[i]) != xml->attr[i + 1]) + continue; + while (*len + strlen(xml->attr[i]) + 7 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s + *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); + + *len += sprintf(*s + *len, " %s=\"", xml->attr[i]); + switch_xml_ampencode(xml->attr[i + 1], 0, s, len, max, 1); + *len += sprintf(*s + *len, "\""); + } + + for (i = 0; attr[i] && strcmp(attr[i][0], xml->name); i++); + for (j = 1; attr[i] && attr[i][j]; j += 3) { // default attributes + if (!attr[i][j + 1] || switch_xml_attr(xml, attr[i][j]) != attr[i][j + 1]) + continue; // skip duplicates and non-values + while (*len + strlen(attr[i][j]) + 8 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s + *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); + + *len += sprintf(*s + *len, " %s=\"", attr[i][j]); + switch_xml_ampencode(attr[i][j + 1], 0, s, len, max, 1); + *len += sprintf(*s + *len, "\""); + } + + *len += sprintf(*s + *len, (xml->child || xml->txt) ? ">" : "/>\n"); + + if (xml->child) { + (*count)++; + *s = switch_xml_toxml_r(xml->child, s, len, max, 0, attr, count); + + } else { + *s = switch_xml_ampencode(xml->txt, 0, s, len, max, 0); //data + } + + while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s + *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); + + + if (xml->child || xml->txt) { + if (*(*s + (*len) - 1) == '\n') { + for (lcount = 0; lcount < *count; lcount++) { + *len += sprintf(*s + *len, "%s", XML_INDENT); // indent + } + } + *len += sprintf(*s + (*len), "</%s>\n", xml->name); // close tag + } + + while (txt[off] && off < xml->off) + off++; // make sure off is within bounds + + if (xml->ordered) { + return switch_xml_toxml_r(xml->ordered, s, len, max, off, attr, count); + + } else { + if (*count > 0) + (*count)--; + return switch_xml_ampencode(txt + off, 0, s, len, max, 0); + } +} + +// converts an switch_xml structure back to xml, returning a string of xml date that +// must be freed +SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml) +{ + switch_xml_t p = (xml) ? xml->parent : NULL, o = (xml) ? xml->ordered : NULL; + switch_xml_root_t root = (switch_xml_root_t) xml; + switch_size_t len = 0, max = SWITCH_XML_BUFSIZE; + char *s = strcpy(malloc(max), ""), *t, *n; + int i, j, k; + uint32_t count = 0; + + if (!xml || !xml->name) + return realloc(s, len + 1); + while (root->xml.parent) + root = (switch_xml_root_t) root->xml.parent; // root tag + + for (i = 0; !p && root->pi[i]; i++) { // pre-root processing instructions + for (k = 2; root->pi[i][k - 1]; k++); + for (j = 1; (n = root->pi[i][j]); j++) { + if (root->pi[i][k][j - 1] == '>') + continue; // not pre-root + while (len + strlen(t = root->pi[i][0]) + strlen(n) + 7 > max) + s = realloc(s, max += SWITCH_XML_BUFSIZE); + len += sprintf(s + len, "<?%s%s%s?>", t, *n ? " " : "", n); + } + } + + xml->parent = xml->ordered = NULL; + s = switch_xml_toxml_r(xml, &s, &len, &max, 0, root->attr, &count); + xml->parent = p; + xml->ordered = o; + + for (i = 0; !p && root->pi[i]; i++) { // post-root processing instructions + for (k = 2; root->pi[i][k - 1]; k++); + for (j = 1; (n = root->pi[i][j]); j++) { + if (root->pi[i][k][j - 1] == '<') + continue; // not post-root + while (len + strlen(t = root->pi[i][0]) + strlen(n) + 7 > max) + s = realloc(s, max += SWITCH_XML_BUFSIZE); + len += sprintf(s + len, "\n<?%s%s%s?>", t, *n ? " " : "", n); + } + } + return realloc(s, len + 1); +} + +// free the memory allocated for the switch_xml structure +SWITCH_DECLARE(void) switch_xml_free(switch_xml_t xml) +{ + switch_xml_root_t root = (switch_xml_root_t) xml; + int i, j; + char **a, *s; + + + if (!xml) + return; + + if (switch_test_flag(xml, SWITCH_XML_ROOT)) { + if (lock_count > 0) { + switch_thread_rwlock_unlock(RWLOCK); + lock_count--; + } + } + + if (xml == MAIN_XML_ROOT) { + return; + } + + if (xml->free_path) { + unlink(xml->free_path); + switch_safe_free(xml->free_path); + } + + switch_xml_free(xml->child); + switch_xml_free(xml->ordered); + + if (!xml->parent) { // free root tag allocations + for (i = 10; root->ent[i]; i += 2) // 0 - 9 are default entites (<>&"') + if ((s = root->ent[i + 1]) < root->s || s > root->e) + free(s); + free(root->ent); // free list of general entities + + for (i = 0; (a = root->attr[i]); i++) { + for (j = 1; a[j++]; j += 2) // free malloced attribute values + if (a[j] && (a[j] < root->s || a[j] > root->e)) + free(a[j]); + free(a); + } + if (root->attr[0]) + free(root->attr); // free default attribute list + + for (i = 0; root->pi[i]; i++) { + for (j = 1; root->pi[i][j]; j++); + free(root->pi[i][j + 1]); + free(root->pi[i]); + } + if (root->pi[0]) + free(root->pi); // free processing instructions + + if (root->dynamic == 1) + free(root->m); // malloced xml data +#ifdef HAVE_MMAP + else if (root->len) + munmap(root->m, root->len); // mem mapped xml data +#endif // HAVE_MMAP + if (root->u) + free(root->u); // utf8 conversion + } + + switch_xml_free_attr(xml->attr); // tag attributes + if ((xml->flags & SWITCH_XML_TXTM)) + free(xml->txt); // character content + if ((xml->flags & SWITCH_XML_NAMEM)) + free(xml->name); // tag name + free(xml); +} + +// return parser error message or empty string if none +SWITCH_DECLARE(const char *) switch_xml_error(switch_xml_t xml) +{ + while (xml && xml->parent) + xml = xml->parent; // find root tag + return (xml) ? ((switch_xml_root_t) xml)->err : ""; +} + +// returns a new empty switch_xml structure with the given root tag name +SWITCH_DECLARE(switch_xml_t) switch_xml_new(const char *name) +{ + static char *ent[] = { "lt;", "<", "gt;", ">", "quot;", """, + "apos;", "'", "amp;", "&", NULL + }; + switch_xml_root_t root = (switch_xml_root_t) memset(malloc(sizeof(struct switch_xml_root)), + '\0', sizeof(struct switch_xml_root)); + root->xml.name = (char *) name; + root->cur = &root->xml; + strcpy(root->err, root->xml.txt = ""); + root->ent = memcpy(malloc(sizeof(ent)), ent, sizeof(ent)); + root->attr = root->pi = (char ***) (root->xml.attr = SWITCH_XML_NIL); + return &root->xml; +} + +// inserts an existing tag into an switch_xml structure +SWITCH_DECLARE(switch_xml_t) switch_xml_insert(switch_xml_t xml, switch_xml_t dest, switch_size_t off) +{ + switch_xml_t cur, prev, head; + + xml->next = xml->sibling = xml->ordered = NULL; + xml->off = off; + xml->parent = dest; + + if ((head = dest->child)) { // already have sub tags + if (head->off <= off) { // not first subtag + for (cur = head; cur->ordered && cur->ordered->off <= off; cur = cur->ordered); + xml->ordered = cur->ordered; + cur->ordered = xml; + } else { // first subtag + xml->ordered = head; + dest->child = xml; + } + + for (cur = head, prev = NULL; cur && strcmp(cur->name, xml->name); prev = cur, cur = cur->sibling); // find tag type + if (cur && cur->off <= off) { // not first of type + while (cur->next && cur->next->off <= off) + cur = cur->next; + xml->next = cur->next; + cur->next = xml; + } else { // first tag of this type + if (prev && cur) + prev->sibling = cur->sibling; // remove old first + xml->next = cur; // old first tag is now next + for (cur = head, prev = NULL; cur && cur->off <= off; prev = cur, cur = cur->sibling); // new sibling insert point + xml->sibling = cur; + if (prev) + prev->sibling = xml; + } + } else + dest->child = xml; // only sub tag + + return xml; +} + +// Adds a child tag. off is the offset of the child tag relative to the start +// of the parent tag's character content. Returns the child tag +SWITCH_DECLARE(switch_xml_t) switch_xml_add_child(switch_xml_t xml, const char *name, switch_size_t off) +{ + switch_xml_t child; + + if (!xml) + return NULL; + child = (switch_xml_t) memset(malloc(sizeof(struct switch_xml)), '\0', sizeof(struct switch_xml)); + child->name = (char *) name; + child->attr = SWITCH_XML_NIL; + child->off = off; + child->parent = xml; + child->txt = ""; + + return switch_xml_insert(child, xml, off); +} + +// sets the character content for the given tag and returns the tag +SWITCH_DECLARE(switch_xml_t) switch_xml_set_txt(switch_xml_t xml, const char *txt) +{ + if (!xml) + return NULL; + if (xml->flags & SWITCH_XML_TXTM) + free(xml->txt); // existing txt was malloced + xml->flags &= ~SWITCH_XML_TXTM; + xml->txt = (char *) txt; + return xml; +} + +// Sets the given tag attribute or adds a new attribute if not found. A value +// of NULL will remove the specified attribute. Returns the tag given +SWITCH_DECLARE(switch_xml_t) switch_xml_set_attr(switch_xml_t xml, const char *name, const char *value) +{ + int l = 0, c; + + if (!xml) + return NULL; + while (xml->attr[l] && strcmp(xml->attr[l], name)) + l += 2; + if (!xml->attr[l]) { // not found, add as new attribute + if (!value) + return xml; // nothing to do + if (xml->attr == SWITCH_XML_NIL) { // first attribute + xml->attr = malloc(4 * sizeof(char *)); + xml->attr[1] = strdup(""); // empty list of malloced names/vals + } else + xml->attr = realloc(xml->attr, (l + 4) * sizeof(char *)); + + xml->attr[l] = (char *) name; // set attribute name + xml->attr[l + 2] = NULL; // null terminate attribute list + xml->attr[l + 3] = realloc(xml->attr[l + 1], (c = (int) strlen(xml->attr[l + 1])) + 2); + strcpy(xml->attr[l + 3] + c, " "); // set name/value as not malloced + if (xml->flags & SWITCH_XML_DUP) + xml->attr[l + 3][c] = SWITCH_XML_NAMEM; + } else if (xml->flags & SWITCH_XML_DUP) + free((char *) name); // name was strduped + + for (c = l; xml->attr[c]; c += 2); // find end of attribute list + if (xml->attr[c + 1][l / 2] & SWITCH_XML_TXTM) + free(xml->attr[l + 1]); //old val + if (xml->flags & SWITCH_XML_DUP) + xml->attr[c + 1][l / 2] |= SWITCH_XML_TXTM; + else + xml->attr[c + 1][l / 2] &= ~SWITCH_XML_TXTM; + + if (value) + xml->attr[l + 1] = (char *) value; // set attribute value + else { // remove attribute + if (xml->attr[c + 1][l / 2] & SWITCH_XML_NAMEM) + free(xml->attr[l]); + memmove(xml->attr + l, xml->attr + l + 2, (c - l + 2) * sizeof(char *)); + xml->attr = realloc(xml->attr, (c + 2) * sizeof(char *)); + memmove(xml->attr[c + 1] + (l / 2), xml->attr[c + 1] + (l / 2) + 1, (c / 2) - (l / 2)); // fix list of which name/vals are malloced + } + xml->flags &= ~SWITCH_XML_DUP; // clear strdup() flag + + return xml; +} + +// sets a flag for the given tag and returns the tag +SWITCH_DECLARE(switch_xml_t) switch_xml_set_flag(switch_xml_t xml, switch_xml_flag_t flag) +{ + if (xml) + xml->flags |= flag; + return xml; +} + +// removes a tag along with its subtags without freeing its memory +SWITCH_DECLARE(switch_xml_t) switch_xml_cut(switch_xml_t xml) +{ + switch_xml_t cur; + + if (!xml) + return NULL; // nothing to do + if (xml->next) + xml->next->sibling = xml->sibling; // patch sibling list + + if (xml->parent) { // not root tag + cur = xml->parent->child; // find head of subtag list + if (cur == xml) + xml->parent->child = xml->ordered; // first subtag + else { // not first subtag + while (cur->ordered != xml) + cur = cur->ordered; + cur->ordered = cur->ordered->ordered; // patch ordered list + + cur = xml->parent->child; // go back to head of subtag list + if (strcmp(cur->name, xml->name)) { // not in first sibling list + while (strcmp(cur->sibling->name, xml->name)) + cur = cur->sibling; + if (cur->sibling == xml) { // first of a sibling list + cur->sibling = (xml->next) ? xml->next : cur->sibling->sibling; + } else + cur = cur->sibling; // not first of a sibling list + } + + while (cur->next && cur->next != xml) + cur = cur->next; + if (cur->next) + cur->next = cur->next->next; // patch next list + } + } + xml->ordered = xml->sibling = xml->next = NULL; // prevent switch_xml_free() from clobbering ordered list + return xml; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r5536 - freeswitch/trunk
by Freeswitch SVN 16 Jul '07

16 Jul '07

Author: mikej Date: Mon Jul 16 11:08:38 2007 New Revision: 5536 Modified: freeswitch/trunk/configure.in Log: add some helpers to build 64 bit on solaris amd 64 Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Jul 16 11:08:38 2007 @@ -117,6 +117,10 @@ ;; esac +# Enable debugging +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="yes"]) + # tweak compiler specific flags if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC) @@ -126,6 +130,10 @@ APR_ADDTO(SWITCH_AM_CXXFLAGS, "-features=extensions") APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib) + if test "${enable_64}" = "yes"; then + APR_ADDTO(SWITCH_AM_CFLAGS, -m64) + APR_ADDTO(SWITCH_AM_LDFLAGS, -L/opt/csw/lib/amd64) + fi elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)

1 0