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

[Freeswitch SVN]

Author: mikej
Date: Tue Apr 22 17:26:50 2008
New Revision: 8174

Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c

Log:
interim fix for SFSIP-55, don't segfault on subscribe with Expires: 0

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Apr 22 17:26:50 2008
@@ -1 +1 @@
-Mon Apr 21 18:30:34 EDT 2008
+Tue Apr 22 16:13:56 CDT 2008

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c	Tue Apr 22 17:26:50 2008
@@ -351,8 +351,8 @@
 
   /* nu_requested is set by SUBSCRIBE and cleared when NOTIFY is sent */
   if (nu && nu->nu_requested && substate != nua_substate_embryonic) {
-#if SU_HAVE_EXPERIMENTAL
     sip_t const *sip = sr->sr_request.sip;
+#if SU_HAVE_EXPERIMENTAL
     sip_suppress_notify_if_match_t *snim = sip_suppress_notify_if_match(sip);
     sip_suppress_body_if_match_t *sbim = sip_suppress_body_if_match(sip);
     
@@ -364,7 +364,7 @@
       notify = 1, nu->nu_no_body = 1;
     else 
 #endif
-      notify = 1;
+		if (sip->sip_expires && sip->sip_expires->ex_delta) notify = 1;
   }
 
   retval = nua_base_server_treport(sr, NUTAG_SUBSTATE(substate), TAG_END());