This commit was generated by cvs2svn to compensate for changes in r75115,

which included commits to RCS files with non-trunk default branches.

1 files changed, 17 insertions, 20 deletions

diff --git a/contrib/tcpdump/igrp.h b/contrib/tcpdump/igrp.h
index 1d84b54..f94ba3f 100644
--- a/contrib/tcpdump/igrp.h
+++ b/contrib/tcpdump/igrp.h
@@ -1,21 +1,18 @@
+/* @(#) $Header: /tcpdump/master/tcpdump/igrp.h,v 1.4 2000/12/17 23:07:49 guy Exp $ (LBL) */
 /* Cisco IGRP definitions */
 
 /* IGRP Header */
 
 struct igrphdr {
-#ifdef WORDS_BIGENDIAN
-	u_int ig_v:4;		/* protocol version number */
-	u_int ig_op:4;		/* opcode */
-#else
-	u_int ig_op:4;		/* opcode */
-	u_int ig_v:4;		/* protocol version number */
-#endif
-	u_char ig_ed;		/* edition number */
-	u_short ig_as;		/* autonomous system number */
-	u_short ig_ni;		/* number of subnet in local net */
-	u_short ig_ns;		/* number of networks in AS */
-	u_short ig_nx;		/* number of networks ouside AS */
-	u_short ig_sum;		/* checksum of IGRP header & data */
+	u_int8_t ig_vop;	/* protocol version number / opcode */
+#define IGRP_V(x)	(((x) & 0xf0) >> 4)
+#define IGRP_OP(x)	((x) & 0x0f)
+	u_int8_t ig_ed;		/* edition number */
+	u_int16_t ig_as;	/* autonomous system number */
+	u_int16_t ig_ni;	/* number of subnet in local net */
+	u_int16_t ig_ns;	/* number of networks in AS */
+	u_int16_t ig_nx;	/* number of networks ouside AS */
+	u_int16_t ig_sum;	/* checksum of IGRP header & data */
 };
 
 #define IGRP_UPDATE	1
@@ -24,13 +21,13 @@ struct igrphdr {
 /* IGRP routing entry */
 
 struct igrprte {
-	u_char igr_net[3];	/* 3 significant octets of IP address */
-	u_char igr_dly[3];	/* delay in tens of microseconds */
-	u_char igr_bw[3];	/* bandwidth in units of 1 kb/s */
-	u_char igr_mtu[2];	/* MTU in octets */
-	u_char igr_rel;		/* percent packets successfully tx/rx */
-	u_char igr_ld;		/* percent of channel occupied */
-	u_char igr_hct;		/* hop count */
+	u_int8_t igr_net[3];	/* 3 significant octets of IP address */
+	u_int8_t igr_dly[3];	/* delay in tens of microseconds */
+	u_int8_t igr_bw[3];	/* bandwidth in units of 1 kb/s */
+	u_int8_t igr_mtu[2];	/* MTU in octets */
+	u_int8_t igr_rel;	/* percent packets successfully tx/rx */
+	u_int8_t igr_ld;	/* percent of channel occupied */
+	u_int8_t igr_hct;	/* hop count */
 };
 
 #define IGRP_RTE_SIZE	14	/* don't believe sizeof ! */