asterisk-1.6.2.6-2来电显示的bug修复以及asterisk-1.6.2.6-2 rpm重新打包

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
70
71
72
73
74
75
76
Index: channels/chan_dahdi.c
===================================================================
--- channels/chan_dahdi.c	(revision 256319)
+++ channels/chan_dahdi.c	(working copy)
@@ -4330,11 +4330,20 @@
idx = dahdi_get_index(ast, p, 1);
-	if ((p->sig == SIG_PRI) || (p->sig == SIG_SS7) || (p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP)) {
+	switch (p->sig) {
+	case SIG_PRI:
+	case SIG_BRI:
+	case SIG_BRI_PTMP:
+	case SIG_SS7:
x = 1;
ast_channel_setoption(ast,AST_OPTION_AUDIO_MODE,&x,sizeof(char),0);
+
/* Fall through */
+	case SIG_MFCR2:
p->cid_num[0] = '';
p->cid_name[0] = '';
+
break;
+	default:
+
break;
}
x = 0;
@@ -4529,8 +4538,6 @@
}
#endif
#ifdef HAVE_OPENR2
-
p->cid_num[0] = '';
-
p->cid_name[0] = '';
if (p->mfcr2 && p->mfcr2call && openr2_chan_get_direction(p->r2chan) != OR2_DIR_STOPPED) {
ast_log(LOG_DEBUG, "disconnecting MFC/R2 call on chan %dn", p->channel);
/* If it's an incoming call, check the mfcr2_forced_release setting */
@@ -10503,12 +10510,19 @@
ast_copy_string(tmp->context, conf->chan.context, sizeof(tmp->context));
ast_copy_string(tmp->parkinglot, conf->chan.parkinglot, sizeof(tmp->parkinglot));
tmp->cid_ton = 0;
-
if ((tmp->sig != SIG_PRI) || (tmp->sig != SIG_SS7) || (tmp->sig != SIG_BRI) || (tmp->sig != SIG_BRI_PTMP) || (tmp->sig != SIG_MFCR2)) {
+
switch (tmp->sig) {
+
case SIG_PRI:
+
case SIG_BRI:
+
case SIG_BRI_PTMP:
+
case SIG_SS7:
+
case SIG_MFCR2:
+
tmp->cid_num[0] = '';
+
tmp->cid_name[0] = '';
+
break;
+
default:
ast_copy_string(tmp->cid_num, conf->chan.cid_num, sizeof(tmp->cid_num));
ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name));
-
} else {
-
tmp->cid_num[0] = '';
-
tmp->cid_name[0] = '';
+
break;
}
ast_copy_string(tmp->mailbox, conf->chan.mailbox, sizeof(tmp->mailbox));
if (channel != CHAN_PSEUDO && !ast_strlen_zero(tmp->mailbox)) {