add xml

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1376 d0543943-73ff-0310-b7d9-9358b9ac24b2

Makefile.am

@@ -70,6 +70,7 @@ src/include/switch_version.h\
 src/include/switch_rtp.h\
 src/include/switch_stun.h\
 src/include/switch_log.h\
+src/include/switch_xml.h\
 src/switch_rtp.c\
 src/switch_buffer.c \
 src/switch_caller.c \
@@ -83,7 +84,8 @@ src/switch_event.c \
 src/switch_resample.c \
 src/switch_ivr.c \
 src/switch_stun.c\
-src/switch_log.c
+src/switch_log.c\
+src/switch_xml.c
 
 
 
@@ -113,7 +115,8 @@ src/include/switch_utils.h\
 src/include/switch_rtp.h\
 src/include/switch_version.h\
 src/include/switch_stun.h\
-src/include/switch_log.h
+src/include/switch_log.h\
+src/include/switch_xml.h
 
 BUILT_SOURCES = version depends
 CLEANFILES = src/include/switch_version.h

Makefile.in

@@ -85,7 +85,7 @@ am_libfreeswitch_la_OBJECTS = libfreeswitch_la-switch_rtp.lo \
 	libfreeswitch_la-switch_event.lo \
 	libfreeswitch_la-switch_resample.lo \
 	libfreeswitch_la-switch_ivr.lo libfreeswitch_la-switch_stun.lo \
-	libfreeswitch_la-switch_log.lo
+	libfreeswitch_la-switch_log.lo libfreeswitch_la-switch_xml.lo
 nodist_libfreeswitch_la_OBJECTS =
 libfreeswitch_la_OBJECTS = $(am_libfreeswitch_la_OBJECTS) \
 	$(nodist_libfreeswitch_la_OBJECTS)
@@ -288,6 +288,7 @@ src/include/switch_version.h\
 src/include/switch_rtp.h\
 src/include/switch_stun.h\
 src/include/switch_log.h\
+src/include/switch_xml.h\
 src/switch_rtp.c\
 src/switch_buffer.c \
 src/switch_caller.c \
@@ -301,7 +302,8 @@ src/switch_event.c \
 src/switch_resample.c \
 src/switch_ivr.c \
 src/switch_stun.c\
-src/switch_log.c
+src/switch_log.c\
+src/switch_xml.c
 
 
 #bindir = $(PREFIX)/bin
@@ -330,7 +332,8 @@ src/include/switch_utils.h\
 src/include/switch_rtp.h\
 src/include/switch_version.h\
 src/include/switch_stun.h\
-src/include/switch_log.h
+src/include/switch_log.h\
+src/include/switch_xml.h
 
 BUILT_SOURCES = version depends
 CLEANFILES = src/include/switch_version.h
@@ -483,6 +486,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_rtp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_stun.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_xml.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -603,6 +607,13 @@ libfreeswitch_la-switch_log.lo: src/switch_log.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_log.lo `test -f 'src/switch_log.c' || echo '$(srcdir)/'`src/switch_log.c
 
+libfreeswitch_la-switch_xml.lo: src/switch_xml.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_xml.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_xml.Tpo" -c -o libfreeswitch_la-switch_xml.lo `test -f 'src/switch_xml.c' || echo '$(srcdir)/'`src/switch_xml.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_xml.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_xml.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_xml.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_xml.c' object='libfreeswitch_la-switch_xml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_xml.lo `test -f 'src/switch_xml.c' || echo '$(srcdir)/'`src/switch_xml.c
+
 freeswitch-switch.o: src/switch.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(freeswitch_CFLAGS) $(CFLAGS) -MT freeswitch-switch.o -MD -MP -MF "$(DEPDIR)/freeswitch-switch.Tpo" -c -o freeswitch-switch.o `test -f 'src/switch.c' || echo '$(srcdir)/'`src/switch.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/freeswitch-switch.Tpo" "$(DEPDIR)/freeswitch-switch.Po"; else rm -f "$(DEPDIR)/freeswitch-switch.Tpo"; exit 1; fi

configure.in

