From 9b42edc3192848329636824ce90c4ff4f0995046 Mon Sep 17 00:00:00 2001 From: Michael Jerris <mike@jerris.com> Date: Tue, 31 Mar 2009 20:51:35 +0000 Subject: [PATCH] linux... how did that not crash every time git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12856 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/libsofia-sip-ua/nta/nta.c | 6 ++++-- src/mod/endpoints/mod_sofia/sofia.c | 1 + src/switch_event.c | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c index 362d9ae960..f1ca960cf9 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c +++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c @@ -3319,8 +3319,10 @@ msg_t *nta_msg_create_for_transport(nta_agent_t *agent, int flags, msg_maxsize(msg, agent->sa_maxsize); - if (agent->sa_preload) - su_home_preload(msg_home(msg), 1, dlen + agent->sa_preload); + if (1 || agent->sa_preload) { + isize_t preload = (dlen + agent->sa_preload + 1023) & ~1023; + su_home_preload(msg_home(msg), 1, preload); + } return msg; } diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index 28f3f03554..52ee28a763 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -744,6 +744,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->bindurl), + NTATAG_PRELOAD(2048), TAG_IF(!strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP4_ONLY)), TAG_IF(strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP6_ONLY)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), diff --git a/src/switch_event.c b/src/switch_event.c index c94ddc161c..40e0f5c98a 100644 --- a/src/switch_event.c +++ b/src/switch_event.c @@ -1119,9 +1119,10 @@ SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(const char *file, con for (;;) { for (index = (*event)->priority; index < 3; index++) { + int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != (*event)->priority) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + if (index != was) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); } goto end; }