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

[Freeswitch SVN]

Author: mikej
Date: Thu Apr  3 18:33:12 2008
New Revision: 8017

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

Log:
Tue Apr  1 06:49:10 EDT 2008  Pekka.Pessi at nokia.com
  * nua_stack.c: include Allow-Events in most messages initiating dialog
  
  The Allow-Events header is now included with NOTIFY, PUBLISH, REGISTER, and
  initial INVITE, SUBSCRIBE, REFER, and OPTIONS, and also responses to
  SUBSCRIBE, REFER, OPTIONS, and PUBLISH as well as responses to initial
  INVITE and NOTIFY.
  
  Thanks to Jerry Richards for pointing out the problem.



Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Thu Apr  3 18:33:12 2008
@@ -1 +1 @@
-Thu Apr  3 18:31:42 EDT 2008
+Thu Apr  3 18:33:04 EDT 2008

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c	Thu Apr  3 18:33:12 2008
@@ -1707,8 +1707,12 @@
 	   sip_add_dup(msg, sip, (void *)NH_PGET(nh, allow)) < 0)
     ;
   else if (!sip->sip_allow_events && 
-	   (method == sip_method_publish || method == sip_method_subscribe) &&
 	   NH_PGET(nh, allow_events) &&
+	   (method == sip_method_publish || method == sip_method_subscribe ||
+	    method == sip_method_options || method == sip_method_refer || 
+	    (sr->sr_initial &&
+	     (method == sip_method_invite ||
+	      method == sip_method_notify))) &&
 	   sip_add_dup(msg, sip, (void *)NH_PGET(nh, allow_events)) < 0)
     ;
   else if (!sip->sip_contact && sr->sr_status < 300 && sr->sr_add_contact &&