X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f555c163f90c9de17ebcef8313f86404c5174ca9..9f957a5883cb4c5c99cefa71b42fc9d2d27d73e1:/appletalk.h

diff --git a/appletalk.h b/appletalk.h
index fcd0bb7e..ef4013f1 100644
--- a/appletalk.h
+++ b/appletalk.h
@@ -19,14 +19,12 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * AppleTalk protocol formats (courtesy Bill Croft of Stanford/SUMEX).
- *
- * @(#) $Header: /tcpdump/master/tcpdump/appletalk.h,v 1.12 1999-10-07 23:47:09 mcr Exp $ (LBL)
  */
 
 struct LAP {
-	u_char	dst;
-	u_char	src;
-	u_char	type;
+	nd_uint8_t	dst;
+	nd_uint8_t	src;
+	nd_uint8_t	type;
 };
 #define lapShortDDP	1	/* short DDP type */
 #define lapDDP		2	/* DDP type */
@@ -35,22 +33,22 @@ struct LAP {
 /* Datagram Delivery Protocol */
 
 struct atDDP {
-	u_short	length;
-	u_short	checksum;
-	u_short	dstNet;
-	u_short	srcNet;
-	u_char	dstNode;
-	u_char	srcNode;
-	u_char	dstSkt;
-	u_char	srcSkt;
-	u_char	type;
+	nd_uint16_t	length;
+	nd_uint16_t	checksum;
+	nd_uint16_t	dstNet;
+	nd_uint16_t	srcNet;
+	nd_uint8_t	dstNode;
+	nd_uint8_t	srcNode;
+	nd_uint8_t	dstSkt;
+	nd_uint8_t	srcSkt;
+	nd_uint8_t	type;
 };
 
 struct atShortDDP {
-	u_short	length;
-	u_char	dstSkt;
-	u_char	srcSkt;
-	u_char	type;
+	nd_uint16_t	length;
+	nd_uint8_t	dstSkt;
+	nd_uint8_t	srcSkt;
+	nd_uint8_t	type;
 };
 
 #define	ddpMaxWKS	0x7F
@@ -67,16 +65,17 @@ 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_char	control;
-	u_char	bitmap;
-	u_short	transID;
-	int32_t userData;
+	nd_uint8_t	control;
+	nd_uint8_t	bitmap;
+	nd_uint16_t	transID;
+	nd_uint32_t	userData;
 };
 
 #define	atpReqCode	0x40
@@ -94,8 +93,8 @@ struct atATP {
 /* AppleTalk Echo Protocol */
 
 struct atEcho {
-	u_char	echoFunction;
-	u_char	*echoData;
+	nd_uint8_t	echoFunction;
+	nd_uint8_t	echoData[1];	/* Should be [], C99-style */
 };
 
 #define echoSkt		4		/* the echoer socket */
@@ -107,15 +106,15 @@ struct atEcho {
 /* Name Binding Protocol */
 
 struct atNBP {
-	u_char	control;
-	u_char	id;
+	nd_uint8_t	control;
+	nd_uint8_t	id;
 };
 
 struct atNBPtuple {
-	u_short	net;
-	u_char	node;
-	u_char	skt;
-	u_char	enumerator;
+	nd_uint16_t	net;
+	nd_uint8_t	node;
+	nd_uint8_t	skt;
+	nd_uint8_t	enumerator;
 };
 
 #define	nbpBrRq		0x10
@@ -141,8 +140,8 @@ struct atNBPtuple {
 /* Zone Information Protocol */
 
 struct zipHeader {
-	u_char	command;
-	u_char	netcount;
+	nd_uint8_t		command;
+	nd_uint8_t		netcount;
 };
 
 #define	zipHeaderSize	2