[asterisk-commits] mmichelson: branch 1.8 r310231 - /branches/1.8/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Mar 10 09:17:04 2011
New Revision: 310231

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=310231
Log:
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:
    branches/1.8/channels/chan_sip.c

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=310231&r1=310230&r2=310231
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Thu Mar 10 09:17:04 2011
@@ -22863,7 +22863,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;
@@ -22876,7 +22876,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;