summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2006-03-20 17:39:14 +0000
committerOlle Johansson <oej@edvina.net>2006-03-20 17:39:14 +0000
commit3cb576801616a22ef57ae3402cab69e33791fd70 (patch)
treee394dfbdfacd7611fbf57fa0fa4009ea03e42a33
parenta0800bd179ba255c8602e98f20f09ac5a42f1f1a (diff)
Don't overwrite ANI if it's already sent with IES (imported from 1.2 branch)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_iax2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1b16fb977..b312d8599 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5037,7 +5037,8 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
ast_copy_string(iaxs[callno]->cid_name, user->cid_name, sizeof(iaxs[callno]->cid_name));
iaxs[callno]->calling_pres = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN;
}
- ast_copy_string(iaxs[callno]->ani, user->cid_num, sizeof(iaxs[callno]->ani));
+ if (ast_strlen_zero(iaxs[callno]->ani))
+ ast_copy_string(iaxs[callno]->ani, user->cid_num, sizeof(iaxs[callno]->ani));
} else {
iaxs[callno]->calling_pres = AST_PRES_NUMBER_NOT_AVAILABLE;
}