git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16061 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2009-12-28 16:37:54 +00:00
parent 6b004d9cc6
commit 0e2fe14aa6
5 changed files with 31 additions and 3 deletions

View File

@@ -1166,6 +1166,22 @@ static void switch_core_set_serial(void)
}
SWITCH_DECLARE(void) switch_core_uuid_get(switch_uuid_t *uuid)
{
size_t n;
void *vp;
uuid_t *xuuid;
uuid_create(&xuuid);
switch_mutex_lock(runtime.uuid_mutex);
uuid_make(xuuid, UUID_MAKE_V4);
uuid_export(xuuid, UUID_FMT_BIN, &vp, &n);
//memcpy(xuuid, vp, n);
switch_mutex_unlock(runtime.uuid_mutex);
}
SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err)
{
switch_uuid_t uuid;
@@ -1176,7 +1192,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
char hostname[256] = "";
memset(&runtime, 0, sizeof(runtime));
runtime.dummy_cng_frame.data = runtime.dummy_data;
runtime.dummy_cng_frame.datalen = sizeof(runtime.dummy_data);
runtime.dummy_cng_frame.buflen = sizeof(runtime.dummy_data);
@@ -1202,6 +1218,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
}
switch_assert(runtime.memory_pool != NULL);
dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
switch_safe_free(dir_path);
@@ -1216,6 +1233,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
switch_dir_make_recursive(SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
switch_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
uuid_create(&runtime.uuid);
switch_mutex_init(&runtime.throttle_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
switch_mutex_init(&runtime.session_hash_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);