From: David Vossel <dvossel@digium.com>
Date: Fri, 19 Jun 2009 20:26:57 +0000 (+0000)
Subject: Merged revisions 201994 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e9d5788e8bd29493032e486d8df3cb288ed0664;p=thirdparty%2Fasterisk.git

Merged revisions 201994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201994 | dvossel | 2009-06-19 15:24:37 -0500 (Fri, 19 Jun 2009) | 14 lines

  Merged revisions 201993 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r201993 | dvossel | 2009-06-19 15:22:02 -0500 (Fri, 19 Jun 2009) | 8 lines

    timestamp was being converted to host order as a short rather than a long

    (closes issue #15361)
    Reported by: ffloimair
    Patches:
          ts_issue.diff uploaded by dvossel (license 671)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@201996 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 39cbdb0e99..5d58220b39 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -8354,7 +8354,7 @@ static int socket_process(struct iax2_thread *thread)
 		/* Deal with POKE/PONG without allocating a callno */
 		if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) {
 			/* Reply back with a PONG, but don't care about the result. */
-			send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->iseqno + 1);
+			send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohl(fh->ts), fh->iseqno + 1);
 			return 1;
 		} else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) {
 			/* Ignore */