- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11863 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:22:54 2009 New Revision: 11863 Log: Thu Jan 29 12:32:12 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: do not add Min-SE header if not needed Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 11:22:54 2009 @@ -1 +1 @@ -Wed Feb 11 11:20:46 CST 2009 +Wed Feb 11 11:22:43 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Wed Feb 11 11:22:54 2009 @@ -4413,6 +4413,10 @@ else if (refresher == nua_local_refresher) x->x_params = uas ? x_params_uas : x_params_uac; + if (expires == 0 && t->remote.min_se == 0) + /* Session timer is not used, do not add headers */ + return 1; + sip_add_tl(msg, sip, TAG_IF(expires != 0, SIPTAG_SESSION_EXPIRES(x)), TAG_IF(min != 0

1 0

[commit] r11862 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:22:23 2009 New Revision: 11862 Log: Wed Jan 28 13:21:36 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su-glib/su_source.c: fixed su_source_is_running() signature Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Wed Feb 11 11:22:23 2009 @@ -125,7 +125,7 @@ su_root_t *root); static int su_source_multishot(su_port_t *self, int multishot); static int su_source_wakeup(su_port_t *self); -static int su_source_is_running(su_port_t *self); +static int su_source_is_running(su_port_t const *self); static char const *su_source_name(su_port_t const *self); @@ -944,7 +944,7 @@ } } -static int su_source_is_running(su_port_t *self) +static int su_source_is_running(su_port_t const *self) { return self->sup_main_loop && g_main_loop_is_running(self->sup_main_loop); }

1 0

[commit] r11861 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:20:59 2009 New Revision: 11861 Log: Wed Jan 28 12:32:01 CST 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * nua/outbound.c: calculate the keepalive timer interval with regard to the maximum defer interval The point is not to miss the keepalive deadlines. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 11:20:59 2009 @@ -1 +1 @@ -Wed Feb 11 11:19:42 CST 2009 +Wed Feb 11 11:20:46 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Wed Feb 11 11:20:59 2009 @@ -685,8 +685,16 @@ su_timer_destroy(ob->ob_keepalive.timer), ob->ob_keepalive.timer = NULL; if (interval) { + su_duration_t max_defer; + + max_defer = su_root_get_max_defer(ob->ob_root); + if ((su_duration_t)interval >= max_defer) { + interval -= max_defer - 100; + } + ob->ob_keepalive.timer = su_timer_create(su_root_task(ob->ob_root), interval); + su_timer_deferrable(ob->ob_keepalive.timer, 1); }

1 0

