kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-16 01:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 61863 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61863 | russell | 2007-04-25 16:13:15 -0500 (Wed, 25 Apr 2007) | 10 lines

Merged revisions 61862 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61862 | russell | 2007-04-25 16:06:22 -0500 (Wed, 25 Apr 2007) | 2 lines

Ensure that callerid settings are reset on a reload.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-04-25 21:15:19 +00:00
parent 8b2b3e172b
commit 891a005706
1 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
channels/chan_iax2.c
View File

@@ -8586,6 +8586,9 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st
peer->pokefreqnotok = DEFAULT_FREQ_NOTOK;
ast_string_field_set(peer,context,"");
ast_string_field_set(peer,peercontext,"");
ast_clear_flag(peer, IAX_HASCALLERID);
ast_string_field_set(peer, cid_name, "");
ast_string_field_set(peer, cid_num, "");
}
if (!v) {
@@ -8686,18 +8689,24 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st
} else if (!strcasecmp(v->name, "disallow")) {
ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 0);
} else if (!strcasecmp(v->name, "callerid")) {
char name2[80];
char num2[80];
ast_callerid_split(v->value, name2, 80, num2, 80);
ast_string_field_set(peer, cid_name, name2);
ast_string_field_set(peer, cid_num, num2);
ast_set_flag(peer, IAX_HASCALLERID);
if (!ast_strlen_zero(v->value)) {
char name2[80];
char num2[80];
ast_callerid_split(v->value, name2, 80, num2, 80);
ast_string_field_set(peer, cid_name, name2);
ast_string_field_set(peer, cid_num, num2);
ast_set_flag(peer, IAX_HASCALLERID);
}
} else if (!strcasecmp(v->name, "fullname")) {
ast_string_field_set(peer, cid_name, v->value);
ast_set_flag(peer, IAX_HASCALLERID);
if (!ast_strlen_zero(v->value)) {
ast_string_field_set(peer, cid_name, v->value);
ast_set_flag(peer, IAX_HASCALLERID);
}
} else if (!strcasecmp(v->name, "cid_number")) {
ast_string_field_set(peer, cid_num, v->value);
ast_set_flag(peer, IAX_HASCALLERID);
if (!ast_strlen_zero(v->value)) {
ast_string_field_set(peer, cid_num, v->value);
ast_set_flag(peer, IAX_HASCALLERID);
}
} else if (!strcasecmp(v->name, "sendani")) {
ast_set2_flag(peer, ast_true(v->value), IAX_SENDANI);
} else if (!strcasecmp(v->name, "inkeys")) {
@@ -8805,6 +8814,9 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, st
ast_string_field_set(user, name, name);
ast_string_field_set(user, language, language);
ast_copy_flags(user, &globalflags, IAX_USEJITTERBUF | IAX_FORCEJITTERBUF | IAX_CODEC_USER_FIRST | IAX_CODEC_NOPREFS | IAX_CODEC_NOCAP);
ast_clear_flag(user, IAX_HASCALLERID);
ast_string_field_set(user, cid_name, "");
ast_string_field_set(user, cid_num, "");
}
if (!v) {
v = alt;
@@ -8877,18 +8889,24 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, st
} else
ast_string_field_set(user, secret, v->value);
} else if (!strcasecmp(v->name, "callerid")) {
char name2[80];
char num2[80];
ast_callerid_split(v->value, name2, 80, num2, 80);
ast_string_field_set(user, cid_name, name2);
ast_string_field_set(user, cid_num, num2);
ast_set_flag(user, IAX_HASCALLERID);
if (!ast_strlen_zero(v->value) && strcasecmp(v->value, "asreceived")) {
char name2[80];
char num2[80];
ast_callerid_split(v->value, name2, sizeof(name2), num2, sizeof(num2));
ast_string_field_set(user, cid_name, name2);
ast_string_field_set(user, cid_num, num2);
ast_set_flag(user, IAX_HASCALLERID);
}
} else if (!strcasecmp(v->name, "fullname")) {
ast_string_field_set(user, cid_name, v->value);
ast_set_flag(user, IAX_HASCALLERID);
if (!ast_strlen_zero(v->value)) {
ast_string_field_set(user, cid_name, v->value);
ast_set_flag(user, IAX_HASCALLERID);
}
} else if (!strcasecmp(v->name, "cid_number")) {
ast_string_field_set(user, cid_num, v->value);
ast_set_flag(user, IAX_HASCALLERID);
if (!ast_strlen_zero(v->value)) {
ast_string_field_set(user, cid_num, v->value);
ast_set_flag(user, IAX_HASCALLERID);
}
} else if (!strcasecmp(v->name, "accountcode")) {
ast_string_field_set(user, accountcode, v->value);
} else if (!strcasecmp(v->name, "mohinterpret")) {