[asterisk-commits] kpfleming: trunk r44394 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Oct  4 16:20:55 2006
New Revision: 44394

URL: http://svn.digium.com/view/asterisk?rev=44394&view=rev
Log:
Merged revisions 44393 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44393 | kpfleming | 2006-10-04 16:17:30 -0500 (Wed, 04 Oct 2006) | 11 lines

Merged revisions 44392 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44392 | kpfleming | 2006-10-04 16:15:29 -0500 (Wed, 04 Oct 2006) | 3 lines

remove workaround for old Polycom firmware SUBSCRIBE requests
add workaround for new Polycom firmware SUBSCRIBE requests (bug is known to exist in 2.0.1 firmware)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=44394&r1=44393&r2=44394&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Oct  4 16:20:55 2006
@@ -13881,7 +13881,6 @@
 		return 0;
 	} else {
 		/* XXX reduce nesting here */
-
 		/* Initialize tag for new subscriptions */	
 		if (ast_strlen_zero(p->tag))
 			make_our_tag(p->tag, sizeof(p->tag));
@@ -13889,7 +13888,10 @@
 		if (!strcmp(event, "presence") || !strcmp(event, "dialog")) { /* Presence, RFC 3842 */
 
 			/* Header from Xten Eye-beam Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml */
- 			if (strstr(accept, "application/pidf+xml")) {
+			/* don't supply pidf+xml to Polycom phones until they fix their firmware to
+			   parse it properly
+			*/
+			if (strstr(accept, "application/pidf+xml") && !strstr(p->useragent, "Polycom")) {
  				p->subscribed = PIDF_XML;         /* RFC 3863 format */
  			} else if (strstr(accept, "application/dialog-info+xml")) {
  				p->subscribed = DIALOG_INFO_XML;
@@ -13898,8 +13900,6 @@
  				p->subscribed = CPIM_PIDF_XML;    /* RFC 3863 format */
  			} else if (strstr(accept, "application/xpidf+xml")) {
  				p->subscribed = XPIDF_XML;        /* Early pre-RFC 3863 format with MSN additions (Microsoft Messenger) */
- 			} else if (strstr(p->useragent, "Polycom")) {
- 				p->subscribed = XPIDF_XML;        /*  Polycoms subscribe for "event: dialog" but don't include an "accept:" header */
 			} else {
  				/* Can't find a format for events that we know about */
  				transmit_response(p, "489 Bad Event", req);