From 78f7235d04576901768ae4f212312a8c88e6f129 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 28 Mar 2006 18:00:05 +0000
Subject: [PATCH] store f->callno in a local var (issue #6818)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@15619 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_iax2.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 911b8872e7..0ff1c35242 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1607,28 +1607,30 @@ static int send_packet(struct iax_frame *f)
{
int res;
char iabuf[INET_ADDRSTRLEN];
+ int callno = f->callno;
+
/* Called with iaxsl held */
if (option_debug > 2 && iaxdebug)
- ast_log(LOG_DEBUG, "Sending %d on %d/%d to %s:%d\n", f->ts, f->callno, iaxs[f->callno]->peercallno, ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[f->callno]->addr.sin_addr), ntohs(iaxs[f->callno]->addr.sin_port));
+ ast_log(LOG_DEBUG, "Sending %d on %d/%d to %s:%d\n", f->ts, callno, iaxs[callno]->peercallno, ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[callno]->addr.sin_addr), ntohs(iaxs[callno]->addr.sin_port));
/* Don't send if there was an error, but return error instead */
- if (!f->callno) {
- ast_log(LOG_WARNING, "Call number = %d\n", f->callno);
+ if (!callno) {
+ ast_log(LOG_WARNING, "Call number = %d\n", callno);
return -1;
}
- if (!iaxs[f->callno])
+ if (!iaxs[callno])
return -1;
- if (iaxs[f->callno]->error)
+ if (iaxs[callno]->error)
return -1;
if (f->transfer) {
if (iaxdebug)
- iax_showframe(f, NULL, 0, &iaxs[f->callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr));
- res = sendto(iaxs[f->callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[f->callno]->transfer,
- sizeof(iaxs[f->callno]->transfer));
+ iax_showframe(f, NULL, 0, &iaxs[callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr));
+ res = sendto(iaxs[callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[callno]->transfer,
+ sizeof(iaxs[callno]->transfer));
} else {
if (iaxdebug)
- iax_showframe(f, NULL, 0, &iaxs[f->callno]->addr, f->datalen - sizeof(struct ast_iax2_full_hdr));
- res = sendto(iaxs[f->callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[f->callno]->addr,
- sizeof(iaxs[f->callno]->addr));
+ iax_showframe(f, NULL, 0, &iaxs[callno]->addr, f->datalen - sizeof(struct ast_iax2_full_hdr));
+ res = sendto(iaxs[callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[callno]->addr,
+ sizeof(iaxs[callno]->addr));
}
if (res < 0) {
if (option_debug && iaxdebug)
--
GitLab