kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-09 07:57:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make Polycom subscription type override check more explicit.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@202414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-06-22 16:00:00 +00:00
parent 26ba38b8f4
commit dcfd8d7c7c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+9 -5
View File
@@ -15821,16 +15821,20 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
make_our_tag(p->tag, sizeof(p->tag));
if (!strcmp(event, "presence") || !strcmp(event, "dialog")) { /* Presence, RFC 3842 */
unsigned int pidf_xml;
if (authpeer) /* No need for authpeer here */
ASTOBJ_UNREF(authpeer, sip_destroy_peer);
/* Header from Xten Eye-beam Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml */
/* Polycom phones only handle xpidf+xml, even if they say they can
handle pidf+xml as well
*/
if (strstr(p->useragent, "Polycom")) {
pidf_xml = strstr(accept, "application/pidf+xml") ? 1 : 0;
/* Older versions of Polycom firmware will claim pidf+xml, but really
* they only support xpidf+xml. */
if (pidf_xml && strstr(p->useragent, "Polycom")) {
p->subscribed = XPIDF_XML;
} else if (strstr(accept, "application/pidf+xml")) {
} else if (pidf_xml) {
p->subscribed = PIDF_XML; /* RFC 3863 format */
} else if (strstr(accept, "application/dialog-info+xml")) {
p->subscribed = DIALOG_INFO_XML;