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 39cbdb0e996706561f2480e6ef0a86aa338bafb7..5d58220b390feefb0e6e241aa7e02652533cd7fc 100644 (file)
--- 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 */