From fcc82f451d3e51fdf636abbf927edb287bada0e0 Mon Sep 17 00:00:00 2001
From: guy <guy>
Date: Wed, 11 Dec 2002 07:13:49 +0000
Subject: The "__attribute__((packed))" tag on structures causes some files not
 to compile with Sun C, as "interface.h" isn't being included before the
 structures are being declared.

Furthermore, in the files that Sun C *can* compile, it doesn't cause Sun
C to generate code that's safe with unaligned accesses, as
"__attribute__" is defined as a do-nothing macro with compilers that
don't support it.

Therefore, we get rid of that tag on the structures to which it was
added, and instead use "EXTRACT_16BIT()" and "EXTRACT_32BIT()" to fetch
16-bit and 32-bit big-endian quantities from packets.  We also fix some
other references to multi-byte quantities to get rid of code that tries
to do unaligned loads on platforms that don't support them.

We also throw in a hack that makes those macros use
"__attribute__((packed))" on structures containing only one 16-bit or
32-bit integer to get the compiler to generate unaligned-safe code
rather than doing it by hand.  (GCC on SPARC produces the same code that
doing it by hand does; I don't know if GCC on any other big-endian
strict-alignment processor generates better code for that case.  On
little-endian processors, as "ntohs()" and "ntohl()" might be functions,
that might actually produce worse code.)

Fix some places to use "%u" rather than "%d" to print unsigned
quantities.
---
 print-sunrpc.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'print-sunrpc.c')

diff --git a/print-sunrpc.c b/print-sunrpc.c
index b4257cfa..83a73f11 100644
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.42 2002-09-05 00:00:22 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.43 2002-12-11 07:14:09 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -43,6 +43,7 @@ static const char rcsid[] =
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
 
 #include "ip.h"
 #ifdef INET6
@@ -78,11 +79,11 @@ sunrpcrequest_print(register const u_char *bp, register u_int length,
 
 	if (!nflag) {
 		snprintf(srcid, sizeof(srcid), "0x%x",
-		    (u_int32_t)ntohl(rp->rm_xid));
+		    EXTRACT_32BITS(&rp->rm_xid));
 		strlcpy(dstid, "sunrpc", sizeof(dstid));
 	} else {
 		snprintf(srcid, sizeof(srcid), "0x%x",
-		    (u_int32_t)ntohl(rp->rm_xid));
+		    EXTRACT_32BITS(&rp->rm_xid));
 		snprintf(dstid, sizeof(dstid), "0x%x", PMAPPORT);
 	}
 
@@ -107,23 +108,23 @@ sunrpcrequest_print(register const u_char *bp, register u_int length,
 	}
 
 	printf(" %s", tok2str(proc2str, " proc #%u",
-	    (u_int32_t)ntohl(rp->rm_call.cb_proc)));
-	x = ntohl(rp->rm_call.cb_rpcvers);
+	    EXTRACT_32BITS(&rp->rm_call.cb_proc)));
+	x = EXTRACT_32BITS(&rp->rm_call.cb_rpcvers);
 	if (x != 2)
 		printf(" [rpcver %u]", x);
 
-	switch (ntohl(rp->rm_call.cb_proc)) {
+	switch (EXTRACT_32BITS(&rp->rm_call.cb_proc)) {
 
 	case PMAPPROC_SET:
 	case PMAPPROC_UNSET:
 	case PMAPPROC_GETPORT:
 	case PMAPPROC_CALLIT:
-		x = ntohl(rp->rm_call.cb_prog);
+		x = EXTRACT_32BITS(&rp->rm_call.cb_prog);
 		if (!nflag)
 			printf(" %s", progstr(x));
 		else
 			printf(" %u", x);
-		printf(".%u", (u_int32_t)ntohl(rp->rm_call.cb_vers));
+		printf(".%u", EXTRACT_32BITS(&rp->rm_call.cb_vers));
 		break;
 	}
 }
-- 
cgit v1.2.1