X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/10afb02ac804db7fa41a776fd61eff922c09c4df..6c8ef0eb86a39c277d1a43802dd8ea01b51cfb2a:/appletalk.h

diff --git a/appletalk.h b/appletalk.h
index 056be22f..3fbcbce0 100644
--- a/appletalk.h
+++ b/appletalk.h
@@ -19,15 +19,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * AppleTalk protocol formats (courtesy Bill Croft of Stanford/SUMEX).
- *
- * @(#) $Header: /tcpdump/master/tcpdump/appletalk.h,v 1.14 2002-11-09 17:19:17 itojun Exp $ (LBL)
  */
 
 struct LAP {
-	u_int8_t	dst;
-	u_int8_t	src;
-	u_int8_t	type;
-} __attribute__((packed));
+	uint8_t		dst;
+	uint8_t		src;
+	uint8_t		type;
+};
 #define lapShortDDP	1	/* short DDP type */
 #define lapDDP		2	/* DDP type */
 #define lapKLAP		'K'	/* Kinetics KLAP type */
@@ -35,23 +33,23 @@ struct LAP {
 /* Datagram Delivery Protocol */
 
 struct atDDP {
-	u_int16_t	length;
-	u_int16_t	checksum;
-	u_int16_t	dstNet;
-	u_int16_t	srcNet;
-	u_int8_t	dstNode;
-	u_int8_t	srcNode;
-	u_int8_t	dstSkt;
-	u_int8_t	srcSkt;
-	u_int8_t	type;
-} __attribute__((packed));
+	uint16_t	length;
+	uint16_t	checksum;
+	uint16_t	dstNet;
+	uint16_t	srcNet;
+	uint8_t		dstNode;
+	uint8_t		srcNode;
+	uint8_t		dstSkt;
+	uint8_t		srcSkt;
+	uint8_t		type;
+};
 
 struct atShortDDP {
-	u_int16_t	length;
-	u_int8_t	dstSkt;
-	u_int8_t	srcSkt;
-	u_int8_t	type;
-} __attribute__((packed));
+	uint16_t	length;
+	uint8_t		dstSkt;
+	uint8_t		srcSkt;
+	uint8_t		type;
+};
 
 #define	ddpMaxWKS	0x7F
 #define	ddpMaxData	586
@@ -67,17 +65,18 @@ struct atShortDDP {
 #define	ddpECHO		4	/* ECHO type */
 #define	ddpIP		22	/* IP type */
 #define	ddpARP		23	/* ARP type */
+#define ddpEIGRP        88      /* EIGRP over Appletalk */
 #define	ddpKLAP		0x4b	/* Kinetics KLAP type */
 
 
 /* AppleTalk Transaction Protocol */
 
 struct atATP {
-	u_int8_t	control;
-	u_int8_t	bitmap;
-	u_int16_t	transID;
-	int32_t userData;
-} __attribute__((packed));
+	uint8_t		control;
+	uint8_t		bitmap;
+	uint16_t	transID;
+	int32_t		userData;
+};
 
 #define	atpReqCode	0x40
 #define	atpRspCode	0x80
@@ -94,9 +93,9 @@ struct atATP {
 /* AppleTalk Echo Protocol */
 
 struct atEcho {
-	u_int8_t	echoFunction;
-	u_int8_t	*echoData;
-} __attribute__((packed));
+	uint8_t		echoFunction;
+	uint8_t		*echoData;
+};
 
 #define echoSkt		4		/* the echoer socket */
 #define echoSize	1		/* size of echo header */
@@ -107,16 +106,16 @@ struct atEcho {
 /* Name Binding Protocol */
 
 struct atNBP {
-	u_int8_t	control;
-	u_int8_t	id;
-} __attribute__((packed));
+	uint8_t		control;
+	uint8_t		id;
+};
 
 struct atNBPtuple {
-	u_int16_t	net;
-	u_int8_t	node;
-	u_int8_t	skt;
-	u_int8_t	enumerator;
-} __attribute__((packed));
+	uint16_t	net;
+	uint8_t		node;
+	uint8_t		skt;
+	uint8_t		enumerator;
+};
 
 #define	nbpBrRq		0x10
 #define	nbpLkUp		0x20
@@ -141,9 +140,9 @@ struct atNBPtuple {
 /* Zone Information Protocol */
 
 struct zipHeader {
-	u_int8_t	command;
-	u_int8_t	netcount;
-} __attribute__((packed));
+	uint8_t		command;
+	uint8_t		netcount;
+};
 
 #define	zipHeaderSize	2
 #define	zipQuery	1