From 3f54af689f35faf691cde8ff1d92479c4bcf259e Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Wed, 8 Apr 2015 12:02:37 +0000
Subject: [PATCH] chan_iax2: Fix compilation issue due to funky merge
Don't mix declarations and code!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@434294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_iax2.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index f56d84e3a6..b27b8134aa 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -12350,14 +12350,15 @@ static int iax2_poke_peer(struct iax2_peer *peer, int heldcall)
/* And send the poke */
ast_mutex_lock(&iaxsl[callno]);
if (iaxs[callno]) {
- /* Speed up retransmission times for this qualify call */
- iaxs[callno]->pingtime = peer->maxms / 4 + 1;
- iaxs[callno]->peerpoke = peer;
-
struct iax_ie_data ied = {
.buf = { 0 },
.pos = 0,
};
+
+ /* Speed up retransmission times for this qualify call */
+ iaxs[callno]->pingtime = peer->maxms / 4 + 1;
+ iaxs[callno]->peerpoke = peer;
+
add_empty_calltoken_ie(iaxs[callno], &ied); /* this _MUST_ be the last ie added */
send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_POKE, 0, ied.buf, ied.pos, -1);
}
--
GitLab