From 4612b4cccaa154932dc44586a5237eadd2b07e4c Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 21 Nov 2005 13:17:32 +0000 Subject: [PATCH] issue #5815 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7167 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- ChangeLog | 4 ++++ channels/chan_iax2.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f5a1369a1e..535110285e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-21 Russell Bryant + + * channels/chan_iax2.c (iax2_getpeername): Return non-zero to indicate that a peer was found when using realtime (issue #5815) + 2005-11-20 Russell Bryant * Makefile apps/Makefile: Fix 'make install' for Solaris. (issue #5775) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c051330a6f..0c4a8b9584 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -859,10 +859,11 @@ static int iax2_getpeername(struct sockaddr_in sin, char *host, int len, int loc { struct iax2_peer *peer; int res = 0; + if (lockpeer) ast_mutex_lock(&peerl.lock); peer = peerl.peers; - while(peer) { + while (peer) { if ((peer->addr.sin_addr.s_addr == sin.sin_addr.s_addr) && (peer->addr.sin_port == sin.sin_port)) { ast_copy_string(host, peer->name, len); @@ -879,8 +880,10 @@ static int iax2_getpeername(struct sockaddr_in sin, char *host, int len, int loc ast_copy_string(host, peer->name, len); if (ast_test_flag(peer, IAX_TEMPONLY)) destroy_peer(peer); + res = 1; } } + return res; }