From owner-svn-src-projects@FreeBSD.ORG  Thu Aug 12 20:03:31 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86137106566C;
	Thu, 12 Aug 2010 20:03:31 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 75CBB8FC1C;
	Thu, 12 Aug 2010 20:03:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7CK3VVl080595;
	Thu, 12 Aug 2010 20:03:31 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7CK3Vr5080593;
	Thu, 12 Aug 2010 20:03:31 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201008122003.o7CK3Vr5080593@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 12 Aug 2010 20:03:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211237 - projects/sv/usr.sbin/netdumpsrv
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Aug 2010 20:03:31 -0000

Author: attilio
Date: Thu Aug 12 20:03:31 2010
New Revision: 211237
URL: http://svn.freebsd.org/changeset/base/211237

Log:
  Avoid use of bogus ntohll().

Modified:
  projects/sv/usr.sbin/netdumpsrv/netdump_server.c

Modified: projects/sv/usr.sbin/netdumpsrv/netdump_server.c
==============================================================================
--- projects/sv/usr.sbin/netdumpsrv/netdump_server.c	Thu Aug 12 19:50:40 2010	(r211236)
+++ projects/sv/usr.sbin/netdumpsrv/netdump_server.c	Thu Aug 12 20:03:31 2010	(r211237)
@@ -37,6 +37,7 @@
 #include <arpa/inet.h>
 #include <sys/param.h>
 #include <sys/socket.h>
+#include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <sys/errno.h>
@@ -516,7 +517,7 @@ int receive_message(int sock, struct soc
     /* Convert byte order */
     msg->hdr.type = ntohl(msg->hdr.type);
     msg->hdr.seqno = ntohl(msg->hdr.seqno);
-    msg->hdr.offset = ntohll(msg->hdr.offset);
+    msg->hdr.offset = be64toh(msg->hdr.offset);
     msg->hdr.len = ntohl(msg->hdr.len);
 
     if ((size_t)len < sizeof(struct netdump_msg_hdr) + msg->hdr.len)