kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-22 05:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@94244 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2007-12-20 17:58:00 +00:00
parent 690182f8b9
commit 78a7859692
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_iax2.c
View File

@@ -2629,7 +2629,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
if (peername) { if (peername) {
var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL); var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL);
if (!var) if (!var && sin)
var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr)); var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
} else if (sin) { } else if (sin) {
char porta[25]; char porta[25];
@@ -2646,7 +2646,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
} }
} }
} }
if (!var) { /* Last ditch effort */ if (!var && peername) { /* Last ditch effort */
var = ast_load_realtime("iaxpeers", "name", peername, NULL); var = ast_load_realtime("iaxpeers", "name", peername, NULL);
/*!\note /*!\note
* If this one loaded something, then we need to ensure that the host * If this one loaded something, then we need to ensure that the host