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

[SVN commits to the Digium repositories]

Author: mattf
Date: Wed Jun 16 10:52:58 2010
New Revision: 270835

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=270835
Log:
Add support for variables when dealing with number portability

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=270835&r1=270834&r2=270835
==============================================================================
--- team/mattf/1.6.0-chan_ccs/channels/chan_ccs.c (original)
+++ team/mattf/1.6.0-chan_ccs/channels/chan_ccs.c Wed Jun 16 10:52:58 2010
@@ -650,6 +650,10 @@
 	struct ccs_chan *p = ast->tech_pvt;
 	const char *charge_str = NULL;
 	const char *gen_address = NULL;
+	const char *gen_address_type = NULL;
+	const char *gen_address_num_plan = NULL;
+	const char *gen_address_npi = NULL;
+	const char *gen_address_nai = NULL;
 	const char *gen_digits = NULL;
 	const char *gen_dig_type = NULL;
 	const char *gen_dig_scheme = NULL;
@@ -660,6 +664,7 @@
 	const char *call_ref_id = NULL;
 	const char *call_ref_pc = NULL;
 	const char *send_far = NULL;
+	const char *nat_bits = NULL;
 	char *l;
 	int res;
 
@@ -700,9 +705,25 @@
 	if (charge_str)
 		isup_set_charge(p->sig.ss7.call, charge_str, SS7_ANI_CALLING_PARTY_SUB_NUMBER, 0x10);
 	
+	nat_bits = pbx_builtin_getvar_helper(ast, "SS7_FCI_NAT_BITS");
+	if (nat_bits)
+		isup_set_forward_call_ind_nat_bits(p->sig.ss7.call, atoi(nat_bits));
+	
 	gen_address = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_ADDRESS");
 	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");
+	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);
 	
 	gen_digits = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_DIGITS");
 	gen_dig_type = pbx_builtin_getvar_helper(ast, "SS7_GENERIC_DIGTYPE");