moving init up so we have it in pre process vars
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13532 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
235fdf6938
commit
8da02d971e
|
@ -1128,8 +1128,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
|
|||
runtime.flags = flags;
|
||||
runtime.sps_total = 30;
|
||||
|
||||
|
||||
|
||||
switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET);
|
||||
switch_core_set_variable("local_ip_v4", guess_ip);
|
||||
switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET6);
|
||||
|
@ -1139,6 +1137,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
|
|||
|
||||
switch_event_init(runtime.memory_pool);
|
||||
|
||||
switch_nat_init(runtime.memory_pool);
|
||||
|
||||
if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) {
|
||||
apr_terminate();
|
||||
return SWITCH_STATUS_MEMERR;
|
||||
|
@ -1161,7 +1161,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
|
|||
switch_scheduler_task_thread_start();
|
||||
|
||||
switch_rtp_init(runtime.memory_pool);
|
||||
switch_nat_init(runtime.memory_pool);
|
||||
|
||||
runtime.running = 1;
|
||||
|
||||
|
|
Loading…
Reference in New Issue