update

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

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 70da8d0b43a864657cab9880011745c3d43a25ab..d3c33dbb4778b01aa884f8553e82ee840970f2ea 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -366,6 +366,7 @@ SFF_RAW_RTP   = (1 <<  1) - Frame has raw rtp accessible
 </pre>
  */
 typedef enum {
+       SFF_NONE = 0,
        SFF_CNG = (1 << 0),
        SFF_RAW_RTP = (1 << 1)
 } switch_frame_flag_t;

diff --git a/src/include/switch_xml.h b/src/include/switch_xml.h
index b2fea6b11f7e4bbf7ec1bd27ead6c52dc6fb801a..23bf972a576563dc2e4cae4f0f6ea3c531647b68 100644 (file)
--- a/src/include/switch_xml.h
+++ b/src/include/switch_xml.h
@@ -271,13 +271,15 @@ SWITCH_DECLARE(void) switch_xml_remove(switch_xml_t xml);
 
 ///\brief open the Core xml root
 ///\param reload if it's is already open close it and open it again as soon as permissable (blocking)
+///\param err a pointer to set error strings
 ///\return the xml root node or NULL
-SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload);
+SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **err);
 
 ///\brief initilize the core XML backend
 ///\param pool a memory pool to use
+///\param err a pointer to set error strings
 ///\return SWITCH_STATUS_SUCCESS if successful
-SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool);
+SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, const char **err);
 
 
 SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void);

diff --git a/src/switch_core.c b/src/switch_core.c
index 8cdc546f6ad10331b2bafedddde1a912def35a35..1f278146e83f42292a2171e14143306aa81fb8a3 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -2742,7 +2742,7 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
 
 SWITCH_DECLARE(switch_status_t) switch_core_init(char *console)
 {
-
+       const char *err = NULL;
        memset(&runtime, 0, sizeof(runtime));
        
        switch_core_set_globals();
@@ -2755,14 +2755,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(char *console)
        }
 
        if (apr_pool_create(&runtime.memory_pool, NULL) != SWITCH_STATUS_SUCCESS) {
+               apr_terminate();
                fprintf(stderr, "FATAL ERROR! Could not allocate memory pool\n");
-               switch_core_destroy();
                return SWITCH_STATUS_MEMERR;
        }
 
-       if (switch_xml_init(runtime.memory_pool) != SWITCH_STATUS_SUCCESS) {
-               fprintf(stderr, "FATAL ERROR! Could not open XML Registry\n");
-               switch_core_destroy();
+       if (switch_xml_init(runtime.memory_pool, &err) != SWITCH_STATUS_SUCCESS) {
+               apr_terminate();
+               fprintf(stderr, "FATAL ERROR! Could not open XML Registry %s\n", err);
                return SWITCH_STATUS_MEMERR;
        }
 

diff --git a/src/switch_xml.c b/src/switch_xml.c
index 3cad71ee382a839163090e7a9cee351c1802e6bc..a3adf0440ee7a14b88ff50ee843071a7f9a2e02d 100644 (file)
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -868,7 +868,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_root(void)
        return MAIN_XML_ROOT;
 }
 
-SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload)
+SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **err)
 {
        char path_buf[1024];
        uint8_t hasmain = 0;
@@ -891,7 +891,14 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload)
 
        snprintf(path_buf, sizeof(path_buf), "%s/%s", SWITCH_GLOBAL_dirs.conf_dir, "freeswitch.xml");
        if ((MAIN_XML_ROOT = switch_xml_parse_file(path_buf))) {
-               switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT);
+               *err = switch_xml_error(MAIN_XML_ROOT);
+
+               if (!switch_strlen_zero(*err)) {
+                       switch_xml_free(MAIN_XML_ROOT);
+                       MAIN_XML_ROOT = NULL;
+               } else {
+                       switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT);
+               }
        } else {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open XML Root!\n");
        }
@@ -904,16 +911,18 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload)
 }
 
 
-SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool)
+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))) {
+       if((xml=switch_xml_open_root(FALSE, err))) {
                switch_xml_free(xml);
                return SWITCH_STATUS_SUCCESS;
        } else {