DNS: Sync types with IANA

[tcpdump] / appletalk.h

diff --git a/appletalk.h b/appletalk.h
index 06677767779d5acd025f7cfdab31752f257cfc28..ef4013f13d343e60306365c2832ef28a7972e306 100644 (file)
--- a/appletalk.h
+++ b/appletalk.h
@@ -22,9 +22,9 @@
  */
 
 struct LAP {
-       u_int8_t        dst;
-       u_int8_t        src;
-       u_int8_t        type;
+       nd_uint8_t      dst;
+       nd_uint8_t      src;
+       nd_uint8_t      type;
 };
 #define lapShortDDP    1       /* short DDP type */
 #define lapDDP         2       /* DDP type */
@@ -33,22 +33,22 @@ 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;
+       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_int16_t       length;
-       u_int8_t        dstSkt;
-       u_int8_t        srcSkt;
-       u_int8_t        type;
+       nd_uint16_t     length;
+       nd_uint8_t      dstSkt;
+       nd_uint8_t      srcSkt;
+       nd_uint8_t      type;
 };
 
 #define        ddpMaxWKS       0x7F
@@ -72,10 +72,10 @@ struct atShortDDP {
 /* AppleTalk Transaction Protocol */
 
 struct atATP {
-       u_int8_t        control;
-       u_int8_t        bitmap;
-       u_int16_t       transID;
-       int32_t userData;
+       nd_uint8_t      control;
+       nd_uint8_t      bitmap;
+       nd_uint16_t     transID;
+       nd_uint32_t     userData;
 };
 
 #define        atpReqCode      0x40
@@ -93,8 +93,8 @@ struct atATP {
 /* AppleTalk Echo Protocol */
 
 struct atEcho {
-       u_int8_t        echoFunction;
-       u_int8_t        *echoData;
+       nd_uint8_t      echoFunction;
+       nd_uint8_t      echoData[1];    /* Should be [], C99-style */
 };
 
 #define echoSkt                4               /* the echoer socket */
@@ -106,15 +106,15 @@ struct atEcho {
 /* Name Binding Protocol */
 
 struct atNBP {
-       u_int8_t        control;
-       u_int8_t        id;
+       nd_uint8_t      control;
+       nd_uint8_t      id;
 };
 
 struct atNBPtuple {
-       u_int16_t       net;
-       u_int8_t        node;
-       u_int8_t        skt;
-       u_int8_t        enumerator;
+       nd_uint16_t     net;
+       nd_uint8_t      node;
+       nd_uint8_t      skt;
+       nd_uint8_t      enumerator;
 };
 
 #define        nbpBrRq         0x10
@@ -140,8 +140,8 @@ struct atNBPtuple {
 /* Zone Information Protocol */
 
 struct zipHeader {
-       u_int8_t        command;
-       u_int8_t        netcount;
+       nd_uint8_t              command;
+       nd_uint8_t              netcount;
 };
 
 #define        zipHeaderSize   2