From owner-svn-src-stable-7@FreeBSD.ORG  Mon Sep  5 17:45:24 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 903D6106566B;
	Mon,  5 Sep 2011 17:45:24 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 656008FC08;
	Mon,  5 Sep 2011 17:45:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p85HjOQ8047683;
	Mon, 5 Sep 2011 17:45:24 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p85HjOhq047680;
	Mon, 5 Sep 2011 17:45:24 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201109051745.p85HjOhq047680@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 5 Sep 2011 17:45:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225404 - in stable/7/tools/tools/netrate: netblast
	netsend
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Sep 2011 17:45:24 -0000

Author: marius
Date: Mon Sep  5 17:45:24 2011
New Revision: 225404
URL: http://svn.freebsd.org/changeset/base/225404

Log:
  MFC: r225334
  
  Fix alignment assumptions.
  
  PR:		160289

Modified:
  stable/7/tools/tools/netrate/netblast/netblast.c
  stable/7/tools/tools/netrate/netsend/netsend.c
Directory Properties:
  stable/7/tools/tools/netrate/netblast/   (props changed)
  stable/7/tools/tools/netrate/netsend/   (props changed)

Modified: stable/7/tools/tools/netrate/netblast/netblast.c
==============================================================================
--- stable/7/tools/tools/netrate/netblast/netblast.c	Mon Sep  5 17:45:22 2011	(r225403)
+++ stable/7/tools/tools/netrate/netblast/netblast.c	Mon Sep  5 17:45:24 2011	(r225404)
@@ -26,6 +26,7 @@
  * $FreeBSD$
  */
 
+#include <sys/endian.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -108,11 +109,9 @@ blast_loop(int s, long duration, u_char 
 		 * previous send, the error will turn up the current send
 		 * operation, causing the current sequence number also to be
 		 * skipped.
-		 *
-		 * XXXRW: Note alignment assumption.
 		 */
 		if (packet_len >= 4) {
-			*((u_int32_t *)packet) = htonl(counter);
+			be32enc(packet, counter);
 			counter++;
 		}
 		if (send(s, packet, packet_len, 0) < 0)

Modified: stable/7/tools/tools/netrate/netsend/netsend.c
==============================================================================
--- stable/7/tools/tools/netrate/netsend/netsend.c	Mon Sep  5 17:45:22 2011	(r225403)
+++ stable/7/tools/tools/netrate/netsend/netsend.c	Mon Sep  5 17:45:24 2011	(r225404)
@@ -26,6 +26,7 @@
  * $FreeBSD$
  */
 
+#include <sys/endian.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -203,11 +204,9 @@ timing_loop(struct _a *a)
 		 * skipped.
 		 * The counter is incremented only on the initial port number,
 		 * so all destinations will see the same set of packets.
-		 *
-		 * XXXRW: Note alignment assumption.
 		 */
 		if (cur_port == a->port && a->packet_len >= 4) {
-			*((u_int32_t *)a->packet) = htonl(counter);
+			be32enc(a->packet, counter);
 			counter++;
 		}
 		if (a->port == a->port_max) { /* socket already bound */