1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
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
|
GitWeb
