diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-22 16:14:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-22 16:14:10 +0000 |
| commit | 629fc68556ec39180e65a8c018ee5503bbdafce8 (patch) | |
| tree | 60cf5d5e6be4aa3d70af47253d1bce38f03fe07e /channels | |
| parent | ee0639746f40230f99ceff7bbbe6d6aa3f311d9f (diff) | |
Merged revisions 202415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r202415 | russell | 2009-06-22 11:05:08 -0500 (Mon, 22 Jun 2009) | 9 lines
Merged revisions 202414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r202414 | russell | 2009-06-22 11:00:00 -0500 (Mon, 22 Jun 2009) | 2 lines
Make Polycom subscription type override check more explicit.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@202418 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8af0412f9..f3d436c43 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -19640,16 +19640,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) /* We do not need the authpeer any more */ unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 2)"); /* 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(acceptheader, "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(acceptheader, "application/pidf+xml")) { + } else if (pidf_xml) { p->subscribed = PIDF_XML; /* RFC 3863 format */ } else if (strstr(acceptheader, "application/dialog-info+xml")) { p->subscribed = DIALOG_INFO_XML; |