[Freeswitch-svn] [commit] r13318 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua

[FreeSWITCH SVN]

Author: mikej
Date: Fri May 15 10:43:28 2009
New Revision: 13318

Log:
Tue May 12 12:08:13 CDT 2009  Pekka Pessi <first.last at nokia.com>
  * nua_session.c: include Session-Expires to session refresh requests
  
  Thanks for Linus Surguy for reporting the problem.



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	Fri May 15 10:43:28 2009
@@ -1 +1 @@
-Fri May 15 10:42:15 CDT 2009
+Fri May 15 10:43:02 CDT 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	Fri May 15 10:43:28 2009
@@ -4393,10 +4393,15 @@
      */
     if (t->local.refresher == nua_local_refresher)
       refresher = nua_local_refresher;
+    else if (!initial)
+      refresher = t->refresher;
 
     expires = t->local.expires;
     if (expires != 0 && expires < min)
       expires = min;
+
+    if (expires == 0 && !initial && t->interval)
+      expires = t->interval;
   }
 
   sip_min_se_init(min_se)->min_delta = min;