[asterisk-commits] mmichelson: trunk r310238 - in /trunk: ./ channels/chan_sip.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Mar 10 09:28:58 CST 2011
Author: mmichelson
Date: Thu Mar 10 09:28:55 2011
New Revision: 310238
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=310238
Log:
Merged revisions 310231 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r310231 | mmichelson | 2011-03-10 09:17:04 -0600 (Thu, 10 Mar 2011) | 9 lines
Be more tolerant of what URI we accept for call completion PUBLISH requests.
(closes issue #18946)
Reported by: GeorgeKonopacki
Patches:
18946.patch uploaded by mmichelson (license 60)
Tested by: GeorgeKonopacki
........
Modified:
trunk/ (props changed)
trunk/channels/chan_sip.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=310238&r1=310237&r2=310238
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Mar 10 09:28:55 2011
@@ -23178,7 +23178,7 @@
static int cc_esc_publish_handler(struct sip_pvt *pvt, struct sip_request *req, struct event_state_compositor *esc, struct sip_esc_entry *esc_entry)
{
const char *uri = REQ_OFFSET_TO_STR(req, rlPart2);
- struct ast_cc_agent *agent = find_sip_cc_agent_by_notify_uri(uri);
+ struct ast_cc_agent *agent;
struct sip_cc_agent_pvt *agent_pvt;
struct ast_xml_doc *pidf_doc = NULL;
const char *basic_status = NULL;
@@ -23191,7 +23191,7 @@
struct ast_xml_node *basic_node;
int res = 0;
- if (!agent) {
+ if (!((agent = find_sip_cc_agent_by_notify_uri(uri)) || (agent = find_sip_cc_agent_by_subscribe_uri(uri)))) {
ast_log(LOG_WARNING, "Could not find agent using uri '%s'\n", uri);
transmit_response(pvt, "412 Conditional Request Failed", req);
return -1;
More information about the asterisk-commits
mailing list