Get rid of the multiple-include protection in our RPC headers, so we

include them even if we also happen to have included system RPC headers,
as we want *our* versions of the structures (which use types with
explicit sizes for structure members, as we use them for on-the-wire
data).

Change pmap_prot.h to prefix all #defines and structure names with
"SUNRPC_" or "sunrpc_", to avoid collisions with any definitions and
structure names from the system header files.

4 files changed, 28 insertions, 46 deletions

diff --git a/pmap_prot.h b/pmap_prot.h
index 2f7fc7cd..67ad6262 100644
--- a/pmap_prot.h
+++ b/pmap_prot.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/pmap_prot.h,v 1.2 2005-04-07 01:27:52 mcr Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/pmap_prot.h,v 1.3 2005-04-27 21:43:48 guy Exp $ (LBL) */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -69,29 +69,21 @@
  * The service supports remote procedure calls on udp/ip or tcp/ip socket 111.
  */
 
-#if !defined(_RPC_PMAP_PROT_H_) && !defined(_RPC_PMAPPROT_H)
+#define SUNRPC_PMAPPORT		((u_int16_t)111)
+#define SUNRPC_PMAPPROG		((u_int32_t)100000)
+#define SUNRPC_PMAPVERS		((u_int32_t)2)
+#define SUNRPC_PMAPVERS_PROTO	((u_int32_t)2)
+#define SUNRPC_PMAPVERS_ORIG	((u_int32_t)1)
+#define SUNRPC_PMAPPROC_NULL	((u_int32_t)0)
+#define SUNRPC_PMAPPROC_SET	((u_int32_t)1)
+#define SUNRPC_PMAPPROC_UNSET	((u_int32_t)2)
+#define SUNRPC_PMAPPROC_GETPORT	((u_int32_t)3)
+#define SUNRPC_PMAPPROC_DUMP	((u_int32_t)4)
+#define SUNRPC_PMAPPROC_CALLIT	((u_int32_t)5)
 
-/* two defines, for NetBSD and FreeBSD */
-#define _RPC_PMAP_PROT_H_
-#define _RPC_PMAPPROT_H
-
-#define PMAPPORT		((u_int16_t)111)
-#define PMAPPROG		((u_int32_t)100000)
-#define PMAPVERS		((u_int32_t)2)
-#define PMAPVERS_PROTO		((u_int32_t)2)
-#define PMAPVERS_ORIG		((u_int32_t)1)
-#define PMAPPROC_NULL		((u_int32_t)0)
-#define PMAPPROC_SET		((u_int32_t)1)
-#define PMAPPROC_UNSET		((u_int32_t)2)
-#define PMAPPROC_GETPORT	((u_int32_t)3)
-#define PMAPPROC_DUMP		((u_int32_t)4)
-#define PMAPPROC_CALLIT		((u_int32_t)5)
-
-struct pmap {
+struct sunrpc_pmap {
 	u_int32_t pm_prog;
 	u_int32_t pm_vers;
 	u_int32_t pm_prot;
 	u_int32_t pm_port;
 };
-
-#endif /* !_RPC_PMAPPROT_H */
diff --git a/print-sunrpc.c b/print-sunrpc.c
index 58e6112a..bfb2fe9a 100644
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.46 2004-12-27 00:41:31 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.47 2005-04-27 21:43:48 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -54,13 +54,13 @@ static const char rcsid[] _U_ =
 #include "pmap_prot.h"
 
 static struct tok proc2str[] = {
-	{ PMAPPROC_NULL,	"null" },
-	{ PMAPPROC_SET,		"set" },
-	{ PMAPPROC_UNSET,	"unset" },
-	{ PMAPPROC_GETPORT,	"getport" },
-	{ PMAPPROC_DUMP,	"dump" },
-	{ PMAPPROC_CALLIT,	"call" },
-	{ 0,			NULL }
+	{ SUNRPC_PMAPPROC_NULL,		"null" },
+	{ SUNRPC_PMAPPROC_SET,		"set" },
+	{ SUNRPC_PMAPPROC_UNSET,	"unset" },
+	{ SUNRPC_PMAPPROC_GETPORT,	"getport" },
+	{ SUNRPC_PMAPPROC_DUMP,		"dump" },
+	{ SUNRPC_PMAPPROC_CALLIT,	"call" },
+	{ 0,				NULL }
 };
 
 /* Forwards */
@@ -87,7 +87,7 @@ sunrpcrequest_print(register const u_char *bp, register u_int length,
 	} else {
 		snprintf(srcid, sizeof(srcid), "0x%x",
 		    EXTRACT_32BITS(&rp->rm_xid));
-		snprintf(dstid, sizeof(dstid), "0x%x", PMAPPORT);
+		snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
 	}
 
 	switch (IP_V((struct ip *)bp2)) {
@@ -118,10 +118,10 @@ sunrpcrequest_print(register const u_char *bp, register u_int length,
 
 	switch (EXTRACT_32BITS(&rp->rm_call.cb_proc)) {
 
-	case PMAPPROC_SET:
-	case PMAPPROC_UNSET:
-	case PMAPPROC_GETPORT:
-	case PMAPPROC_CALLIT:
+	case SUNRPC_PMAPPROC_SET:
+	case SUNRPC_PMAPPROC_UNSET:
+	case SUNRPC_PMAPPROC_GETPORT:
+	case SUNRPC_PMAPPROC_CALLIT:
 		x = EXTRACT_32BITS(&rp->rm_call.cb_prog);
 		if (!nflag)
 			printf(" %s", progstr(x));
diff --git a/rpc_auth.h b/rpc_auth.h
index 902998ee..fe9a40b2 100644
--- a/rpc_auth.h
+++ b/rpc_auth.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/rpc_auth.h,v 1.1 2004-12-27 00:41:32 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/rpc_auth.h,v 1.2 2005-04-27 21:43:48 guy Exp $ (LBL) */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -42,9 +42,6 @@
  * "sessions".
  */
 
-#ifndef __RPC_AUTH_H_
-#define __RPC_AUTH_H_
-
 /*
  * Status returned from authentication check
  */
@@ -80,5 +77,3 @@ struct sunrpc_opaque_auth {
 #define	SUNRPC_AUTH_SYS		1	/* forward compatibility */
 #define	SUNRPC_AUTH_SHORT	2	/* short hand unix style */
 #define SUNRPC_AUTH_DES		3	/* des style (encrypted timestamps) */
-
-#endif /* !__RPC_AUTH_H_ */
diff --git a/rpc_msg.h b/rpc_msg.h
index fda52fe8..3e79ac71 100644
--- a/rpc_msg.h
+++ b/rpc_msg.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/rpc_msg.h,v 1.1 2004-12-27 00:41:32 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/rpc_msg.h,v 1.2 2005-04-27 21:43:48 guy Exp $ (LBL) */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -39,9 +39,6 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#ifndef __RPC_MSG_H_
-#define __RPC_MSG_H_
-
 #define SUNRPC_MSG_VERSION	((u_int32_t) 2)
 
 /*
@@ -129,5 +126,3 @@ struct sunrpc_msg {
 };
 #define	acpted_rply	ru.RM_rmb.ru.RP_ar
 #define	rjcted_rply	ru.RM_rmb.ru.RP_dr
-
-#endif /* !__RPC_MSG_H_ */