diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-12-14 19:27:49 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-12-14 19:27:49 -0800 |
commit | aeb105bfbf67730c83bd85900dba07bba050a047 (patch) | |
tree | 67e32ff955dbdddbd48e88bb0143fd9a99c651a6 /appletalk.h | |
parent | a5874ee6b13a6a206e042766477983d3a202034b (diff) | |
download | tcpdump-aeb105bfbf67730c83bd85900dba07bba050a047.tar.gz |
Use nd_ types in AppleTalk structures, and add EXTRACT_ calls.
Diffstat (limited to 'appletalk.h')
-rw-r--r-- | appletalk.h | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/appletalk.h b/appletalk.h index 3fbcbce0..ef4013f1 100644 --- a/appletalk.h +++ b/appletalk.h @@ -22,9 +22,9 @@ */ struct LAP { - uint8_t dst; - uint8_t src; - uint8_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 { - 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; + 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 { - uint16_t length; - uint8_t dstSkt; - uint8_t srcSkt; - uint8_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 { - uint8_t control; - uint8_t bitmap; - uint16_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 { - uint8_t echoFunction; - uint8_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 { - uint8_t control; - uint8_t id; + nd_uint8_t control; + nd_uint8_t id; }; struct atNBPtuple { - uint16_t net; - uint8_t node; - uint8_t skt; - uint8_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 { - uint8_t command; - uint8_t netcount; + nd_uint8_t command; + nd_uint8_t netcount; }; #define zipHeaderSize 2 |