From 18f4324baf8e9ded5196bf3e864d41a5492719d1 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sun, 12 Nov 2006 06:09:03 +0000 Subject: [PATCH] Only do the check to determine whether the channel calling this function is an IAX2 channel when getting the IP address using the special argument, CURRENTCHANNEL. (issue #8341, jcovert) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@47496 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 5e4648f377..5be2e08f98 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -9347,9 +9347,6 @@ static char *function_iaxpeer(struct ast_channel *chan, char *cmd, char *data, c buf[0] = '\0'; - if (chan->tech != &iax2_tech) - return buf; - if (!(peername = ast_strdupa(data))) { ast_log(LOG_ERROR, "Memory Error!\n"); return ret; @@ -9357,7 +9354,10 @@ static char *function_iaxpeer(struct ast_channel *chan, char *cmd, char *data, c /* if our channel, return the IP address of the endpoint of current channel */ if (!strcmp(peername,"CURRENTCHANNEL")) { - unsigned short callno = PTR_TO_CALLNO(chan->tech_pvt); + unsigned short callno; + if (chan->tech != &iax2_tech) + return buf; + callno = PTR_TO_CALLNO(chan->tech_pvt); ast_copy_string(buf, iaxs[callno]->addr.sin_addr.s_addr ? ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[callno]->addr.sin_addr) : "", len); return buf; } -- 2.47.2