summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/chan_ss7/files/chan_ss7-2.1.0-fix_cid.diff')
-rw-r--r--net-libs/chan_ss7/files/chan_ss7-2.1.0-fix_cid.diff69
1 files changed, 69 insertions, 0 deletions
diff --git a/net-libs/chan_ss7/files/chan_ss7-2.1.0-fix_cid.diff b/net-libs/chan_ss7/files/chan_ss7-2.1.0-fix_cid.diff
new file mode 100644
index 0000000..1caefc2
--- /dev/null
+++ b/net-libs/chan_ss7/files/chan_ss7-2.1.0-fix_cid.diff
@@ -0,0 +1,69 @@
+Index: Makefile
+===================================================================
+--- Makefile (revision 87)
++++ Makefile (revision 88)
+@@ -1,7 +1,7 @@
+ # INSTALL_PREFIX may be overridden to install elsewhere from /usr.
+ INSTALL_PREFIX = /usr/local/ss7
+
+-VERSION=2.1.0
++VERSION=2.1.1b
+
+ # INCLUDE may be overridden to find asterisk and zaptel includes in
+ # non-standard places.
+Index: l4isup.c
+===================================================================
+--- l4isup.c (revision 87)
++++ l4isup.c (revision 88)
+@@ -1830,11 +1830,11 @@
+ chan->cid.cid_dnid = strdup(iam->dni.num);
+ #else
+ if(iam->ani.present) {
+- chan->caller.id.number.str = strdup(iam->ani.num);
++ chan->connected.id.number.str = strdup(iam->ani.num);
+ if(iam->ani.restricted) {
+- chan->caller.id.number.presentation = AST_PRES_PROHIB_NETWORK_NUMBER;
++ chan->connected.id.number.presentation = AST_PRES_PROHIB_NETWORK_NUMBER;
+ } else {
+- chan->caller.id.number.presentation = AST_PRES_ALLOWED_NETWORK_NUMBER;
++ chan->connected.id.number.presentation = AST_PRES_ALLOWED_NETWORK_NUMBER;
+ }
+ }
+ /* ToDo: Handle screening. */
+@@ -2215,12 +2215,12 @@
+ }
+ res = isup_calling_party_num_encode(chan->cid.cid_num, pres_restr, 0x3 /* network provided */, param, sizeof(param));
+ #else
+- if((chan->caller.id.number.presentation & AST_PRES_RESTRICTION) == AST_PRES_RESTRICTED) {
++ if((chan->connected.id.number.presentation & AST_PRES_RESTRICTION) == AST_PRES_RESTRICTED) {
+ pres_restr = 1;
+ } else {
+ pres_restr = 0;
+ }
+- res = isup_calling_party_num_encode(chan->caller.id.number.str, pres_restr, 0x3 /* network provided */, param, sizeof(param));
++ res = isup_calling_party_num_encode(chan->connected.id.number.str, pres_restr, 0x3 /* network provided */, param, sizeof(param));
+ #endif
+ if(res < 0) {
+ ast_log(LOG_DEBUG, "Invalid format for calling number, dropped.\n");
+@@ -2291,7 +2291,7 @@
+ #if defined(USE_ASTERISK_1_2) || defined(USE_ASTERISK_1_4) || defined(USE_ASTERISK_1_6)
+ ast_verbose(VERBOSE_PREFIX_3 "Sent IAM CIC=%-3d ANI=%s DNI=%s RNI=%s\n", pvt->cic, pres_restr ? "*****" : chan->cid.cid_num, dni, rdni);
+ #else
+- ast_verbose(VERBOSE_PREFIX_3 "Sent IAM CIC=%-3d ANI=%s DNI=%s RNI=%s\n", pvt->cic, pres_restr ? "*****" : chan->caller.id.number.str, dni, rdni);
++ ast_verbose(VERBOSE_PREFIX_3 "Sent IAM CIC=%-3d ANI=%s DNI=%s RNI=%s\n", pvt->cic, pres_restr ? "*****" : chan->connected.id.number.str, dni, rdni);
+ #endif
+ return 0;
+ }
+@@ -2318,9 +2318,9 @@
+ #else
+ ast_log(LOG_DEBUG, "SS7 call, addr=%s, cid=%s(0x%x/%s) CIC=%d. linkset '%s'\n",
+ (addr ? addr : "<NULL>"),
+- (chan->caller.id.number.str ? chan->caller.id.number.str : "<NULL>"),
+- chan->caller.id.number.presentation,
+- ast_describe_caller_presentation(chan->caller.id.number.presentation),
++ (chan->connected.id.number.str ? chan->connected.id.number.str : "<NULL>"),
++ chan->connected.id.number.presentation,
++ ast_describe_caller_presentation(chan->connected.id.number.presentation),
+ pvt->cic, pvt->link->linkset->name);
+ #endif
+