From: Michael Jerris Date: Thu, 3 Apr 2008 22:33:12 +0000 (+0000) Subject: Tue Apr 1 06:49:10 EDT 2008 Pekka.Pessi@nokia.com X-Git-Tag: v1.0-rc3~58 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad8ed1be64e4e5192dfcdbafde8068f3f1901869;p=thirdparty%2Ffreeswitch.git Tue Apr 1 06:49:10 EDT 2008 Pekka.Pessi@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. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8017 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 18fcffa1fb..053f34d713 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Thu Apr 3 18:31:42 EDT 2008 +Thu Apr 3 18:33:04 EDT 2008 diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c index d52cb2a13d..65ec3003a6 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c +++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c @@ -1707,8 +1707,12 @@ int nua_server_respond(nua_server_request_t *sr, tagi_t const *tags) 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 &&