[svn-commits] mattf: branch mattf/1.6.0-chan_ccs r271866 - /team/mattf/1.6.0-chan_ccs/chann...

[SVN commits to the Digium repositories]

Author: mattf
Date: Tue Jun 22 11:26:11 2010
New Revision: 271866

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=271866
Log:
Add fix for getting callgroups working, also add changes for proper LNP operation

Modified:
    team/mattf/1.6.0-chan_ccs/channels/chan_ccs.c

Modified: team/mattf/1.6.0-chan_ccs/channels/chan_ccs.c
URL: http://svnview.digium.com/svn/asterisk/team/mattf/1.6.0-chan_ccs/channels/chan_ccs.c?view=diff&rev=271866&r1=271865&r2=271866
==============================================================================
--- team/mattf/1.6.0-chan_ccs/channels/chan_ccs.c (original)
+++ team/mattf/1.6.0-chan_ccs/channels/chan_ccs.c Tue Jun 22 11:26:11 2010
@@ -710,6 +710,18 @@
 		isup_set_forward_call_ind_nat_bits(p->sig.ss7.call, atoi(nat_bits));
 	
 	gen_address = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_ADDRESS");
+	gen_address_type = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_ADDRESS_TYPE");
+	gen_address_num_plan = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_ADDRESS_NUM_PLAN");
+	gen_address_nai = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_ADDRESS_NAI");
+	gen_address_npi = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_ADDRESS_NPI");
+	if (gen_address_type)
+		p->gen_add_type = atoi(gen_address_type);
+	if (gen_address_num_plan)
+		p->gen_add_num_plan = atoi(gen_address_num_plan);
+	if (gen_address_nai)
+		p->gen_add_nai = atoi(gen_address_nai);
+	if (gen_address_npi)
+		p->gen_add_pres_ind = atoi(gen_address_npi);
 	if (gen_address)
 		isup_set_gen_address(p->sig.ss7.call, gen_address, p->gen_add_nai,p->gen_add_pres_ind, p->gen_add_num_plan,p->gen_add_type); /* need to add some types here for NAI,PRES,TYPE */
 	gen_address_type = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_ADDRESS_TYPE");
@@ -1814,7 +1826,7 @@
 	i = ao2_iterator_init(huntgroups, 0);
 
 	while ((p = ao2_iterator_next(&i))) {
-		if (!strcasecmp(g->name, "name")) {
+		if (!strcasecmp(p->name, name)) {
 			g = p;
 			ao2_ref(p, -1);
 			break;