From 0948636930ac613526984224bd0d562f4bad4525 Mon Sep 17 00:00:00 2001
From: Marco Capetta <mcapetta@sipwise.com>
Date: Thu, 14 Jun 2018 15:26:14 +0200
Subject: [PATCH] TT#38155 Add tcap_extract_var function to tcap module

The function is necessary to extract the FCI code from the
variable instead of reading it from the SIP message.

Change-Id: If8a19d205e1ccad64e44cfa75501daa672165a59
---
 debian/patches/series                         |  1 +
 .../sipwise/tcap_add_tcap_var_extract.patch   | 89 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 debian/patches/sipwise/tcap_add_tcap_var_extract.patch

diff --git a/debian/patches/series b/debian/patches/series
index 7201694cc..eeb20a07e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,6 +33,7 @@ sipwise/fix_db_redis_time_schema.patch
 sipwise/fix_db_redis_free_memory.patch
 sipwise/fix_db_redis_memory_issues.patch
 sipwise/rtpengine-balancing.patch
+sipwise/tcap_add_tcap_var_extract.patch
 # backport from kamailio 5.1.3
 sipwise/0001-topos-reuse-uuid-for-requests-withing-dialog.patch
 sipwise/0002-core-improve-to-header-check-guards-str-consists-of-.patch
diff --git a/debian/patches/sipwise/tcap_add_tcap_var_extract.patch b/debian/patches/sipwise/tcap_add_tcap_var_extract.patch
new file mode 100644
index 000000000..807012e1e
--- /dev/null
+++ b/debian/patches/sipwise/tcap_add_tcap_var_extract.patch
@@ -0,0 +1,89 @@
+--- a/src/modules/tcap/tcap_mod.c
++++ b/src/modules/tcap/tcap_mod.c
+@@ -20,6 +20,7 @@ static int strip_trailing_crlf;
+ 
+ static int mod_init(void);
+ static int tcap_extract_f(sip_msg_t *msg, char *su, char *sq);
++static int tcap_extract_var_f(sip_msg_t *msg, char *o, char *f, char *d);
+ static int inap_extract_f(sip_msg_t *msg, char *su, char *sq);
+ static int inap_extract_var_f(sip_msg_t *msg, char *o, char *f, char *d);
+ static int isup_decode_number_f(sip_msg_t *msg, char *su, char *sq);
+@@ -30,6 +31,8 @@ static int isup_decode_number_hex_f(sip_
+ static cmd_export_t cmds[] = {
+ 	{"tcap_extract", (cmd_function)tcap_extract_f, 2,
+ 		fixup_spve_str, 0, ANY_ROUTE},
++	{"tcap_extract_var", (cmd_function)tcap_extract_var_f, 3,
++		fixup_pvar_pvar_pvar, fixup_free_pvar_pvar_pvar, ANY_ROUTE},
+ 	{"inap_extract", (cmd_function)inap_extract_f, 2,
+ 		fixup_spve_str, 0, ANY_ROUTE},
+ 	{"inap_extract_var", (cmd_function)inap_extract_var_f, 3,
+@@ -234,6 +237,69 @@ static int _tcap_decode_hexa(str *in, ch
+ 	return i;
+ }
+ 
++static int tcap_extract_var_f(sip_msg_t *msg, char *pv_orig, char *pv_field,
++	char *pv_dest)
++{
++	const char *err;
++	char *bin;
++	int bin_len;
++	static char buf[1024];
++	static char cfield[512];
++	struct output_buffer out;
++	pv_spec_p orig_spec = (pv_spec_t *) pv_orig;
++	pv_spec_p field_spec = (pv_spec_t *) pv_field;
++	pv_spec_p dest_spec = (pv_spec_t *) pv_dest;
++	pv_value_t tcap, field, dest;
++
++	err = "Can't get tcap PV value";
++	if (pv_get_spec_value(msg, orig_spec, &tcap) != 0)
++		goto error;
++
++	err = "orig has to be a string";
++	if(!(tcap.flags&PV_VAL_STR))
++		goto error;
++
++	err = "Can't get field PV value";
++	if (pv_get_spec_value(msg, field_spec, &field) != 0)
++		goto error;
++
++	err = "field has to be a string";
++	if (!(field.flags&PV_VAL_STR))
++		goto error;
++
++	err = "field is too big for internal buffer";
++	if (field.rs.len > 512)
++		goto error;
++	strncpy(cfield, field.rs.s, field.rs.len);
++	cfield[field.rs.len] = '\0';
++
++	err = "Can't decode.hexa";
++	bin_len = _tcap_decode_hexa(&(tcap.rs), &bin);
++	if(bin<=0)
++		goto error;
++
++	OUTPUT_BUFFER_INIT(&out, buf);
++	LM_DBG("tcap:[%.*s][%d] bin:[%.*s] field:[%s]\n", tcap.rs.len, tcap.rs.s,
++		tcap.rs.len, bin_len, bin, cfield);
++
++	err = "Error parsing TCAP body";
++	if (tcap_extract(bin, bin_len, cfield, &out)<0)
++		goto error;
++
++	memset(&dest, 0, sizeof(pv_value_t));
++	dest.flags = PV_VAL_STR;
++	dest.rs.s = out.buf;
++	dest.rs.len = out.used;
++	err = "Failed to set return value";
++	if(pv_set_spec_value(msg, dest_spec, 0, &dest)<0)
++		goto error;
++
++	return 1;
++error:
++	LM_ERR("%s\n", err);
++	return -1;
++}
++
+ static int inap_extract_var_f(sip_msg_t *msg, char *pv_orig, char *pv_field,
+ 	char *pv_dest)
+ {