Fix alignment assumptions.

PR:		160289
Approved by:	re (kib)
MFC after:	3 days
This commit is contained in:
Marius Strobl 2011-09-02 16:40:18 +00:00
parent 2e5df98a18
commit 7493181297
2 changed files with 4 additions and 6 deletions

View File

@ -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 *packet, u_int packet_len)
* 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)

View File

@ -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 */