@@ -34,7 +34,7 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([gethostname vasprintf])
+AC_CHECK_FUNCS([gethostname vasprintf mmap])
 
 AC_C_BIGENDIAN(AC_DEFINE([__BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([__BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian]))
 AC_DEFINE([__LITTLE_ENDIAN],1234,[for the places where it is not defined])

src/include/switch.h

@@ -75,6 +75,7 @@ BEGIN_EXTERN_C
 #include <switch_stun.h>
 #include <switch_stun.h>
 #include <switch_log.h>
+#include <switch_xml.h>
 
 END_EXTERN_C
 

src/include/switch_am_config.h.in

@@ -20,6 +20,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `mmap' function. */
+#undef HAVE_MMAP
+
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 

src/include/switch_xml.h

+/* switch_xml.h
+ *
+ * Copyright 2004, 2005 Aaron Voisine <aaron@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.
+ */
+
+#ifndef _SWITCH_XML_H
+#define _SWITCH_XML_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <fcntl.h>
+
+BEGIN_EXTERN_C
+
+#define SWITCH_XML_BUFSIZE 1024 // size of internal memory buffers
+#define SWITCH_XML_NAMEM   0x80 // name is malloced
+#define SWITCH_XML_TXTM    0x40 // txt is malloced
+#define SWITCH_XML_DUP     0x20 // attribute name and value are strduped
+
+typedef struct switch_xml *switch_xml_t;
+struct switch_xml {
+    char *name;      // tag name
+    char **attr;     // tag attributes { name, value, name, value, ... NULL }
+    char *txt;       // tag character content, empty string if none
+    size_t off;      // tag offset from start of parent tag character content
+    switch_xml_t next;    // next tag with same name in this section at this depth
+    switch_xml_t sibling; // next tag with different name in same section and depth
+    switch_xml_t ordered; // next tag, same section and depth, in original order
+    switch_xml_t child;   // head of sub tag list, NULL if none
+    switch_xml_t parent;  // parent tag, NULL if current tag is root tag
+    short flags;     // additional information
+};
+
+// Given a string of xml data and its length, parses it and creates an switch_xml
+// structure. For efficiency, modifies the data by adding null terminators
+// and decoding ampersand sequences. If you don't want this, copy the data and
+// pass in the copy. Returns NULL on failure.
+switch_xml_t switch_xml_parse_str(char *s, size_t len);
+
+// A wrapper for switch_xml_parse_str() that accepts a file descriptor. First
+// attempts to mem map the file. Failing that, reads the file into memory.
+// Returns NULL on failure.
+switch_xml_t switch_xml_parse_fd(int fd);
+
+// a wrapper for switch_xml_parse_fd() that accepts a file name
+switch_xml_t switch_xml_parse_file(const char *file);
+    
+// Wrapper for switch_xml_parse_str() that accepts a file stream. Reads the entire
+// stream into memory and then parses it. For xml files, use switch_xml_parse_file()
+// or switch_xml_parse_fd()
+switch_xml_t switch_xml_parse_fp(FILE *fp);
+
+// returns the first child tag (one level deeper) with the given name or NULL
+// if not found
+switch_xml_t switch_xml_child(switch_xml_t xml, const char *name);
+
+// returns the next tag of the same name in the same section and depth or NULL
+// if not found
+#define switch_xml_next(xml) ((xml) ? xml->next : NULL)
+
+// Returns the Nth tag with the same name in the same section at the same depth
+// or NULL if not found. An index of 0 returns the tag given.
+switch_xml_t switch_xml_idx(switch_xml_t xml, int idx);
+
+// returns the name of the given tag
+#define switch_xml_name(xml) ((xml) ? xml->name : NULL)
+
+// returns the given tag's character content or empty string if none
+#define switch_xml_txt(xml) ((xml) ? xml->txt : "")
+
+// returns the value of the requested tag attribute, or NULL if not found
+const char *switch_xml_attr(switch_xml_t xml, const char *attr);
+
+// Traverses the switch_xml sturcture 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_xml_t switch_xml_get(switch_xml_t xml, ...);
+
+// Converts an switch_xml structure back to xml. Returns a string of xml data that
+// must be freed.
+char *switch_xml_toxml(switch_xml_t xml);
+
+// returns a NULL terminated array of processing instructions for the given
+// target
+const char **switch_xml_pi(switch_xml_t xml, const char *target);
+
+// frees the memory allocated for an switch_xml structure
+void switch_xml_free(switch_xml_t xml);
+    
+// returns parser error message or empty string if none
+const char *switch_xml_error(switch_xml_t xml);
+
+// returns a new empty switch_xml structure with the given root tag name
+switch_xml_t switch_xml_new(const char *name);
+
+// wrapper for switch_xml_new() that strdup()s name
+#define switch_xml_new_d(name) switch_xml_set_flag(switch_xml_new(strdup(name)), SWITCH_XML_NAMEM)
+
+// 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_xml_t switch_xml_add_child(switch_xml_t xml, const char *name, size_t off);
+
+// wrapper for switch_xml_add_child() that strdup()s name
+#define switch_xml_add_child_d(xml, name, off) \
+    switch_xml_set_flag(switch_xml_add_child(xml, strdup(name), off), SWITCH_XML_NAMEM)
+
+// sets the character content for the given tag and returns the tag
+switch_xml_t switch_xml_set_txt(switch_xml_t xml, const char *txt);
+
+// wrapper for switch_xml_set_txt() that strdup()s txt
+#define switch_xml_set_txt_d(xml, txt) \
+    switch_xml_set_flag(switch_xml_set_txt(xml, strdup(txt)), SWITCH_XML_TXTM)
+
+// Sets the given tag attribute or adds a new attribute if not found. A value
+// of NULL will remove the specified attribute.
+void switch_xml_set_attr(switch_xml_t xml, const char *name, const char *value);
+
+// Wrapper for switch_xml_set_attr() that strdup()s name/value. Value cannot be NULL
+#define switch_xml_set_attr_d(xml, name, value) \
+    switch_xml_set_attr(switch_xml_set_flag(xml, SWITCH_XML_DUP), strdup(name), strdup(value))
+
+// sets a flag for the given tag and returns the tag
+switch_xml_t switch_xml_set_flag(switch_xml_t xml, short flag);
+
+// removes a tag along with all its subtags
+void switch_xml_remove(switch_xml_t xml);
+
+END_EXTERN_C
+
+
+#endif // _SWITCH_XML_H

src/mod/applications/mod_ivrtest/mod_ivrtest.c

@@ -57,6 +57,23 @@ static void disast_function(switch_core_session_t *session, char *data)
 }
 
 
+static void xml_function(switch_core_session_t *session, char *data)
+{
+	switch_xml_t f1 = switch_xml_parse_file("/root/formula1.xml"), team, driver;
+	const char *teamname;
+
+	for (team = switch_xml_child(f1, "team"); team; team = team->next) {
+		teamname = switch_xml_attr(team, "name");
+		for (driver = switch_xml_child(team, "driver"); driver; driver = driver->next) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 
+							  "%s, %s: %s\n", switch_xml_child(driver, "name")->txt, teamname,
+							  switch_xml_child(driver, "points")->txt);
+		}
+	}
+	switch_xml_free(f1);
+}
+
+
 static void dirtest_function(switch_core_session_t *session, char *data)
 {
 	char *var, *val;
@@ -204,11 +221,18 @@ static const switch_state_handler_table_t state_handlers = {
 };
 
 
+static const switch_application_interface_t xml_application_interface = {
+	/*.interface_name */ "xml",
+	/*.application_function */ xml_function,
+	NULL, NULL, NULL,
+	/*.next*/ NULL
+};
+
 static const switch_application_interface_t disast_application_interface = {
 	/*.interface_name */ "disast",
 	/*.application_function */ disast_function,
 	NULL, NULL, NULL,
-	/*.next*/ NULL
+	/*.next*/ &xml_application_interface
 };
 
 static const switch_application_interface_t tts_application_interface = {

src/mod/dialplans/mod_dialplan_flatfile/mod_dialplan_flatfile.c

@@ -79,9 +79,9 @@ static switch_caller_extension_t *flatfile_dialplan_hunt(switch_core_session_t *
 					*data = '\0';
 					data++;
 				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "invalid extension on line %d\n", cfg.lineno);
-					continue;
+					data = "";
 				}
+
 				if (!extension) {
 					if ((extension =
 						 switch_caller_extension_new(session, caller_profile->destination_number,