Update from current NetBSD version of ieee80211_radiotap.h.

[tcpdump] / appletalk.h

diff --git a/appletalk.h b/appletalk.h
index 056be22ff7153b282bddcfc31faeff9767f9781b..ff972f65bfa999c9069a9959d16f88b283e06d32 100644 (file)
--- a/appletalk.h
+++ b/appletalk.h
@@ -20,14 +20,14 @@
  *
  * AppleTalk protocol formats (courtesy Bill Croft of Stanford/SUMEX).
  *
  *
  * 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)
+ * @(#) $Header: /tcpdump/master/tcpdump/appletalk.h,v 1.16 2004-05-01 09:41:50 hannes Exp $ (LBL)

  */
 
 struct LAP {
        u_int8_t        dst;
        u_int8_t        src;
        u_int8_t        type;
  */
 
 struct LAP {
        u_int8_t        dst;
        u_int8_t        src;
        u_int8_t        type;

-} __attribute__((packed));
+};

 #define lapShortDDP    1       /* short DDP type */
 #define lapDDP         2       /* DDP type */
 #define lapKLAP                'K'     /* Kinetics KLAP type */
 #define lapShortDDP    1       /* short DDP type */
 #define lapDDP         2       /* DDP type */
 #define lapKLAP                'K'     /* Kinetics KLAP type */


@@ -44,14 +44,14 @@ struct atDDP {
        u_int8_t        dstSkt;
        u_int8_t        srcSkt;
        u_int8_t        type;
        u_int8_t        dstSkt;
        u_int8_t        srcSkt;
        u_int8_t        type;

-} __attribute__((packed));
+};

 
 struct atShortDDP {
        u_int16_t       length;
        u_int8_t        dstSkt;
        u_int8_t        srcSkt;
        u_int8_t        type;
 
 struct atShortDDP {
        u_int16_t       length;
        u_int8_t        dstSkt;
        u_int8_t        srcSkt;
        u_int8_t        type;

-} __attribute__((packed));
+};

 
 #define        ddpMaxWKS       0x7F
 #define        ddpMaxData      586
 
 #define        ddpMaxWKS       0x7F
 #define        ddpMaxData      586


@@ -67,6 +67,7 @@ struct atShortDDP {
 #define        ddpECHO         4       /* ECHO type */
 #define        ddpIP           22      /* IP type */
 #define        ddpARP          23      /* ARP type */
 #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 */
 
 
 #define        ddpKLAP         0x4b    /* Kinetics KLAP type */
 
 


@@ -77,7 +78,7 @@ struct atATP {
        u_int8_t        bitmap;
        u_int16_t       transID;
        int32_t userData;
        u_int8_t        bitmap;
        u_int16_t       transID;
        int32_t userData;

-} __attribute__((packed));
+};

 
 #define        atpReqCode      0x40
 #define        atpRspCode      0x80
 
 #define        atpReqCode      0x40
 #define        atpRspCode      0x80


@@ -96,7 +97,7 @@ struct atATP {
 struct atEcho {
        u_int8_t        echoFunction;
        u_int8_t        *echoData;
 struct atEcho {
        u_int8_t        echoFunction;
        u_int8_t        *echoData;

-} __attribute__((packed));
+};

 
 #define echoSkt                4               /* the echoer socket */
 #define echoSize       1               /* size of echo header */
 
 #define echoSkt                4               /* the echoer socket */
 #define echoSize       1               /* size of echo header */


@@ -109,14 +110,14 @@ struct atEcho {
 struct atNBP {
        u_int8_t        control;
        u_int8_t        id;
 struct atNBP {
        u_int8_t        control;
        u_int8_t        id;

-} __attribute__((packed));
+};

 
 struct atNBPtuple {
        u_int16_t       net;
        u_int8_t        node;
        u_int8_t        skt;
        u_int8_t        enumerator;
 
 struct atNBPtuple {
        u_int16_t       net;
        u_int8_t        node;
        u_int8_t        skt;
        u_int8_t        enumerator;

-} __attribute__((packed));
+};

 
 #define        nbpBrRq         0x10
 #define        nbpLkUp         0x20
 
 #define        nbpBrRq         0x10
 #define        nbpLkUp         0x20


@@ -143,7 +144,7 @@ struct atNBPtuple {
 struct zipHeader {
        u_int8_t        command;
        u_int8_t        netcount;
 struct zipHeader {
        u_int8_t        command;
        u_int8_t        netcount;

-} __attribute__((packed));
+};

 
 #define        zipHeaderSize   2
 #define        zipQuery        1
 
 #define        zipHeaderSize   2
 #define        zipQuery        1