[svn-commits] mmichelson: trunk r299249 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Dec 20 15:40:32 2010
New Revision: 299249

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299249
Log:
Merged revisions 299248 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r299248 | mmichelson | 2010-12-20 15:38:30 -0600 (Mon, 20 Dec 2010) | 20 lines
  
  Fix a couple of CCSS issues.
  
  * Make sure to allocate a cc_params structure
    when creating autopeers.
  
  * Use sip_uri_cmp when retrieving SIP CC agents
    and monitors in case parameters appear in the
    URI.
  
  (closes issue #18504)
  Reported by: kkm
  
  (closes issue #18338)
  Reported by: GeorgeKonopacki
  Patches: 
        18338.diff 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=299249&r1=299248&r2=299249
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Dec 20 15:40:32 2010
@@ -1639,7 +1639,7 @@
 	struct sip_cc_agent_pvt *agent_pvt = agent->private_data;
 	const char *uri = arg;
 
-	return !strcmp(agent_pvt->notify_uri, uri) ? CMP_MATCH | CMP_STOP : 0;
+	return !sip_uri_cmp(agent_pvt->notify_uri, uri) ? CMP_MATCH | CMP_STOP : 0;
 }
 
 static struct ast_cc_agent *find_sip_cc_agent_by_notify_uri(const char * const uri)
@@ -1654,7 +1654,7 @@
 	struct sip_cc_agent_pvt *agent_pvt = agent->private_data;
 	const char *uri = arg;
 
-	return !strcmp(agent_pvt->subscribe_uri, uri) ? CMP_MATCH | CMP_STOP : 0;
+	return !sip_uri_cmp(agent_pvt->subscribe_uri, uri) ? CMP_MATCH | CMP_STOP : 0;
 }
 
 static struct ast_cc_agent *find_sip_cc_agent_by_subscribe_uri(const char * const uri)
@@ -25874,6 +25874,11 @@
 
 	if (ast_string_field_init(peer, 512)) {
 		ao2_t_ref(peer, -1, "failed to string_field_init, drop peer");
+		return NULL;
+	}
+	
+	if (!(peer->cc_params = ast_cc_config_params_init())) {
+		ao2_t_ref(peer, -1, "failed to allocate cc_params for peer");
 		return NULL;
 	}