kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-19 22:18:19 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1467 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-05-15 18:16:43 +00:00
parent 0332cb2652
commit 9d68a23929
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_types.h
View File

@ -366,6 +366,7 @@ SFF_RAW_RTP = (1 << 1) - Frame has raw rtp accessible
</pre> </pre>
*/ */
typedef enum { typedef enum {
SFF_NONE = 0,
SFF_CNG = (1 << 0), SFF_CNG = (1 << 0),
SFF_RAW_RTP = (1 << 1) SFF_RAW_RTP = (1 << 1)
} switch_frame_flag_t; } switch_frame_flag_t;

6
src/include/switch_xml.h
View File

@ -271,13 +271,15 @@ SWITCH_DECLARE(void) switch_xml_remove(switch_xml_t xml);
///\brief open the Core xml root ///\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 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 ///\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 ///\brief initilize the core XML backend
///\param pool a memory pool to use ///\param pool a memory pool to use
///\param err a pointer to set error strings
///\return SWITCH_STATUS_SUCCESS if successful ///\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); SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void);

10
src/switch_core.c
View File

@ -2742,7 +2742,7 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
SWITCH_DECLARE(switch_status_t) switch_core_init(char *console) SWITCH_DECLARE(switch_status_t) switch_core_init(char *console)
{ {
const char *err = NULL;
memset(&runtime, 0, sizeof(runtime)); memset(&runtime, 0, sizeof(runtime));
switch_core_set_globals(); 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) { if (apr_pool_create(&runtime.memory_pool, NULL) != SWITCH_STATUS_SUCCESS) {
apr_terminate();
fprintf(stderr, "FATAL ERROR! Could not allocate memory pool\n"); fprintf(stderr, "FATAL ERROR! Could not allocate memory pool\n");
switch_core_destroy();
return SWITCH_STATUS_MEMERR; return SWITCH_STATUS_MEMERR;
} }
if (switch_xml_init(runtime.memory_pool) != SWITCH_STATUS_SUCCESS) { if (switch_xml_init(runtime.memory_pool, &err) != SWITCH_STATUS_SUCCESS) {
fprintf(stderr, "FATAL ERROR! Could not open XML Registry\n"); apr_terminate();
switch_core_destroy(); fprintf(stderr, "FATAL ERROR! Could not open XML Registry %s\n", err);
return SWITCH_STATUS_MEMERR; return SWITCH_STATUS_MEMERR;
} }

15
src/switch_xml.c
View File

@ -868,7 +868,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_root(void)
return MAIN_XML_ROOT; 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]; char path_buf[1024];
uint8_t hasmain = 0; 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"); 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))) { if ((MAIN_XML_ROOT = switch_xml_parse_file(path_buf))) {
*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); switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT);
}
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open XML Root!\n"); 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; switch_xml_t xml;
XML_MEMORY_POOL = pool; XML_MEMORY_POOL = pool;
*err = "Success";
switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL); switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL);
assert(pool != NULL); assert(pool != NULL);
if((xml=switch_xml_open_root(FALSE))) { if((xml=switch_xml_open_root(FALSE, err))) {
switch_xml_free(xml); switch_xml_free(xml);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} else { } else {