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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1b16fb97705dd700519763b2575d79537460cdd0..b312d85994c2ba829b64a551b2aa857602a3da15 100644 (file)
--- 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;
                }