diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-22 16:00:00 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-22 16:00:00 +0000 |
| commit | e62e2affb2fab2352ee0f3711d1d6555997cbe4e (patch) | |
| tree | 701d7620d8182aeced81d40b77e82a37272f92f7 | |
| parent | b283c6a56b5b62f3a256f2bc0112fa60f550f9a7 (diff) | |
Make Polycom subscription type override check more explicit.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@202414 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 cb65b2c66..a1e627931 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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; |