[svn-commits] mmichelson: branch group/CCSS r232344 - /team/group/CCSS/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Dec  2 10:32:05 2009
New Revision: 232344

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=232344
Log:
Strip off URI parameters when receiving a CC SUBSCRIBE.


Modified:
    team/group/CCSS/channels/chan_sip.c

Modified: team/group/CCSS/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/channels/chan_sip.c?view=diff&rev=232344&r1=232343&r2=232344
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Wed Dec  2 10:32:05 2009
@@ -23526,10 +23526,15 @@
 static int handle_cc_subscribe(struct sip_pvt *p, struct sip_request *req)
 {
 	const char *uri = REQ_OFFSET_TO_STR(req, rlPart2);
-	struct ast_cc_agent *agent = find_sip_cc_agent_by_subscribe_uri(uri);
+	char *param_separator;
+	struct ast_cc_agent *agent;
 	struct sip_cc_agent_pvt *agent_pvt;
 
-	if (!agent) {
+	if ((param_separator = strchr(uri, ';'))) {
+		*param_separator = '\0';
+	}
+
+	if (!(agent = find_sip_cc_agent_by_subscribe_uri(uri))) {
 		ast_log(LOG_WARNING, "Invalid URI '%s' in CC subscribe\n", uri);
 		transmit_response(p, "404 Not Found", req);
 		return -1;