[commit] r11860 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:20:26 2009 New Revision: 11860 Log: Wed Jan 28 12:31:06 CST 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * su-glib/su_source.c: improved the deferrable timeout calculation Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Wed Feb 11 11:20:26 2009 @@ -386,7 +386,7 @@ return TRUE; } - if (self->sup_base->sup_timers) { + if (self->sup_base->sup_timers || self->sup_base->sup_deferrable) { su_time_t now; GTimeVal gtimeval; @@ -395,10 +395,18 @@ now.tv_usec = gtimeval.tv_usec; tout = su_timer_next_expires(&self->sup_base->sup_timers, now); - } - if (self->sup_base->sup_deferrable) { - if (tout > self->sup_base->sup_max_defer) - tout = self->sup_base->sup_max_defer; + + if (self->sup_base->sup_deferrable) { + su_duration_t tout_defer; + + tout_defer = su_timer_next_expires(&self->sup_base->sup_deferrable, now); + + if (tout_defer < self->sup_base->sup_max_defer) + tout_defer = self->sup_base->sup_max_defer; + + if (tout > tout_defer) + tout = tout_defer; + } } *return_tout = (tout >= 0 && tout <= (su_duration_t)G_MAXINT)?

1 0

[commit] r11859 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:20:06 2009 New Revision: 11859 Log: Wed Jan 28 12:30:55 CST 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * su-glib/su_source.c: updated copyright years Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Wed Feb 11 11:20:06 2009 @@ -1,7 +1,7 @@ /* * This file is part of the Sofia-SIP package * - * Copyright (C) 2005 Nokia Corporation. + * Copyright (C) 2005-2009 Nokia Corporation. * * Contact: Pekka Pessi <pekka.pessi(a)nokia.com> *

1 0

[commit] r11858 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:19:49 2009 New Revision: 11858 Log: Wed Jan 28 12:27:47 CST 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * Added a comment about suspicious timeout calculation code Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 11:19:49 2009 @@ -1 +1 @@ -Wed Feb 11 11:19:18 CST 2009 +Wed Feb 11 11:19:42 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c Wed Feb 11 11:19:49 2009 @@ -456,6 +456,7 @@ if (self->sup_timers) su_timer_expire(&self->sup_timers, &tout, now); + /* XXX: why isn't the timeout ignored here? */ if (self->sup_deferrable) su_timer_expire(&self->sup_deferrable, &tout, now);

1 0

[commit] r11857 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua-glib/su-glib
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:19:25 2009 New Revision: 11857 Log: Wed Jan 28 12:20:34 CST 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * Added deferrable timer support to the GSource integration. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 11:19:25 2009 @@ -1 +1 @@ -Wed Feb 11 11:18:53 CST 2009 +Wed Feb 11 11:19:18 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Wed Feb 11 11:19:25 2009 @@ -377,6 +377,7 @@ { SuSource *ss = (SuSource *)gs; su_port_t *self = ss->ss_port; + su_duration_t tout = SU_WAIT_FOREVER; enter; @@ -388,21 +389,22 @@ if (self->sup_base->sup_timers) { su_time_t now; GTimeVal gtimeval; - su_duration_t tout; g_source_get_current_time(gs, &gtimeval); now.tv_sec = gtimeval.tv_sec + 2208988800UL; now.tv_usec = gtimeval.tv_usec; tout = su_timer_next_expires(&self->sup_base->sup_timers, now); - - *return_tout = (tout < 0 || tout > (su_duration_t)G_MAXINT)? - -1 : (gint)tout; - - return (tout == 0); } + if (self->sup_base->sup_deferrable) { + if (tout > self->sup_base->sup_max_defer) + tout = self->sup_base->sup_max_defer; + } + + *return_tout = (tout >= 0 && tout <= (su_duration_t)G_MAXINT)? + (gint)tout : -1; - return FALSE; + return (tout == 0); } static @@ -440,11 +442,10 @@ if (self->sup_base->sup_head) su_base_port_getmsgs(self); - if (self->sup_base->sup_timers) { + if (self->sup_base->sup_timers || self->sup_base->sup_deferrable) { su_time_t now; GTimeVal gtimeval; su_duration_t tout; - int timers = 0; tout = SU_DURATION_MAX; @@ -453,7 +454,8 @@ now.tv_sec = gtimeval.tv_sec + 2208988800UL; now.tv_usec = gtimeval.tv_usec; - timers = su_timer_expire(&self->sup_base->sup_timers, &tout, now); + su_timer_expire(&self->sup_base->sup_timers, &tout, now); + su_timer_expire(&self->sup_base->sup_deferrable, &tout, now); } #if SU_HAVE_POLL

1 0

[commit] r11856 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:19:01 2009 New Revision: 11856 Log: Wed Jan 28 12:15:08 CST 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * Merged deferrable timers from the bleeding-sofia-sip branch Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_socket_port.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 11:19:01 2009 @@ -1 +1 @@ -Wed Feb 11 11:18:29 CST 2009 +Wed Feb 11 11:18:53 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_socket_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_socket_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_socket_port.c Wed Feb 11 11:19:01 2009 @@ -184,7 +184,7 @@ { assert(self->sup_mbox[SU_MBOX_SEND] != INVALID_SOCKET); - if (!su_pthread_port_own_thread(self) && + if (!su_port_own_thread(self) && send(self->sup_mbox[SU_MBOX_SEND], "X", 1, 0) == -1) { #if HAVE_SOCKETPAIR if (su_errno() != EWOULDBLOCK)

1 0

[commit] r11855 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua-glib/su-glib libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:18:37 2009 New Revision: 11855 Log: Wed Jan 28 12:09:00 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_port.h, su_timer.c: refactored su_timer_next_expires() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 11:18:37 2009 @@ -1 +1 @@ -Wed Feb 11 11:18:06 CST 2009 +Wed Feb 11 11:18:29 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Wed Feb 11 11:18:37 2009 @@ -394,7 +394,7 @@ now.tv_sec = gtimeval.tv_sec + 2208988800UL; now.tv_usec = gtimeval.tv_usec; - tout = su_timer_next_expires(self->sup_base->sup_timers, now); + tout = su_timer_next_expires(&self->sup_base->sup_timers, now); *return_tout = (tout < 0 || tout > (su_duration_t)G_MAXINT)? -1 : (gint)tout; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h Wed Feb 11 11:18:37 2009 @@ -166,7 +166,7 @@ /* Extension from >= 1.12.5 */ SOFIAPUBFUN void su_msg_delivery_report(su_msg_r msg); -SOFIAPUBFUN su_duration_t su_timer_next_expires(su_timer_t const * t, +SOFIAPUBFUN su_duration_t su_timer_next_expires(su_timer_queue_t const *timers, su_time_t now); SOFIAPUBFUN su_root_t *su_root_create_with_port(su_root_magic_t *magic, su_port_t *port) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c Wed Feb 11 11:18:37 2009 @@ -581,25 +581,22 @@ /** Calculate duration in milliseconds until next timer expires. */ -su_duration_t su_timer_next_expires(su_timer_t const * t, su_time_t now) +su_duration_t su_timer_next_expires(su_timer_queue_t const *timers, + su_time_t now) { - su_timer_queue_t *timers; + su_duration_t next = SU_DURATION_MAX; - su_duration_t tout; + su_timer_t const *t; - if (!t) - return SU_DURATION_MAX; + t = timers ? timers_get(timers[0], 1) : NULL; - timers = su_task_timers(t->sut_task); - - t = timers ? timers_get(timers[0], 1) : NULL; - - if (!t) - return SU_DURATION_MAX; - - tout = su_duration(t->sut_when, now); + if (t) { + next = su_duration(t->sut_when, now); + if (next < 0) + next = 0; + } - return tout > 0 ? tout : 0 ; + return next; } /**

1 0

[commit] r11854 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:18:14 2009 New Revision: 11854 Log: Wed Jan 28 12:07:53 CST 2009 Pekka Pessi <first.last(a)nokia.com> * outbound.c: make outbound timer deferrable Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 11:18:14 2009 @@ -1 +1 @@ -Wed Feb 11 11:17:39 CST 2009 +Wed Feb 11 11:18:06 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Wed Feb 11 11:18:14 2009 @@ -684,9 +684,11 @@ if (ob->ob_keepalive.timer) su_timer_destroy(ob->ob_keepalive.timer), ob->ob_keepalive.timer = NULL; - if (interval) + if (interval) { ob->ob_keepalive.timer = su_timer_create(su_root_task(ob->ob_root), interval); + su_timer_deferrable(ob->ob_keepalive.timer, 1); + } ob->ob_keepalive.interval = interval;

1 0