X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b9f915bceb21812e4bd2ca1c616d044b61d596e1..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-rx.c diff --git a/print-rx.c b/print-rx.c index 37e60b59..7dfa3ddb 100644 --- a/print-rx.c +++ b/print-rx.c @@ -20,6 +20,9 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ + +/* \summary: AFS RX printer */ + /* * This code unmangles RX packets. RX is the mutant form of RPC that AFS * uses to communicate between clients and servers. @@ -32,29 +35,106 @@ * Ken Hornstein */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.40 2008-05-12 18:16:42 guy Exp $"; -#endif - #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include #include #include -#include +#include "netdissect-stdinc.h" -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" -#include "rx.h" - #include "ip.h" -static struct tok rx_types[] = { +#define FS_RX_PORT 7000 +#define CB_RX_PORT 7001 +#define PROT_RX_PORT 7002 +#define VLDB_RX_PORT 7003 +#define KAUTH_RX_PORT 7004 +#define VOL_RX_PORT 7005 +#define ERROR_RX_PORT 7006 /* Doesn't seem to be used */ +#define BOS_RX_PORT 7007 + +#define AFSOPAQUEMAX 1024 +#define AFSNAMEMAX 256 /* Must be >= PRNAMEMAX + 1, VLNAMEMAX + 1, and 32 + 1 */ +#define PRNAMEMAX 64 +#define VLNAMEMAX 65 +#define KANAMEMAX 64 +#define BOSNAMEMAX 256 +#define USERNAMEMAX 1024 /* AFSOPAQUEMAX was used for this; does it need to be this big? */ + +#define PRSFS_READ 1 /* Read files */ +#define PRSFS_WRITE 2 /* Write files */ +#define PRSFS_INSERT 4 /* Insert files into a directory */ +#define PRSFS_LOOKUP 8 /* Lookup files into a directory */ +#define PRSFS_DELETE 16 /* Delete files */ +#define PRSFS_LOCK 32 /* Lock files */ +#define PRSFS_ADMINISTER 64 /* Change ACL's */ + +struct rx_header { + nd_uint32_t epoch; + nd_uint32_t cid; + nd_uint32_t callNumber; + nd_uint32_t seq; + nd_uint32_t serial; + nd_uint8_t type; +#define RX_PACKET_TYPE_DATA 1 +#define RX_PACKET_TYPE_ACK 2 +#define RX_PACKET_TYPE_BUSY 3 +#define RX_PACKET_TYPE_ABORT 4 +#define RX_PACKET_TYPE_ACKALL 5 +#define RX_PACKET_TYPE_CHALLENGE 6 +#define RX_PACKET_TYPE_RESPONSE 7 +#define RX_PACKET_TYPE_DEBUG 8 +#define RX_PACKET_TYPE_PARAMS 9 +#define RX_PACKET_TYPE_VERSION 13 + nd_uint8_t flags; +#define RX_CLIENT_INITIATED 1 +#define RX_REQUEST_ACK 2 +#define RX_LAST_PACKET 4 +#define RX_MORE_PACKETS 8 +#define RX_FREE_PACKET 16 +#define RX_SLOW_START_OK 32 +#define RX_JUMBO_PACKET 32 + nd_uint8_t userStatus; + nd_uint8_t securityIndex; + nd_uint16_t spare; /* How clever: even though the AFS */ + nd_uint16_t serviceId; /* header files indicate that the */ +}; /* serviceId is first, it's really */ + /* encoded _after_ the spare field */ + /* I wasted a day figuring that out! */ + +#define NUM_RX_FLAGS 7 + +#define RX_MAXACKS 255 + +struct rx_ackPacket { + nd_uint16_t bufferSpace; /* Number of packet buffers available */ + nd_uint16_t maxSkew; /* Max diff between ack'd packet and */ + /* highest packet received */ + nd_uint32_t firstPacket; /* The first packet in ack list */ + nd_uint32_t previousPacket; /* Previous packet recv'd (obsolete) */ + nd_uint32_t serial; /* # of packet that prompted the ack */ + nd_uint8_t reason; /* Reason for acknowledgement */ + nd_uint8_t nAcks; /* Number of acknowledgements */ + /* Followed by nAcks acknowledgments */ +#if 0 + uint8_t acks[RX_MAXACKS]; /* Up to RX_MAXACKS acknowledgements */ +#endif +}; + +/* + * Values for the acks array + */ + +#define RX_ACK_TYPE_NACK 0 /* Don't have this packet */ +#define RX_ACK_TYPE_ACK 1 /* I have this packet */ + +static const struct tok rx_types[] = { { RX_PACKET_TYPE_DATA, "data" }, { RX_PACKET_TYPE_ACK, "ack" }, { RX_PACKET_TYPE_BUSY, "busy" }, @@ -68,9 +148,9 @@ static struct tok rx_types[] = { { 0, NULL }, }; -static struct double_tok { - int flag; /* Rx flag */ - int packetType; /* Packet type */ +static const struct double_tok { + uint32_t flag; /* Rx flag */ + uint32_t packetType; /* Packet type */ const char *s; /* Flag string */ } rx_flags[] = { { RX_CLIENT_INITIATED, 0, "client-init" }, @@ -82,7 +162,7 @@ static struct double_tok { { RX_JUMBO_PACKET, RX_PACKET_TYPE_DATA, "jumbogram" } }; -static struct tok fs_req[] = { +static const struct tok fs_req[] = { { 130, "fetch-data" }, { 131, "fetch-acl" }, { 132, "fetch-status" }, @@ -127,7 +207,7 @@ static struct tok fs_req[] = { { 0, NULL }, }; -static struct tok cb_req[] = { +static const struct tok cb_req[] = { { 204, "callback" }, { 205, "initcb" }, { 206, "probe" }, @@ -149,7 +229,7 @@ static struct tok cb_req[] = { { 0, NULL }, }; -static struct tok pt_req[] = { +static const struct tok pt_req[] = { { 500, "new-user" }, { 501, "where-is-it" }, { 502, "dump-entry" }, @@ -176,7 +256,7 @@ static struct tok pt_req[] = { { 0, NULL }, }; -static struct tok vldb_req[] = { +static const struct tok vldb_req[] = { { 501, "create-entry" }, { 502, "delete-entry" }, { 503, "get-entry-by-id" }, @@ -214,7 +294,7 @@ static struct tok vldb_req[] = { { 0, NULL }, }; -static struct tok kauth_req[] = { +static const struct tok kauth_req[] = { { 1, "auth-old" }, { 21, "authenticate" }, { 22, "authenticate-v2" }, @@ -236,7 +316,7 @@ static struct tok kauth_req[] = { { 0, NULL }, }; -static struct tok vol_req[] = { +static const struct tok vol_req[] = { { 100, "create-volume" }, { 101, "delete-volume" }, { 102, "restore" }, @@ -272,7 +352,7 @@ static struct tok vol_req[] = { { 0, NULL }, }; -static struct tok bos_req[] = { +static const struct tok bos_req[] = { { 80, "create-bnode" }, { 81, "delete-bnode" }, { 82, "set-status" }, @@ -313,7 +393,7 @@ static struct tok bos_req[] = { { 0, NULL }, }; -static struct tok ubik_req[] = { +static const struct tok ubik_req[] = { { 10000, "vote-beacon" }, { 10001, "vote-debug-old" }, { 10002, "vote-sdebug-old" }, @@ -344,14 +424,14 @@ static struct tok ubik_req[] = { #define DISK_LOW 20000 #define DISK_HIGH 20013 -static struct tok cb_types[] = { +static const struct tok cb_types[] = { { 1, "exclusive" }, { 2, "shared" }, { 3, "dropped" }, { 0, NULL }, }; -static struct tok ubik_lock_types[] = { +static const struct tok ubik_lock_types[] = { { 1, "read" }, { 2, "write" }, { 3, "wait" }, @@ -360,7 +440,7 @@ static struct tok ubik_lock_types[] = { static const char *voltype[] = { "read-write", "read-only", "backup" }; -static struct tok afs_fs_errors[] = { +static const struct tok afs_fs_errors[] = { { 101, "salvage volume" }, { 102, "no such vnode" }, { 103, "no such volume" }, @@ -373,7 +453,7 @@ static struct tok afs_fs_errors[] = { { 110, "volume busy" }, { 111, "volume moved" }, { 112, "AFS IO error" }, - { -100, "restarting fileserver" }, + { 0xffffff9c, "restarting fileserver" }, /* -100, sic! */ { 0, NULL } }; @@ -381,7 +461,7 @@ static struct tok afs_fs_errors[] = { * Reasons for acknowledging a packet */ -static struct tok rx_ack_reasons[] = { +static const struct tok rx_ack_reasons[] = { { 1, "ack requested" }, { 2, "duplicate packet" }, { 3, "out of sequence" }, @@ -400,45 +480,45 @@ static struct tok rx_ack_reasons[] = { */ struct rx_cache_entry { - u_int32_t callnum; /* Call number (net order) */ - struct in_addr client; /* client IP address (net order) */ - struct in_addr server; /* server IP address (net order) */ - int dport; /* server port (host order) */ - u_short serviceId; /* Service identifier (net order) */ - u_int32_t opcode; /* RX opcode (host order) */ + uint32_t callnum; /* Call number (net order) */ + uint32_t client; /* client IP address (net order) */ + uint32_t server; /* server IP address (net order) */ + uint16_t dport; /* server UDP port (host order) */ + uint16_t serviceId; /* Service identifier (net order) */ + uint32_t opcode; /* RX opcode (host order) */ }; #define RX_CACHE_SIZE 64 static struct rx_cache_entry rx_cache[RX_CACHE_SIZE]; -static int rx_cache_next = 0; -static int rx_cache_hint = 0; -static void rx_cache_insert(const u_char *, const struct ip *, int); -static int rx_cache_find(const struct rx_header *, const struct ip *, - int, int32_t *); - -static void fs_print(const u_char *, int); -static void fs_reply_print(const u_char *, int, int32_t); -static void acl_print(u_char *, int, u_char *); -static void cb_print(const u_char *, int); -static void cb_reply_print(const u_char *, int, int32_t); -static void prot_print(const u_char *, int); -static void prot_reply_print(const u_char *, int, int32_t); -static void vldb_print(const u_char *, int); -static void vldb_reply_print(const u_char *, int, int32_t); -static void kauth_print(const u_char *, int); -static void kauth_reply_print(const u_char *, int, int32_t); -static void vol_print(const u_char *, int); -static void vol_reply_print(const u_char *, int, int32_t); -static void bos_print(const u_char *, int); -static void bos_reply_print(const u_char *, int, int32_t); -static void ubik_print(const u_char *); -static void ubik_reply_print(const u_char *, int, int32_t); - -static void rx_ack_print(const u_char *, int); - -static int is_ubik(u_int32_t); +static uint32_t rx_cache_next = 0; +static uint32_t rx_cache_hint = 0; +static void rx_cache_insert(netdissect_options *, const u_char *, const struct ip *, uint16_t); +static int rx_cache_find(netdissect_options *, const struct rx_header *, + const struct ip *, uint16_t, uint32_t *); + +static void fs_print(netdissect_options *, const u_char *, u_int); +static void fs_reply_print(netdissect_options *, const u_char *, u_int, uint32_t); +static void acl_print(netdissect_options *, u_char *, u_char *); +static void cb_print(netdissect_options *, const u_char *, u_int); +static void cb_reply_print(netdissect_options *, const u_char *, u_int, uint32_t); +static void prot_print(netdissect_options *, const u_char *, u_int); +static void prot_reply_print(netdissect_options *, const u_char *, u_int, uint32_t); +static void vldb_print(netdissect_options *, const u_char *, u_int); +static void vldb_reply_print(netdissect_options *, const u_char *, u_int, uint32_t); +static void kauth_print(netdissect_options *, const u_char *, u_int); +static void kauth_reply_print(netdissect_options *, const u_char *, u_int, uint32_t); +static void vol_print(netdissect_options *, const u_char *, u_int); +static void vol_reply_print(netdissect_options *, const u_char *, u_int, uint32_t); +static void bos_print(netdissect_options *, const u_char *, u_int); +static void bos_reply_print(netdissect_options *, const u_char *, u_int, uint32_t); +static void ubik_print(netdissect_options *, const u_char *); +static void ubik_reply_print(netdissect_options *, const u_char *, u_int, uint32_t); + +static void rx_ack_print(netdissect_options *, const u_char *, u_int); + +static int is_ubik(uint32_t); /* * Handle the rx-level packet. See if we know what port it's going to so @@ -446,51 +526,56 @@ static int is_ubik(u_int32_t); */ void -rx_print(register const u_char *bp, int length, int sport, int dport, - u_char *bp2) +rx_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint16_t sport, uint16_t dport, + const u_char *bp2) { - register struct rx_header *rxh; - int i; - int32_t opcode; - - if (snapend - bp < (int)sizeof (struct rx_header)) { - printf(" [|rx] (%d)", length); + const struct rx_header *rxh; + uint32_t i; + uint8_t type, flags; + uint32_t opcode; + + ndo->ndo_protocol = "rx"; + if (!ND_TTEST_LEN(bp, sizeof(struct rx_header))) { + ND_PRINT(" [|rx] (%u)", length); return; } - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; - printf(" rx %s", tok2str(rx_types, "type %d", rxh->type)); + type = GET_U_1(rxh->type); + ND_PRINT(" rx %s", tok2str(rx_types, "type %u", type)); - if (vflag) { + flags = GET_U_1(rxh->flags); + if (ndo->ndo_vflag) { int firstflag = 0; - if (vflag > 1) - printf(" cid %08x call# %d", - (int) EXTRACT_32BITS(&rxh->cid), - (int) EXTRACT_32BITS(&rxh->callNumber)); + if (ndo->ndo_vflag > 1) + ND_PRINT(" cid %08x call# %u", + GET_BE_U_4(rxh->cid), + GET_BE_U_4(rxh->callNumber)); - printf(" seq %d ser %d", - (int) EXTRACT_32BITS(&rxh->seq), - (int) EXTRACT_32BITS(&rxh->serial)); + ND_PRINT(" seq %u ser %u", + GET_BE_U_4(rxh->seq), + GET_BE_U_4(rxh->serial)); - if (vflag > 2) - printf(" secindex %d serviceid %hu", - (int) rxh->securityIndex, - EXTRACT_16BITS(&rxh->serviceId)); + if (ndo->ndo_vflag > 2) + ND_PRINT(" secindex %u serviceid %hu", + GET_U_1(rxh->securityIndex), + GET_BE_U_2(rxh->serviceId)); - if (vflag > 1) + if (ndo->ndo_vflag > 1) for (i = 0; i < NUM_RX_FLAGS; i++) { - if (rxh->flags & rx_flags[i].flag && + if (flags & rx_flags[i].flag && (!rx_flags[i].packetType || - rxh->type == rx_flags[i].packetType)) { + type == rx_flags[i].packetType)) { if (!firstflag) { firstflag = 1; - printf(" "); + ND_PRINT(" "); } else { - printf(","); + ND_PRINT(","); } - printf("<%s>", rx_flags[i].s); + ND_PRINT("<%s>", rx_flags[i].s); } } } @@ -504,38 +589,38 @@ rx_print(register const u_char *bp, int length, int sport, int dport, * as well. */ - if (rxh->type == RX_PACKET_TYPE_DATA && - EXTRACT_32BITS(&rxh->seq) == 1 && - rxh->flags & RX_CLIENT_INITIATED) { + if (type == RX_PACKET_TYPE_DATA && + GET_BE_U_4(rxh->seq) == 1 && + flags & RX_CLIENT_INITIATED) { /* * Insert this call into the call cache table, so we * have a chance to print out replies */ - rx_cache_insert(bp, (const struct ip *) bp2, dport); + rx_cache_insert(ndo, bp, (const struct ip *) bp2, dport); switch (dport) { case FS_RX_PORT: /* AFS file service */ - fs_print(bp, length); + fs_print(ndo, bp, length); break; case CB_RX_PORT: /* AFS callback service */ - cb_print(bp, length); + cb_print(ndo, bp, length); break; case PROT_RX_PORT: /* AFS protection service */ - prot_print(bp, length); + prot_print(ndo, bp, length); break; case VLDB_RX_PORT: /* AFS VLDB service */ - vldb_print(bp, length); + vldb_print(ndo, bp, length); break; case KAUTH_RX_PORT: /* AFS Kerberos auth service */ - kauth_print(bp, length); + kauth_print(ndo, bp, length); break; case VOL_RX_PORT: /* AFS Volume service */ - vol_print(bp, length); + vol_print(ndo, bp, length); break; case BOS_RX_PORT: /* AFS BOS service */ - bos_print(bp, length); + bos_print(ndo, bp, length); break; default: ; @@ -548,34 +633,34 @@ rx_print(register const u_char *bp, int length, int sport, int dport, * because printing out the return code can be useful at times. */ - } else if (((rxh->type == RX_PACKET_TYPE_DATA && - EXTRACT_32BITS(&rxh->seq) == 1) || - rxh->type == RX_PACKET_TYPE_ABORT) && - (rxh->flags & RX_CLIENT_INITIATED) == 0 && - rx_cache_find(rxh, (const struct ip *) bp2, + } else if (((type == RX_PACKET_TYPE_DATA && + GET_BE_U_4(rxh->seq) == 1) || + type == RX_PACKET_TYPE_ABORT) && + (flags & RX_CLIENT_INITIATED) == 0 && + rx_cache_find(ndo, rxh, (const struct ip *) bp2, sport, &opcode)) { switch (sport) { case FS_RX_PORT: /* AFS file service */ - fs_reply_print(bp, length, opcode); + fs_reply_print(ndo, bp, length, opcode); break; case CB_RX_PORT: /* AFS callback service */ - cb_reply_print(bp, length, opcode); + cb_reply_print(ndo, bp, length, opcode); break; case PROT_RX_PORT: /* AFS PT service */ - prot_reply_print(bp, length, opcode); + prot_reply_print(ndo, bp, length, opcode); break; case VLDB_RX_PORT: /* AFS VLDB service */ - vldb_reply_print(bp, length, opcode); + vldb_reply_print(ndo, bp, length, opcode); break; case KAUTH_RX_PORT: /* AFS Kerberos auth service */ - kauth_reply_print(bp, length, opcode); + kauth_reply_print(ndo, bp, length, opcode); break; case VOL_RX_PORT: /* AFS Volume service */ - vol_reply_print(bp, length, opcode); + vol_reply_print(ndo, bp, length, opcode); break; case BOS_RX_PORT: /* AFS BOS service */ - bos_reply_print(bp, length, opcode); + bos_reply_print(ndo, bp, length, opcode); break; default: ; @@ -587,11 +672,11 @@ rx_print(register const u_char *bp, int length, int sport, int dport, * ack packet, so we can use one for all AFS services) */ - } else if (rxh->type == RX_PACKET_TYPE_ACK) - rx_ack_print(bp, length); + } else if (type == RX_PACKET_TYPE_ACK) + rx_ack_print(ndo, bp, length); - printf(" (%d)", length); + ND_PRINT(" (%u)", length); } /* @@ -599,12 +684,13 @@ rx_print(register const u_char *bp, int length, int sport, int dport, */ static void -rx_cache_insert(const u_char *bp, const struct ip *ip, int dport) +rx_cache_insert(netdissect_options *ndo, + const u_char *bp, const struct ip *ip, uint16_t dport) { struct rx_cache_entry *rxent; const struct rx_header *rxh = (const struct rx_header *) bp; - if (snapend - bp + 1 <= (int)(sizeof(struct rx_header) + sizeof(int32_t))) + if (!ND_TTEST_4(bp + sizeof(struct rx_header))) return; rxent = &rx_cache[rx_cache_next]; @@ -612,12 +698,12 @@ rx_cache_insert(const u_char *bp, const struct ip *ip, int dport) if (++rx_cache_next >= RX_CACHE_SIZE) rx_cache_next = 0; - rxent->callnum = rxh->callNumber; - rxent->client = ip->ip_src; - rxent->server = ip->ip_dst; + rxent->callnum = GET_BE_U_4(rxh->callNumber); + rxent->client = GET_IPV4_TO_NETWORK_ORDER(ip->ip_src); + rxent->server = GET_IPV4_TO_NETWORK_ORDER(ip->ip_dst); rxent->dport = dport; - rxent->serviceId = rxh->serviceId; - rxent->opcode = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + rxent->serviceId = GET_BE_U_2(rxh->serviceId); + rxent->opcode = GET_BE_U_4(bp + sizeof(struct rx_header)); } /* @@ -628,23 +714,26 @@ rx_cache_insert(const u_char *bp, const struct ip *ip, int dport) */ static int -rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, - int32_t *opcode) +rx_cache_find(netdissect_options *ndo, const struct rx_header *rxh, + const struct ip *ip, uint16_t sport, uint32_t *opcode) { - int i; + uint32_t i; struct rx_cache_entry *rxent; - u_int32_t clip = ip->ip_dst.s_addr; - u_int32_t sip = ip->ip_src.s_addr; + uint32_t clip; + uint32_t sip; + + clip = GET_IPV4_TO_NETWORK_ORDER(ip->ip_dst); + sip = GET_IPV4_TO_NETWORK_ORDER(ip->ip_src); /* Start the search where we last left off */ i = rx_cache_hint; do { rxent = &rx_cache[i]; - if (rxent->callnum == rxh->callNumber && - rxent->client.s_addr == clip && - rxent->server.s_addr == sip && - rxent->serviceId == rxh->serviceId && + if (rxent->callnum == GET_BE_U_4(rxh->callNumber) && + rxent->client == clip && + rxent->server == sip && + rxent->serviceId == GET_BE_U_2(rxh->serviceId) && rxent->dport == sport) { /* We got a match! */ @@ -653,7 +742,7 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, *opcode = rxent->opcode; return(1); } - if (++i > RX_CACHE_SIZE) + if (++i >= RX_CACHE_SIZE) i = 0; } while (i != rx_cache_hint); @@ -662,138 +751,134 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, } /* - * These extrememly grody macros handle the printing of various AFS stuff. + * These extremely grody macros handle the printing of various AFS stuff. */ -#define FIDOUT() { unsigned long n1, n2, n3; \ - TCHECK2(bp[0], sizeof(int32_t) * 3); \ - n1 = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - n2 = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - n3 = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - printf(" fid %d/%d/%d", (int) n1, (int) n2, (int) n3); \ +#define FIDOUT() { uint32_t n1, n2, n3; \ + ND_TCHECK_LEN(bp, sizeof(uint32_t) * 3); \ + n1 = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + n2 = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + n3 = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + ND_PRINT(" fid %u/%u/%u", n1, n2, n3); \ } -#define STROUT(MAX) { unsigned int i; \ - TCHECK2(bp[0], sizeof(int32_t)); \ - i = EXTRACT_32BITS(bp); \ - if (i > (MAX)) \ +#define STROUT(MAX) { uint32_t _i; \ + ND_TCHECK_LEN(bp, sizeof(uint32_t)); \ + _i = GET_BE_U_4(bp); \ + if (_i > (MAX)) \ goto trunc; \ - bp += sizeof(int32_t); \ - printf(" \""); \ - if (fn_printn(bp, i, snapend)) \ + bp += sizeof(uint32_t); \ + ND_PRINT(" \""); \ + if (nd_printn(ndo, bp, _i, ndo->ndo_snapend)) \ goto trunc; \ - printf("\""); \ - bp += ((i + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t); \ + ND_PRINT("\""); \ + bp += ((_i + sizeof(uint32_t) - 1) / sizeof(uint32_t)) * sizeof(uint32_t); \ } -#define INTOUT() { int i; \ - TCHECK2(bp[0], sizeof(int32_t)); \ - i = (int) EXTRACT_32BITS(bp); \ +#define INTOUT() { int32_t _i; \ + _i = GET_BE_S_4(bp); \ bp += sizeof(int32_t); \ - printf(" %d", i); \ + ND_PRINT(" %d", _i); \ } -#define UINTOUT() { unsigned long i; \ - TCHECK2(bp[0], sizeof(int32_t)); \ - i = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - printf(" %lu", i); \ +#define UINTOUT() { uint32_t _i; \ + _i = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + ND_PRINT(" %u", _i); \ } -#define UINT64OUT() { u_int64_t i; \ - TCHECK2(bp[0], sizeof(u_int64_t)); \ - i = EXTRACT_64BITS(bp); \ - bp += sizeof(u_int64_t); \ - printf(" %llu", i); \ +#define UINT64OUT() { uint64_t _i; \ + ND_TCHECK_LEN(bp, sizeof(uint64_t)); \ + _i = GET_BE_U_8(bp); \ + bp += sizeof(uint64_t); \ + ND_PRINT(" %" PRIu64, _i); \ } -#define DATEOUT() { time_t t; struct tm *tm; char str[256]; \ - TCHECK2(bp[0], sizeof(int32_t)); \ - t = (time_t) EXTRACT_32BITS(bp); \ +#define DATEOUT() { time_t _t; struct tm *tm; char str[256]; \ + _t = (time_t) GET_BE_S_4(bp); \ bp += sizeof(int32_t); \ - tm = localtime(&t); \ - strftime(str, 256, "%Y/%m/%d %T", tm); \ - printf(" %s", str); \ + tm = localtime(&_t); \ + strftime(str, 256, "%Y/%m/%d %H:%M:%S", tm); \ + ND_PRINT(" %s", str); \ } -#define STOREATTROUT() { unsigned long mask, i; \ - TCHECK2(bp[0], (sizeof(int32_t)*6)); \ - mask = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask) printf (" StoreStatus"); \ - if (mask & 1) { printf(" date"); DATEOUT(); } \ - else bp += sizeof(int32_t); \ - i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask & 2) printf(" owner %lu", i); \ - i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask & 4) printf(" group %lu", i); \ - i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask & 8) printf(" mode %lo", i & 07777); \ - i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask & 16) printf(" segsize %lu", i); \ +#define STOREATTROUT() { uint32_t mask, _i; \ + ND_TCHECK_LEN(bp, (sizeof(uint32_t) * 6)); \ + mask = GET_BE_U_4(bp); bp += sizeof(uint32_t); \ + if (mask) ND_PRINT(" StoreStatus"); \ + if (mask & 1) { ND_PRINT(" date"); DATEOUT(); } \ + else bp += sizeof(uint32_t); \ + _i = GET_BE_U_4(bp); bp += sizeof(uint32_t); \ + if (mask & 2) ND_PRINT(" owner %u", _i); \ + _i = GET_BE_U_4(bp); bp += sizeof(uint32_t); \ + if (mask & 4) ND_PRINT(" group %u", _i); \ + _i = GET_BE_U_4(bp); bp += sizeof(uint32_t); \ + if (mask & 8) ND_PRINT(" mode %o", _i & 07777); \ + _i = GET_BE_U_4(bp); bp += sizeof(uint32_t); \ + if (mask & 16) ND_PRINT(" segsize %u", _i); \ /* undocumented in 3.3 docu */ \ - if (mask & 1024) printf(" fsync"); \ + if (mask & 1024) ND_PRINT(" fsync"); \ } -#define UBIK_VERSIONOUT() {int32_t epoch; int32_t counter; \ - TCHECK2(bp[0], sizeof(int32_t) * 2); \ - epoch = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - counter = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - printf(" %d.%d", epoch, counter); \ +#define UBIK_VERSIONOUT() {uint32_t epoch; uint32_t counter; \ + ND_TCHECK_LEN(bp, sizeof(uint32_t) * 2); \ + epoch = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + counter = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + ND_PRINT(" %u.%u", epoch, counter); \ } -#define AFSUUIDOUT() {u_int32_t temp; int i; \ - TCHECK2(bp[0], 11*sizeof(u_int32_t)); \ - temp = EXTRACT_32BITS(bp); \ - bp += sizeof(u_int32_t); \ - printf(" %08x", temp); \ - temp = EXTRACT_32BITS(bp); \ - bp += sizeof(u_int32_t); \ - printf("%04x", temp); \ - temp = EXTRACT_32BITS(bp); \ - bp += sizeof(u_int32_t); \ - printf("%04x", temp); \ - for (i = 0; i < 8; i++) { \ - temp = EXTRACT_32BITS(bp); \ - bp += sizeof(u_int32_t); \ - printf("%02x", (unsigned char) temp); \ +#define AFSUUIDOUT() {uint32_t temp; int _i; \ + ND_TCHECK_LEN(bp, 11 * sizeof(uint32_t)); \ + temp = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + ND_PRINT(" %08x", temp); \ + temp = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + ND_PRINT("%04x", temp); \ + temp = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + ND_PRINT("%04x", temp); \ + for (_i = 0; _i < 8; _i++) { \ + temp = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + ND_PRINT("%02x", (unsigned char) temp); \ } \ } /* * This is the sickest one of all + * MAX is expected to be a constant here */ #define VECOUT(MAX) { u_char *sp; \ - u_char s[AFSNAMEMAX]; \ - int k; \ - if ((MAX) + 1 > sizeof(s)) \ - goto trunc; \ - TCHECK2(bp[0], (MAX) * sizeof(int32_t)); \ + u_char s[(MAX) + 1]; \ + uint32_t k; \ + ND_TCHECK_LEN(bp, (MAX) * sizeof(uint32_t)); \ sp = s; \ for (k = 0; k < (MAX); k++) { \ - *sp++ = (u_char) EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ + *sp++ = (u_char) GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ } \ s[(MAX)] = '\0'; \ - printf(" \""); \ - fn_print(s, NULL); \ - printf("\""); \ + ND_PRINT(" \""); \ + fn_print_str(ndo, s); \ + ND_PRINT("\""); \ } -#define DESTSERVEROUT() { unsigned long n1, n2, n3; \ - TCHECK2(bp[0], sizeof(int32_t) * 3); \ - n1 = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - n2 = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - n3 = EXTRACT_32BITS(bp); \ - bp += sizeof(int32_t); \ - printf(" server %d:%d:%d", (int) n1, (int) n2, (int) n3); \ +#define DESTSERVEROUT() { uint32_t n1, n2, n3; \ + ND_TCHECK_LEN(bp, sizeof(uint32_t) * 3); \ + n1 = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + n2 = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + n3 = GET_BE_U_4(bp); \ + bp += sizeof(uint32_t); \ + ND_PRINT(" server %u:%u:%u", n1, n2, n3); \ } /* @@ -801,26 +886,23 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, */ static void -fs_print(register const u_char *bp, int length) +fs_print(netdissect_options *ndo, + const u_char *bp, u_int length) { - int fs_op; - unsigned long i; + uint32_t fs_op; + uint32_t i; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - if (snapend - bp + 1 <= (int)(sizeof(struct rx_header) + sizeof(int32_t))) { - goto trunc; - } - /* * Print out the afs call we're invoking. The table used here was * gleaned from fsint/afsint.xg */ - fs_op = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + fs_op = GET_BE_U_4(bp + sizeof(struct rx_header)); - printf(" fs call %s", tok2str(fs_req, "op#%d", fs_op)); + ND_PRINT(" fs call %s", tok2str(fs_req, "op#%u", fs_op)); /* * Print out arguments to some of the AFS calls. This stuff is @@ -836,9 +918,9 @@ fs_print(register const u_char *bp, int length) switch (fs_op) { case 130: /* Fetch data */ FIDOUT(); - printf(" offset"); + ND_PRINT(" offset"); UINTOUT(); - printf(" length"); + ND_PRINT(" length"); UINTOUT(); break; case 131: /* Fetch ACL */ @@ -858,25 +940,24 @@ fs_print(register const u_char *bp, int length) case 133: /* Store data */ FIDOUT(); STOREATTROUT(); - printf(" offset"); + ND_PRINT(" offset"); UINTOUT(); - printf(" length"); + ND_PRINT(" length"); UINTOUT(); - printf(" flen"); + ND_PRINT(" flen"); UINTOUT(); break; case 134: /* Store ACL */ { char a[AFSOPAQUEMAX+1]; FIDOUT(); - TCHECK2(bp[0], 4); - i = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - TCHECK2(bp[0], i); - i = min(AFSOPAQUEMAX, i); - strncpy(a, (char *) bp, i); + i = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + ND_TCHECK_LEN(bp, i); + i = ND_MIN(AFSOPAQUEMAX, i); + strncpy(a, (const char *) bp, i); a[i] = '\0'; - acl_print((u_char *) a, sizeof(a), (u_char *) a + i); + acl_print(ndo, (u_char *) a, (u_char *) a + i); break; } case 137: /* Create file */ @@ -891,23 +972,23 @@ fs_print(register const u_char *bp, int length) STROUT(AFSNAMEMAX); break; case 138: /* Rename file */ - printf(" old"); + ND_PRINT(" old"); FIDOUT(); STROUT(AFSNAMEMAX); - printf(" new"); + ND_PRINT(" new"); FIDOUT(); STROUT(AFSNAMEMAX); break; case 139: /* Symlink */ FIDOUT(); STROUT(AFSNAMEMAX); - printf(" link to"); + ND_PRINT(" link to"); STROUT(AFSNAMEMAX); break; case 140: /* Link */ FIDOUT(); STROUT(AFSNAMEMAX); - printf(" link to"); + ND_PRINT(" link to"); FIDOUT(); break; case 148: /* Get volume info */ @@ -915,48 +996,48 @@ fs_print(register const u_char *bp, int length) break; case 149: /* Get volume stats */ case 150: /* Set volume stats */ - printf(" volid"); + ND_PRINT(" volid"); UINTOUT(); break; case 154: /* New get volume info */ - printf(" volname"); + ND_PRINT(" volname"); STROUT(AFSNAMEMAX); break; case 155: /* Bulk stat */ case 65536: /* Inline bulk stat */ { - unsigned long j; - TCHECK2(bp[0], 4); - j = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t j; + j = GET_BE_U_4(bp); + bp += sizeof(uint32_t); for (i = 0; i < j; i++) { FIDOUT(); if (i != j - 1) - printf(","); + ND_PRINT(","); } if (j == 0) - printf(" "); + ND_PRINT(" "); + break; } case 65537: /* Fetch data 64 */ FIDOUT(); - printf(" offset"); + ND_PRINT(" offset"); UINT64OUT(); - printf(" length"); + ND_PRINT(" length"); UINT64OUT(); break; case 65538: /* Store data 64 */ FIDOUT(); STOREATTROUT(); - printf(" offset"); + ND_PRINT(" offset"); UINT64OUT(); - printf(" length"); + ND_PRINT(" length"); UINT64OUT(); - printf(" flen"); + ND_PRINT(" flen"); UINT64OUT(); break; case 65541: /* CallBack rx conn address */ - printf(" addr"); + ND_PRINT(" addr"); UINTOUT(); default: ; @@ -965,7 +1046,7 @@ fs_print(register const u_char *bp, int length) return; trunc: - printf(" [|fs]"); + ND_PRINT(" [|fs]"); } /* @@ -973,51 +1054,53 @@ trunc: */ static void -fs_reply_print(register const u_char *bp, int length, int32_t opcode) +fs_reply_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint32_t opcode) { - unsigned long i; - struct rx_header *rxh; + uint32_t i; + const struct rx_header *rxh; + uint8_t type; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was * gleaned from fsint/afsint.xg */ - printf(" fs reply %s", tok2str(fs_req, "op#%d", opcode)); + ND_PRINT(" fs reply %s", tok2str(fs_req, "op#%u", opcode)); + type = GET_U_1(rxh->type); bp += sizeof(struct rx_header); /* * If it was a data packet, interpret the response */ - if (rxh->type == RX_PACKET_TYPE_DATA) { + if (type == RX_PACKET_TYPE_DATA) { switch (opcode) { case 131: /* Fetch ACL */ { char a[AFSOPAQUEMAX+1]; - TCHECK2(bp[0], 4); - i = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - TCHECK2(bp[0], i); - i = min(AFSOPAQUEMAX, i); - strncpy(a, (char *) bp, i); + i = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + ND_TCHECK_LEN(bp, i); + i = ND_MIN(AFSOPAQUEMAX, i); + strncpy(a, (const char *) bp, i); a[i] = '\0'; - acl_print((u_char *) a, sizeof(a), (u_char *) a + i); + acl_print(ndo, (u_char *) a, (u_char *) a + i); break; } case 137: /* Create file */ case 141: /* MakeDir */ - printf(" new"); + ND_PRINT(" new"); FIDOUT(); break; case 151: /* Get root volume */ - printf(" root volume"); + ND_PRINT(" root volume"); STROUT(AFSNAMEMAX); break; case 153: /* Get time */ @@ -1026,25 +1109,24 @@ fs_reply_print(register const u_char *bp, int length, int32_t opcode) default: ; } - } else if (rxh->type == RX_PACKET_TYPE_ABORT) { - int i; - + } else if (type == RX_PACKET_TYPE_ABORT) { /* * Otherwise, just print out the return code */ - TCHECK2(bp[0], sizeof(int32_t)); - i = (int) EXTRACT_32BITS(bp); + int32_t errcode; + + errcode = GET_BE_S_4(bp); bp += sizeof(int32_t); - printf(" error %s", tok2str(afs_fs_errors, "#%d", i)); + ND_PRINT(" error %s", tok2str(afs_fs_errors, "#%d", errcode)); } else { - printf(" strange fs reply of type %d", rxh->type); + ND_PRINT(" strange fs reply of type %u", type); } return; trunc: - printf(" [|fs]"); + ND_PRINT(" [|fs]"); } /* @@ -1057,80 +1139,67 @@ trunc: * * "positive" and "negative" are integers which contain the number of * positive and negative ACL's in the string. The uid/aclbits pair are - * ASCII strings containing the UID/PTS record and and a ascii number + * ASCII strings containing the UID/PTS record and an ASCII number * representing a logical OR of all the ACL permission bits */ +#define NUMSTRINGIFY(x) XSTRINGIFY(x) + static void -acl_print(u_char *s, int maxsize, u_char *end) +acl_print(netdissect_options *ndo, + u_char *s, u_char *end) { int pos, neg, acl; int n, i; - char *user; - char fmt[1024]; - - if ((user = (char *)malloc(maxsize)) == NULL) - return; + char user[USERNAMEMAX+1]; if (sscanf((char *) s, "%d %d\n%n", &pos, &neg, &n) != 2) - goto finish; + return; s += n; if (s > end) - goto finish; + return; /* * This wacky order preserves the order used by the "fs" command */ #define ACLOUT(acl) \ - if (acl & PRSFS_READ) \ - printf("r"); \ - if (acl & PRSFS_LOOKUP) \ - printf("l"); \ - if (acl & PRSFS_INSERT) \ - printf("i"); \ - if (acl & PRSFS_DELETE) \ - printf("d"); \ - if (acl & PRSFS_WRITE) \ - printf("w"); \ - if (acl & PRSFS_LOCK) \ - printf("k"); \ - if (acl & PRSFS_ADMINISTER) \ - printf("a"); + ND_PRINT("%s%s%s%s%s%s%s", \ + acl & PRSFS_READ ? "r" : "", \ + acl & PRSFS_LOOKUP ? "l" : "", \ + acl & PRSFS_INSERT ? "i" : "", \ + acl & PRSFS_DELETE ? "d" : "", \ + acl & PRSFS_WRITE ? "w" : "", \ + acl & PRSFS_LOCK ? "k" : "", \ + acl & PRSFS_ADMINISTER ? "a" : ""); for (i = 0; i < pos; i++) { - snprintf(fmt, sizeof(fmt), "%%%ds %%d\n%%n", maxsize - 1); - if (sscanf((char *) s, fmt, user, &acl, &n) != 2) - goto finish; + if (sscanf((char *) s, "%" NUMSTRINGIFY(USERNAMEMAX) "s %d\n%n", user, &acl, &n) != 2) + return; s += n; - printf(" +{"); - fn_print((u_char *)user, NULL); - printf(" "); + ND_PRINT(" +{"); + fn_print_str(ndo, (u_char *)user); + ND_PRINT(" "); ACLOUT(acl); - printf("}"); + ND_PRINT("}"); if (s > end) - goto finish; + return; } for (i = 0; i < neg; i++) { - snprintf(fmt, sizeof(fmt), "%%%ds %%d\n%%n", maxsize - 1); - if (sscanf((char *) s, fmt, user, &acl, &n) != 2) - goto finish; + if (sscanf((char *) s, "%" NUMSTRINGIFY(USERNAMEMAX) "s %d\n%n", user, &acl, &n) != 2) + return; s += n; - printf(" -{"); - fn_print((u_char *)user, NULL); - printf(" "); + ND_PRINT(" -{"); + fn_print_str(ndo, (u_char *)user); + ND_PRINT(" "); ACLOUT(acl); - printf("}"); + ND_PRINT("}"); if (s > end) - goto finish; + return; } - -finish: - free(user); - return; } #undef ACLOUT @@ -1140,26 +1209,23 @@ finish: */ static void -cb_print(register const u_char *bp, int length) +cb_print(netdissect_options *ndo, + const u_char *bp, u_int length) { - int cb_op; - unsigned long i; + uint32_t cb_op; + uint32_t i; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - if (snapend - bp + 1 <= (int)(sizeof(struct rx_header) + sizeof(int32_t))) { - goto trunc; - } - /* * Print out the afs call we're invoking. The table used here was * gleaned from fsint/afscbint.xg */ - cb_op = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + cb_op = GET_BE_U_4(bp + sizeof(struct rx_header)); - printf(" cb call %s", tok2str(cb_req, "op#%d", cb_op)); + ND_PRINT(" cb call %s", tok2str(cb_req, "op#%u", cb_op)); bp += sizeof(struct rx_header) + 4; @@ -1171,39 +1237,38 @@ cb_print(register const u_char *bp, int length) switch (cb_op) { case 204: /* Callback */ { - unsigned long j, t; - TCHECK2(bp[0], 4); - j = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t j, t; + j = GET_BE_U_4(bp); + bp += sizeof(uint32_t); for (i = 0; i < j; i++) { FIDOUT(); if (i != j - 1) - printf(","); + ND_PRINT(","); } if (j == 0) - printf(" "); + ND_PRINT(" "); - j = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + j = GET_BE_U_4(bp); + bp += sizeof(uint32_t); if (j != 0) - printf(";"); + ND_PRINT(";"); for (i = 0; i < j; i++) { - printf(" ver"); + ND_PRINT(" ver"); INTOUT(); - printf(" expires"); + ND_PRINT(" expires"); DATEOUT(); - TCHECK2(bp[0], 4); - t = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - tok2str(cb_types, "type %d", t); + t = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + tok2str(cb_types, "type %u", t); } + break; } case 214: { - printf(" afsuuid"); + ND_PRINT(" afsuuid"); AFSUUIDOUT(); break; } @@ -1214,7 +1279,7 @@ cb_print(register const u_char *bp, int length) return; trunc: - printf(" [|cb]"); + ND_PRINT(" [|cb]"); } /* @@ -1222,29 +1287,32 @@ trunc: */ static void -cb_reply_print(register const u_char *bp, int length, int32_t opcode) +cb_reply_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; + uint8_t type; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was * gleaned from fsint/afscbint.xg */ - printf(" cb reply %s", tok2str(cb_req, "op#%d", opcode)); + ND_PRINT(" cb reply %s", tok2str(cb_req, "op#%u", opcode)); + type = GET_U_1(rxh->type); bp += sizeof(struct rx_header); /* * If it was a data packet, interpret the response. */ - if (rxh->type == RX_PACKET_TYPE_DATA) + if (type == RX_PACKET_TYPE_DATA) switch (opcode) { case 213: /* InitCallBackState3 */ AFSUUIDOUT(); @@ -1256,14 +1324,14 @@ cb_reply_print(register const u_char *bp, int length, int32_t opcode) /* * Otherwise, just print out the return code */ - printf(" errcode"); + ND_PRINT(" errcode"); INTOUT(); } return; trunc: - printf(" [|cb]"); + ND_PRINT(" [|cb]"); } /* @@ -1271,33 +1339,30 @@ trunc: */ static void -prot_print(register const u_char *bp, int length) +prot_print(netdissect_options *ndo, + const u_char *bp, u_int length) { - unsigned long i; - int pt_op; + uint32_t i; + uint32_t pt_op; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - if (snapend - bp + 1 <= (int)(sizeof(struct rx_header) + sizeof(int32_t))) { - goto trunc; - } - /* * Print out the afs call we're invoking. The table used here was * gleaned from ptserver/ptint.xg */ - pt_op = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + pt_op = GET_BE_U_4(bp + sizeof(struct rx_header)); - printf(" pt"); + ND_PRINT(" pt"); if (is_ubik(pt_op)) { - ubik_print(bp); + ubik_print(ndo, bp); return; } - printf(" call %s", tok2str(pt_req, "op#%d", pt_op)); + ND_PRINT(" call %s", tok2str(pt_req, "op#%u", pt_op)); /* * Decode some of the arguments to the PT calls @@ -1308,9 +1373,9 @@ prot_print(register const u_char *bp, int length) switch (pt_op) { case 500: /* I New User */ STROUT(PRNAMEMAX); - printf(" id"); + ND_PRINT(" id"); INTOUT(); - printf(" oldid"); + ND_PRINT(" oldid"); INTOUT(); break; case 501: /* Where is it */ @@ -1322,27 +1387,26 @@ prot_print(register const u_char *bp, int length) case 518: /* Get CPS2 */ case 519: /* Get host CPS */ case 530: /* List super groups */ - printf(" id"); + ND_PRINT(" id"); INTOUT(); break; case 502: /* Dump entry */ - printf(" pos"); + ND_PRINT(" pos"); INTOUT(); break; case 503: /* Add to group */ case 507: /* Remove from group */ case 515: /* Is a member of? */ - printf(" uid"); + ND_PRINT(" uid"); INTOUT(); - printf(" gid"); + ND_PRINT(" gid"); INTOUT(); break; case 504: /* Name to ID */ { - unsigned long j; - TCHECK2(bp[0], 4); - j = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t j; + j = GET_BE_U_4(bp); + bp += sizeof(uint32_t); /* * Who designed this chicken-shit protocol? @@ -1355,46 +1419,45 @@ prot_print(register const u_char *bp, int length) VECOUT(PRNAMEMAX); } if (j == 0) - printf(" "); + ND_PRINT(" "); } break; case 505: /* Id to name */ { - unsigned long j; - printf(" ids:"); - TCHECK2(bp[0], 4); - i = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t j; + ND_PRINT(" ids:"); + i = GET_BE_U_4(bp); + bp += sizeof(uint32_t); for (j = 0; j < i; j++) INTOUT(); if (j == 0) - printf(" "); + ND_PRINT(" "); } break; case 509: /* New entry */ STROUT(PRNAMEMAX); - printf(" flag"); + ND_PRINT(" flag"); INTOUT(); - printf(" oid"); + ND_PRINT(" oid"); INTOUT(); break; case 511: /* Set max */ - printf(" id"); + ND_PRINT(" id"); INTOUT(); - printf(" gflag"); + ND_PRINT(" gflag"); INTOUT(); break; case 513: /* Change entry */ - printf(" id"); + ND_PRINT(" id"); INTOUT(); STROUT(PRNAMEMAX); - printf(" oldid"); + ND_PRINT(" oldid"); INTOUT(); - printf(" newid"); + ND_PRINT(" newid"); INTOUT(); break; case 520: /* Update entry */ - printf(" id"); + ND_PRINT(" id"); INTOUT(); STROUT(PRNAMEMAX); break; @@ -1406,7 +1469,7 @@ prot_print(register const u_char *bp, int length) return; trunc: - printf(" [|pt]"); + ND_PRINT(" [|pt]"); } /* @@ -1414,15 +1477,17 @@ trunc: */ static void -prot_reply_print(register const u_char *bp, int length, int32_t opcode) +prot_reply_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint32_t opcode) { - struct rx_header *rxh; - unsigned long i; + const struct rx_header *rxh; + uint8_t type; + uint32_t i; - if (length < (int)sizeof(struct rx_header)) + if (length < sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -1430,42 +1495,41 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode) * Ubik call, however. */ - printf(" pt"); + ND_PRINT(" pt"); if (is_ubik(opcode)) { - ubik_reply_print(bp, length, opcode); + ubik_reply_print(ndo, bp, length, opcode); return; } - printf(" reply %s", tok2str(pt_req, "op#%d", opcode)); + ND_PRINT(" reply %s", tok2str(pt_req, "op#%u", opcode)); + type = GET_U_1(rxh->type); bp += sizeof(struct rx_header); /* * If it was a data packet, interpret the response */ - if (rxh->type == RX_PACKET_TYPE_DATA) + if (type == RX_PACKET_TYPE_DATA) switch (opcode) { case 504: /* Name to ID */ { - unsigned long j; - printf(" ids:"); - TCHECK2(bp[0], 4); - i = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t j; + ND_PRINT(" ids:"); + i = GET_BE_U_4(bp); + bp += sizeof(uint32_t); for (j = 0; j < i; j++) INTOUT(); if (j == 0) - printf(" "); + ND_PRINT(" "); } break; case 505: /* ID to name */ { - unsigned long j; - TCHECK2(bp[0], 4); - j = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t j; + j = GET_BE_U_4(bp); + bp += sizeof(uint32_t); /* * Who designed this chicken-shit protocol? @@ -1478,7 +1542,7 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode) VECOUT(PRNAMEMAX); } if (j == 0) - printf(" "); + ND_PRINT(" "); } break; case 508: /* Get CPS */ @@ -1487,21 +1551,20 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode) case 518: /* Get CPS2 */ case 519: /* Get host CPS */ { - unsigned long j; - TCHECK2(bp[0], 4); - j = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t j; + j = GET_BE_U_4(bp); + bp += sizeof(uint32_t); for (i = 0; i < j; i++) { INTOUT(); } if (j == 0) - printf(" "); + ND_PRINT(" "); } break; case 510: /* List max */ - printf(" maxuid"); + ND_PRINT(" maxuid"); INTOUT(); - printf(" maxgid"); + ND_PRINT(" maxgid"); INTOUT(); break; default: @@ -1511,14 +1574,14 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode) /* * Otherwise, just print out the return code */ - printf(" errcode"); + ND_PRINT(" errcode"); INTOUT(); } return; trunc: - printf(" [|pt]"); + ND_PRINT(" [|pt]"); } /* @@ -1526,32 +1589,29 @@ trunc: */ static void -vldb_print(register const u_char *bp, int length) +vldb_print(netdissect_options *ndo, + const u_char *bp, u_int length) { - int vldb_op; - unsigned long i; + uint32_t vldb_op; + uint32_t i; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - if (snapend - bp + 1 <= (int)(sizeof(struct rx_header) + sizeof(int32_t))) { - goto trunc; - } - /* * Print out the afs call we're invoking. The table used here was * gleaned from vlserver/vldbint.xg */ - vldb_op = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + vldb_op = GET_BE_U_4(bp + sizeof(struct rx_header)); - printf(" vldb"); + ND_PRINT(" vldb"); if (is_ubik(vldb_op)) { - ubik_print(bp); + ubik_print(ndo, bp); return; } - printf(" call %s", tok2str(vldb_req, "op#%d", vldb_op)); + ND_PRINT(" call %s", tok2str(vldb_req, "op#%u", vldb_op)); /* * Decode some of the arguments to the VLDB calls @@ -1570,13 +1630,12 @@ vldb_print(register const u_char *bp, int length) case 508: /* Set lock */ case 509: /* Release lock */ case 518: /* Get entry by ID N */ - printf(" volid"); + ND_PRINT(" volid"); INTOUT(); - TCHECK2(bp[0], sizeof(int32_t)); - i = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + i = GET_BE_U_4(bp); + bp += sizeof(uint32_t); if (i <= 2) - printf(" type %s", voltype[i]); + ND_PRINT(" type %s", voltype[i]); break; case 504: /* Get entry by name */ case 519: /* Get entry by name N */ @@ -1585,23 +1644,22 @@ vldb_print(register const u_char *bp, int length) STROUT(VLNAMEMAX); break; case 505: /* Get new vol id */ - printf(" bump"); + ND_PRINT(" bump"); INTOUT(); break; case 506: /* Replace entry */ case 520: /* Replace entry N */ - printf(" volid"); + ND_PRINT(" volid"); INTOUT(); - TCHECK2(bp[0], sizeof(int32_t)); - i = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + i = GET_BE_U_4(bp); + bp += sizeof(uint32_t); if (i <= 2) - printf(" type %s", voltype[i]); + ND_PRINT(" type %s", voltype[i]); VECOUT(VLNAMEMAX); break; case 510: /* List entry */ case 521: /* List entry N */ - printf(" index"); + ND_PRINT(" index"); INTOUT(); break; default: @@ -1611,7 +1669,7 @@ vldb_print(register const u_char *bp, int length) return; trunc: - printf(" [|vldb]"); + ND_PRINT(" [|vldb]"); } /* @@ -1619,15 +1677,17 @@ trunc: */ static void -vldb_reply_print(register const u_char *bp, int length, int32_t opcode) +vldb_reply_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint32_t opcode) { - struct rx_header *rxh; - unsigned long i; + const struct rx_header *rxh; + uint8_t type; + uint32_t i; - if (length < (int)sizeof(struct rx_header)) + if (length < sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -1635,152 +1695,149 @@ vldb_reply_print(register const u_char *bp, int length, int32_t opcode) * Ubik call, however. */ - printf(" vldb"); + ND_PRINT(" vldb"); if (is_ubik(opcode)) { - ubik_reply_print(bp, length, opcode); + ubik_reply_print(ndo, bp, length, opcode); return; } - printf(" reply %s", tok2str(vldb_req, "op#%d", opcode)); + ND_PRINT(" reply %s", tok2str(vldb_req, "op#%u", opcode)); + type = GET_U_1(rxh->type); bp += sizeof(struct rx_header); /* * If it was a data packet, interpret the response */ - if (rxh->type == RX_PACKET_TYPE_DATA) + if (type == RX_PACKET_TYPE_DATA) switch (opcode) { case 510: /* List entry */ - printf(" count"); + ND_PRINT(" count"); INTOUT(); - printf(" nextindex"); + ND_PRINT(" nextindex"); INTOUT(); + ND_FALL_THROUGH; case 503: /* Get entry by id */ case 504: /* Get entry by name */ - { unsigned long nservers, j; + { uint32_t nservers, j; VECOUT(VLNAMEMAX); - TCHECK2(bp[0], sizeof(int32_t)); - bp += sizeof(int32_t); - printf(" numservers"); - TCHECK2(bp[0], sizeof(int32_t)); - nservers = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - printf(" %lu", nservers); - printf(" servers"); + ND_TCHECK_4(bp); + bp += sizeof(uint32_t); + ND_PRINT(" numservers"); + nservers = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + ND_PRINT(" %u", nservers); + ND_PRINT(" servers"); for (i = 0; i < 8; i++) { - TCHECK2(bp[0], sizeof(int32_t)); + ND_TCHECK_4(bp); if (i < nservers) - printf(" %s", - intoa(((struct in_addr *) bp)->s_addr)); - bp += sizeof(int32_t); + ND_PRINT(" %s", + intoa(GET_IPV4_TO_NETWORK_ORDER(bp))); + bp += sizeof(nd_ipv4); } - printf(" partitions"); + ND_PRINT(" partitions"); for (i = 0; i < 8; i++) { - TCHECK2(bp[0], sizeof(int32_t)); - j = EXTRACT_32BITS(bp); + j = GET_BE_U_4(bp); if (i < nservers && j <= 26) - printf(" %c", 'a' + (int)j); + ND_PRINT(" %c", 'a' + j); else if (i < nservers) - printf(" %lu", j); - bp += sizeof(int32_t); + ND_PRINT(" %u", j); + bp += sizeof(uint32_t); } - TCHECK2(bp[0], 8 * sizeof(int32_t)); - bp += 8 * sizeof(int32_t); - printf(" rwvol"); + ND_TCHECK_LEN(bp, 8 * sizeof(uint32_t)); + bp += 8 * sizeof(uint32_t); + ND_PRINT(" rwvol"); UINTOUT(); - printf(" rovol"); + ND_PRINT(" rovol"); UINTOUT(); - printf(" backup"); + ND_PRINT(" backup"); UINTOUT(); } break; case 505: /* Get new volume ID */ - printf(" newvol"); + ND_PRINT(" newvol"); UINTOUT(); break; case 521: /* List entry */ case 529: /* List entry U */ - printf(" count"); + ND_PRINT(" count"); INTOUT(); - printf(" nextindex"); + ND_PRINT(" nextindex"); INTOUT(); + ND_FALL_THROUGH; case 518: /* Get entry by ID N */ case 519: /* Get entry by name N */ - { unsigned long nservers, j; + { uint32_t nservers, j; VECOUT(VLNAMEMAX); - printf(" numservers"); - TCHECK2(bp[0], sizeof(int32_t)); - nservers = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - printf(" %lu", nservers); - printf(" servers"); + ND_PRINT(" numservers"); + nservers = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + ND_PRINT(" %u", nservers); + ND_PRINT(" servers"); for (i = 0; i < 13; i++) { - TCHECK2(bp[0], sizeof(int32_t)); + ND_TCHECK_4(bp); if (i < nservers) - printf(" %s", - intoa(((struct in_addr *) bp)->s_addr)); - bp += sizeof(int32_t); + ND_PRINT(" %s", + intoa(GET_IPV4_TO_NETWORK_ORDER(bp))); + bp += sizeof(nd_ipv4); } - printf(" partitions"); + ND_PRINT(" partitions"); for (i = 0; i < 13; i++) { - TCHECK2(bp[0], sizeof(int32_t)); - j = EXTRACT_32BITS(bp); + j = GET_BE_U_4(bp); if (i < nservers && j <= 26) - printf(" %c", 'a' + (int)j); + ND_PRINT(" %c", 'a' + j); else if (i < nservers) - printf(" %lu", j); - bp += sizeof(int32_t); + ND_PRINT(" %u", j); + bp += sizeof(uint32_t); } - TCHECK2(bp[0], 13 * sizeof(int32_t)); - bp += 13 * sizeof(int32_t); - printf(" rwvol"); + ND_TCHECK_LEN(bp, 13 * sizeof(uint32_t)); + bp += 13 * sizeof(uint32_t); + ND_PRINT(" rwvol"); UINTOUT(); - printf(" rovol"); + ND_PRINT(" rovol"); UINTOUT(); - printf(" backup"); + ND_PRINT(" backup"); UINTOUT(); } break; case 526: /* Get entry by ID U */ case 527: /* Get entry by name U */ - { unsigned long nservers, j; + { uint32_t nservers, j; VECOUT(VLNAMEMAX); - printf(" numservers"); - TCHECK2(bp[0], sizeof(int32_t)); - nservers = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - printf(" %lu", nservers); - printf(" servers"); + ND_PRINT(" numservers"); + nservers = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + ND_PRINT(" %u", nservers); + ND_PRINT(" servers"); for (i = 0; i < 13; i++) { if (i < nservers) { - printf(" afsuuid"); + ND_PRINT(" afsuuid"); AFSUUIDOUT(); } else { - TCHECK2(bp[0], 44); + ND_TCHECK_LEN(bp, 44); bp += 44; } } - TCHECK2(bp[0], 4 * 13); + ND_TCHECK_LEN(bp, 4 * 13); bp += 4 * 13; - printf(" partitions"); + ND_PRINT(" partitions"); for (i = 0; i < 13; i++) { - TCHECK2(bp[0], sizeof(int32_t)); - j = EXTRACT_32BITS(bp); + j = GET_BE_U_4(bp); if (i < nservers && j <= 26) - printf(" %c", 'a' + (int)j); + ND_PRINT(" %c", 'a' + j); else if (i < nservers) - printf(" %lu", j); - bp += sizeof(int32_t); + ND_PRINT(" %u", j); + bp += sizeof(uint32_t); } - TCHECK2(bp[0], 13 * sizeof(int32_t)); - bp += 13 * sizeof(int32_t); - printf(" rwvol"); + ND_TCHECK_LEN(bp, 13 * sizeof(uint32_t)); + bp += 13 * sizeof(uint32_t); + ND_PRINT(" rwvol"); UINTOUT(); - printf(" rovol"); + ND_PRINT(" rovol"); UINTOUT(); - printf(" backup"); + ND_PRINT(" backup"); UINTOUT(); } default: @@ -1791,14 +1848,14 @@ vldb_reply_print(register const u_char *bp, int length, int32_t opcode) /* * Otherwise, just print out the return code */ - printf(" errcode"); + ND_PRINT(" errcode"); INTOUT(); } return; trunc: - printf(" [|vldb]"); + ND_PRINT(" [|vldb]"); } /* @@ -1806,33 +1863,30 @@ trunc: */ static void -kauth_print(register const u_char *bp, int length) +kauth_print(netdissect_options *ndo, + const u_char *bp, u_int length) { - int kauth_op; + uint32_t kauth_op; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - if (snapend - bp + 1 <= (int)(sizeof(struct rx_header) + sizeof(int32_t))) { - goto trunc; - } - /* * Print out the afs call we're invoking. The table used here was * gleaned from kauth/kauth.rg */ - kauth_op = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + kauth_op = GET_BE_U_4(bp + sizeof(struct rx_header)); - printf(" kauth"); + ND_PRINT(" kauth"); if (is_ubik(kauth_op)) { - ubik_print(bp); + ubik_print(ndo, bp); return; } - printf(" call %s", tok2str(kauth_req, "op#%d", kauth_op)); + ND_PRINT(" call %s", tok2str(kauth_req, "op#%u", kauth_op)); /* * Decode some of the arguments to the KA calls @@ -1841,7 +1895,7 @@ kauth_print(register const u_char *bp, int length) bp += sizeof(struct rx_header) + 4; switch (kauth_op) { - case 1: /* Authenticate old */; + case 1: /* Authenticate old */ case 21: /* Authenticate */ case 22: /* Authenticate-V2 */ case 2: /* Change PW */ @@ -1851,37 +1905,36 @@ kauth_print(register const u_char *bp, int length) case 8: /* Get entry */ case 14: /* Unlock */ case 15: /* Lock status */ - printf(" principal"); + ND_PRINT(" principal"); STROUT(KANAMEMAX); STROUT(KANAMEMAX); break; case 3: /* GetTicket-old */ case 23: /* GetTicket */ { - int i; - printf(" kvno"); + uint32_t i; + ND_PRINT(" kvno"); INTOUT(); - printf(" domain"); + ND_PRINT(" domain"); STROUT(KANAMEMAX); - TCHECK2(bp[0], sizeof(int32_t)); - i = (int) EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - TCHECK2(bp[0], i); + i = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + ND_TCHECK_LEN(bp, i); bp += i; - printf(" principal"); + ND_PRINT(" principal"); STROUT(KANAMEMAX); STROUT(KANAMEMAX); break; } case 4: /* Set Password */ - printf(" principal"); + ND_PRINT(" principal"); STROUT(KANAMEMAX); STROUT(KANAMEMAX); - printf(" kvno"); + ND_PRINT(" kvno"); INTOUT(); break; case 12: /* Get password */ - printf(" name"); + ND_PRINT(" name"); STROUT(KANAMEMAX); break; default: @@ -1891,7 +1944,7 @@ kauth_print(register const u_char *bp, int length) return; trunc: - printf(" [|kauth]"); + ND_PRINT(" [|kauth]"); } /* @@ -1899,50 +1952,48 @@ trunc: */ static void -kauth_reply_print(register const u_char *bp, int length, int32_t opcode) +kauth_reply_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; + uint8_t type; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was * gleaned from kauth/kauth.rg */ - printf(" kauth"); + ND_PRINT(" kauth"); if (is_ubik(opcode)) { - ubik_reply_print(bp, length, opcode); + ubik_reply_print(ndo, bp, length, opcode); return; } - printf(" reply %s", tok2str(kauth_req, "op#%d", opcode)); + ND_PRINT(" reply %s", tok2str(kauth_req, "op#%u", opcode)); + type = GET_U_1(rxh->type); bp += sizeof(struct rx_header); /* * If it was a data packet, interpret the response. */ - if (rxh->type == RX_PACKET_TYPE_DATA) + if (type == RX_PACKET_TYPE_DATA) /* Well, no, not really. Leave this for later */ ; else { /* * Otherwise, just print out the return code */ - printf(" errcode"); + ND_PRINT(" errcode"); INTOUT(); } - - return; - -trunc: - printf(" [|kauth]"); } /* @@ -1950,144 +2001,141 @@ trunc: */ static void -vol_print(register const u_char *bp, int length) +vol_print(netdissect_options *ndo, + const u_char *bp, u_int length) { - int vol_op; + uint32_t vol_op; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - if (snapend - bp + 1 <= (int)(sizeof(struct rx_header) + sizeof(int32_t))) { - goto trunc; - } - /* * Print out the afs call we're invoking. The table used here was * gleaned from volser/volint.xg */ - vol_op = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + vol_op = GET_BE_U_4(bp + sizeof(struct rx_header)); - printf(" vol call %s", tok2str(vol_req, "op#%d", vol_op)); + ND_PRINT(" vol call %s", tok2str(vol_req, "op#%u", vol_op)); bp += sizeof(struct rx_header) + 4; switch (vol_op) { case 100: /* Create volume */ - printf(" partition"); + ND_PRINT(" partition"); UINTOUT(); - printf(" name"); + ND_PRINT(" name"); STROUT(AFSNAMEMAX); - printf(" type"); + ND_PRINT(" type"); UINTOUT(); - printf(" parent"); + ND_PRINT(" parent"); UINTOUT(); break; case 101: /* Delete volume */ case 107: /* Get flags */ - printf(" trans"); + ND_PRINT(" trans"); UINTOUT(); break; case 102: /* Restore */ - printf(" totrans"); + ND_PRINT(" totrans"); UINTOUT(); - printf(" flags"); + ND_PRINT(" flags"); UINTOUT(); break; case 103: /* Forward */ - printf(" fromtrans"); + ND_PRINT(" fromtrans"); UINTOUT(); - printf(" fromdate"); + ND_PRINT(" fromdate"); DATEOUT(); DESTSERVEROUT(); - printf(" desttrans"); + ND_PRINT(" desttrans"); INTOUT(); break; case 104: /* End trans */ - printf(" trans"); + ND_PRINT(" trans"); UINTOUT(); break; case 105: /* Clone */ - printf(" trans"); + ND_PRINT(" trans"); UINTOUT(); - printf(" purgevol"); + ND_PRINT(" purgevol"); UINTOUT(); - printf(" newtype"); + ND_PRINT(" newtype"); UINTOUT(); - printf(" newname"); + ND_PRINT(" newname"); STROUT(AFSNAMEMAX); break; case 106: /* Set flags */ - printf(" trans"); + ND_PRINT(" trans"); UINTOUT(); - printf(" flags"); + ND_PRINT(" flags"); UINTOUT(); break; case 108: /* Trans create */ - printf(" vol"); + ND_PRINT(" vol"); UINTOUT(); - printf(" partition"); + ND_PRINT(" partition"); UINTOUT(); - printf(" flags"); + ND_PRINT(" flags"); UINTOUT(); break; case 109: /* Dump */ case 655537: /* Get size */ - printf(" fromtrans"); + ND_PRINT(" fromtrans"); UINTOUT(); - printf(" fromdate"); + ND_PRINT(" fromdate"); DATEOUT(); break; case 110: /* Get n-th volume */ - printf(" index"); + ND_PRINT(" index"); UINTOUT(); break; case 111: /* Set forwarding */ - printf(" tid"); + ND_PRINT(" tid"); UINTOUT(); - printf(" newsite"); + ND_PRINT(" newsite"); UINTOUT(); break; case 112: /* Get name */ case 113: /* Get status */ - printf(" tid"); + ND_PRINT(" tid"); break; case 114: /* Signal restore */ - printf(" name"); + ND_PRINT(" name"); STROUT(AFSNAMEMAX); - printf(" type"); + ND_PRINT(" type"); UINTOUT(); - printf(" pid"); + ND_PRINT(" pid"); UINTOUT(); - printf(" cloneid"); + ND_PRINT(" cloneid"); UINTOUT(); break; case 116: /* List volumes */ - printf(" partition"); + ND_PRINT(" partition"); UINTOUT(); - printf(" flags"); + ND_PRINT(" flags"); UINTOUT(); break; case 117: /* Set id types */ - printf(" tid"); + ND_PRINT(" tid"); UINTOUT(); - printf(" name"); + ND_PRINT(" name"); STROUT(AFSNAMEMAX); - printf(" type"); + ND_PRINT(" type"); UINTOUT(); - printf(" pid"); + ND_PRINT(" pid"); UINTOUT(); - printf(" clone"); + ND_PRINT(" clone"); UINTOUT(); - printf(" backup"); + ND_PRINT(" backup"); UINTOUT(); break; case 119: /* Partition info */ - printf(" name"); + ND_PRINT(" name"); STROUT(AFSNAMEMAX); break; case 120: /* Reclone */ - printf(" tid"); + ND_PRINT(" tid"); UINTOUT(); break; case 121: /* List one volume */ @@ -2095,46 +2143,45 @@ vol_print(register const u_char *bp, int length) case 124: /* Extended List volumes */ case 125: /* Extended List one volume */ case 65536: /* Convert RO to RW volume */ - printf(" partid"); + ND_PRINT(" partid"); UINTOUT(); - printf(" volid"); + ND_PRINT(" volid"); UINTOUT(); break; case 123: /* Set date */ - printf(" tid"); + ND_PRINT(" tid"); UINTOUT(); - printf(" date"); + ND_PRINT(" date"); DATEOUT(); break; case 126: /* Set info */ - printf(" tid"); + ND_PRINT(" tid"); UINTOUT(); break; case 128: /* Forward multiple */ - printf(" fromtrans"); + ND_PRINT(" fromtrans"); UINTOUT(); - printf(" fromdate"); + ND_PRINT(" fromdate"); DATEOUT(); { - unsigned long i, j; - TCHECK2(bp[0], 4); - j = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t i, j; + j = GET_BE_U_4(bp); + bp += sizeof(uint32_t); for (i = 0; i < j; i++) { DESTSERVEROUT(); if (i != j - 1) - printf(","); + ND_PRINT(","); } if (j == 0) - printf(" "); + ND_PRINT(" "); } break; case 65538: /* Dump version 2 */ - printf(" fromtrans"); + ND_PRINT(" fromtrans"); UINTOUT(); - printf(" fromdate"); + ND_PRINT(" fromdate"); DATEOUT(); - printf(" flags"); + ND_PRINT(" flags"); UINTOUT(); break; default: @@ -2143,7 +2190,7 @@ vol_print(register const u_char *bp, int length) return; trunc: - printf(" [|vol]"); + ND_PRINT(" [|vol]"); } /* @@ -2151,91 +2198,94 @@ trunc: */ static void -vol_reply_print(register const u_char *bp, int length, int32_t opcode) +vol_reply_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; + uint8_t type; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was * gleaned from volser/volint.xg */ - printf(" vol reply %s", tok2str(vol_req, "op#%d", opcode)); + ND_PRINT(" vol reply %s", tok2str(vol_req, "op#%u", opcode)); + type = GET_U_1(rxh->type); bp += sizeof(struct rx_header); /* * If it was a data packet, interpret the response. */ - if (rxh->type == RX_PACKET_TYPE_DATA) { + if (type == RX_PACKET_TYPE_DATA) { switch (opcode) { case 100: /* Create volume */ - printf(" volid"); + ND_PRINT(" volid"); UINTOUT(); - printf(" trans"); + ND_PRINT(" trans"); UINTOUT(); break; case 104: /* End transaction */ UINTOUT(); break; case 105: /* Clone */ - printf(" newvol"); + ND_PRINT(" newvol"); UINTOUT(); break; case 107: /* Get flags */ UINTOUT(); break; case 108: /* Transaction create */ - printf(" trans"); + ND_PRINT(" trans"); UINTOUT(); break; case 110: /* Get n-th volume */ - printf(" volume"); + ND_PRINT(" volume"); UINTOUT(); - printf(" partition"); + ND_PRINT(" partition"); UINTOUT(); break; case 112: /* Get name */ STROUT(AFSNAMEMAX); break; case 113: /* Get status */ - printf(" volid"); + ND_PRINT(" volid"); UINTOUT(); - printf(" nextuniq"); + ND_PRINT(" nextuniq"); UINTOUT(); - printf(" type"); + ND_PRINT(" type"); UINTOUT(); - printf(" parentid"); + ND_PRINT(" parentid"); UINTOUT(); - printf(" clone"); + ND_PRINT(" clone"); UINTOUT(); - printf(" backup"); + ND_PRINT(" backup"); UINTOUT(); - printf(" restore"); + ND_PRINT(" restore"); UINTOUT(); - printf(" maxquota"); + ND_PRINT(" maxquota"); UINTOUT(); - printf(" minquota"); + ND_PRINT(" minquota"); UINTOUT(); - printf(" owner"); + ND_PRINT(" owner"); UINTOUT(); - printf(" create"); + ND_PRINT(" create"); DATEOUT(); - printf(" access"); + ND_PRINT(" access"); DATEOUT(); - printf(" update"); + ND_PRINT(" update"); DATEOUT(); - printf(" expire"); + ND_PRINT(" expire"); DATEOUT(); - printf(" backup"); + ND_PRINT(" backup"); DATEOUT(); - printf(" copy"); + ND_PRINT(" copy"); DATEOUT(); break; case 115: /* Old list partitions */ @@ -2243,25 +2293,24 @@ vol_reply_print(register const u_char *bp, int length, int32_t opcode) case 116: /* List volumes */ case 121: /* List one volume */ { - unsigned long i, j; - TCHECK2(bp[0], 4); - j = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); + uint32_t i, j; + j = GET_BE_U_4(bp); + bp += sizeof(uint32_t); for (i = 0; i < j; i++) { - printf(" name"); + ND_PRINT(" name"); VECOUT(32); - printf(" volid"); + ND_PRINT(" volid"); UINTOUT(); - printf(" type"); - bp += sizeof(int32_t) * 21; + ND_PRINT(" type"); + bp += sizeof(uint32_t) * 21; if (i != j - 1) - printf(","); + ND_PRINT(","); } if (j == 0) - printf(" "); + ND_PRINT(" "); } break; - + default: ; @@ -2270,14 +2319,14 @@ vol_reply_print(register const u_char *bp, int length, int32_t opcode) /* * Otherwise, just print out the return code */ - printf(" errcode"); + ND_PRINT(" errcode"); INTOUT(); } return; trunc: - printf(" [|vol]"); + ND_PRINT(" [|vol]"); } /* @@ -2285,25 +2334,22 @@ trunc: */ static void -bos_print(register const u_char *bp, int length) +bos_print(netdissect_options *ndo, + const u_char *bp, u_int length) { - int bos_op; + uint32_t bos_op; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - if (snapend - bp + 1 <= (int)(sizeof(struct rx_header) + sizeof(int32_t))) { - goto trunc; - } - /* * Print out the afs call we're invoking. The table used here was * gleaned from bozo/bosint.xg */ - bos_op = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + bos_op = GET_BE_U_4(bp + sizeof(struct rx_header)); - printf(" bos call %s", tok2str(bos_req, "op#%d", bos_op)); + ND_PRINT(" bos call %s", tok2str(bos_req, "op#%u", bos_op)); /* * Decode some of the arguments to the BOS calls @@ -2313,9 +2359,9 @@ bos_print(register const u_char *bp, int length) switch (bos_op) { case 80: /* Create B node */ - printf(" type"); + ND_PRINT(" type"); STROUT(BOSNAMEMAX); - printf(" instance"); + ND_PRINT(" instance"); STROUT(BOSNAMEMAX); break; case 81: /* Delete B node */ @@ -2336,12 +2382,12 @@ bos_print(register const u_char *bp, int length) case 82: /* Set status */ case 98: /* Set T status */ STROUT(BOSNAMEMAX); - printf(" status"); + ND_PRINT(" status"); INTOUT(); break; case 86: /* Get instance parm */ STROUT(BOSNAMEMAX); - printf(" num"); + ND_PRINT(" num"); INTOUT(); break; case 84: /* Enumerate instance */ @@ -2354,11 +2400,11 @@ bos_print(register const u_char *bp, int length) break; case 105: /* Install */ STROUT(BOSNAMEMAX); - printf(" size"); + ND_PRINT(" size"); INTOUT(); - printf(" flags"); + ND_PRINT(" flags"); INTOUT(); - printf(" date"); + ND_PRINT(" date"); INTOUT(); break; default: @@ -2368,7 +2414,7 @@ bos_print(register const u_char *bp, int length) return; trunc: - printf(" [|bos]"); + ND_PRINT(" [|bos]"); } /* @@ -2376,43 +2422,41 @@ trunc: */ static void -bos_reply_print(register const u_char *bp, int length, int32_t opcode) +bos_reply_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; + uint8_t type; - if (length <= (int)sizeof(struct rx_header)) + if (length <= sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was * gleaned from volser/volint.xg */ - printf(" bos reply %s", tok2str(bos_req, "op#%d", opcode)); + ND_PRINT(" bos reply %s", tok2str(bos_req, "op#%u", opcode)); + type = GET_U_1(rxh->type); bp += sizeof(struct rx_header); /* * If it was a data packet, interpret the response. */ - if (rxh->type == RX_PACKET_TYPE_DATA) + if (type == RX_PACKET_TYPE_DATA) /* Well, no, not really. Leave this for later */ ; else { /* * Otherwise, just print out the return code */ - printf(" errcode"); + ND_PRINT(" errcode"); INTOUT(); } - - return; - -trunc: - printf(" [|bos]"); } /* @@ -2420,7 +2464,7 @@ trunc: */ static int -is_ubik(u_int32_t opcode) +is_ubik(uint32_t opcode) { if ((opcode >= VOTE_LOW && opcode <= VOTE_HIGH) || (opcode >= DISK_LOW && opcode <= DISK_HIGH)) @@ -2434,19 +2478,24 @@ is_ubik(u_int32_t opcode) */ static void -ubik_print(register const u_char *bp) +ubik_print(netdissect_options *ndo, + const u_char *bp) { - int ubik_op; - int32_t temp; + uint32_t ubik_op; + uint32_t temp; /* * Print out the afs call we're invoking. The table used here was * gleaned from ubik/ubik_int.xg */ - ubik_op = EXTRACT_32BITS(bp + sizeof(struct rx_header)); + /* Every function that calls this function first makes a bounds check + * for (sizeof(rx_header) + 4) bytes, so long as it remains this way + * the line below will not over-read. + */ + ubik_op = GET_BE_U_4(bp + sizeof(struct rx_header)); - printf(" ubik call %s", tok2str(ubik_req, "op#%d", ubik_op)); + ND_PRINT(" ubik call %s", tok2str(ubik_req, "op#%u", ubik_op)); /* * Decode some of the arguments to the Ubik calls @@ -2456,19 +2505,18 @@ ubik_print(register const u_char *bp) switch (ubik_op) { case 10000: /* Beacon */ - TCHECK2(bp[0], 4); - temp = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - printf(" syncsite %s", temp ? "yes" : "no"); - printf(" votestart"); + temp = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + ND_PRINT(" syncsite %s", temp ? "yes" : "no"); + ND_PRINT(" votestart"); DATEOUT(); - printf(" dbversion"); + ND_PRINT(" dbversion"); UBIK_VERSIONOUT(); - printf(" tid"); + ND_PRINT(" tid"); UBIK_VERSIONOUT(); break; case 10003: /* Get sync site */ - printf(" site"); + ND_PRINT(" site"); UINTOUT(); break; case 20000: /* Begin */ @@ -2476,56 +2524,56 @@ ubik_print(register const u_char *bp) case 20007: /* Abort */ case 20008: /* Release locks */ case 20010: /* Writev */ - printf(" tid"); + ND_PRINT(" tid"); UBIK_VERSIONOUT(); break; case 20002: /* Lock */ - printf(" tid"); + ND_PRINT(" tid"); UBIK_VERSIONOUT(); - printf(" file"); + ND_PRINT(" file"); INTOUT(); - printf(" pos"); + ND_PRINT(" pos"); INTOUT(); - printf(" length"); + ND_PRINT(" length"); INTOUT(); - temp = EXTRACT_32BITS(bp); - bp += sizeof(int32_t); - tok2str(ubik_lock_types, "type %d", temp); + temp = GET_BE_U_4(bp); + bp += sizeof(uint32_t); + tok2str(ubik_lock_types, "type %u", temp); break; case 20003: /* Write */ - printf(" tid"); + ND_PRINT(" tid"); UBIK_VERSIONOUT(); - printf(" file"); + ND_PRINT(" file"); INTOUT(); - printf(" pos"); + ND_PRINT(" pos"); INTOUT(); break; case 20005: /* Get file */ - printf(" file"); + ND_PRINT(" file"); INTOUT(); break; case 20006: /* Send file */ - printf(" file"); + ND_PRINT(" file"); INTOUT(); - printf(" length"); + ND_PRINT(" length"); INTOUT(); - printf(" dbversion"); + ND_PRINT(" dbversion"); UBIK_VERSIONOUT(); break; case 20009: /* Truncate */ - printf(" tid"); + ND_PRINT(" tid"); UBIK_VERSIONOUT(); - printf(" file"); + ND_PRINT(" file"); INTOUT(); - printf(" length"); + ND_PRINT(" length"); INTOUT(); break; case 20012: /* Set version */ - printf(" tid"); + ND_PRINT(" tid"); UBIK_VERSIONOUT(); - printf(" oldversion"); + ND_PRINT(" oldversion"); UBIK_VERSIONOUT(); - printf(" newversion"); + ND_PRINT(" newversion"); UBIK_VERSIONOUT(); break; default: @@ -2535,7 +2583,7 @@ ubik_print(register const u_char *bp) return; trunc: - printf(" [|ubik]"); + ND_PRINT(" [|ubik]"); } /* @@ -2543,35 +2591,38 @@ trunc: */ static void -ubik_reply_print(register const u_char *bp, int length, int32_t opcode) +ubik_reply_print(netdissect_options *ndo, + const u_char *bp, u_int length, uint32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; + uint8_t type; - if (length < (int)sizeof(struct rx_header)) + if (length < sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the ubik call we're invoking. This table was gleaned * from ubik/ubik_int.xg */ - printf(" ubik reply %s", tok2str(ubik_req, "op#%d", opcode)); + ND_PRINT(" ubik reply %s", tok2str(ubik_req, "op#%u", opcode)); + type = GET_U_1(rxh->type); bp += sizeof(struct rx_header); /* * If it was a data packet, print out the arguments to the Ubik calls */ - if (rxh->type == RX_PACKET_TYPE_DATA) + if (type == RX_PACKET_TYPE_DATA) switch (opcode) { case 10000: /* Beacon */ - printf(" vote no"); + ND_PRINT(" vote no"); break; case 20004: /* Get version */ - printf(" dbversion"); + ND_PRINT(" dbversion"); UBIK_VERSIONOUT(); break; default: @@ -2579,7 +2630,7 @@ ubik_reply_print(register const u_char *bp, int length, int32_t opcode) } /* - * Otherwise, print out "yes" it it was a beacon packet (because + * Otherwise, print out "yes" if it was a beacon packet (because * that's how yes votes are returned, go figure), otherwise * just print out the error code. */ @@ -2587,18 +2638,18 @@ ubik_reply_print(register const u_char *bp, int length, int32_t opcode) else switch (opcode) { case 10000: /* Beacon */ - printf(" vote yes until"); + ND_PRINT(" vote yes until"); DATEOUT(); break; default: - printf(" errcode"); + ND_PRINT(" errcode"); INTOUT(); } return; trunc: - printf(" [|ubik]"); + ND_PRINT(" [|ubik]"); } /* @@ -2606,43 +2657,37 @@ trunc: */ static void -rx_ack_print(register const u_char *bp, int length) +rx_ack_print(netdissect_options *ndo, + const u_char *bp, u_int length) { - struct rx_ackPacket *rxa; + const struct rx_ackPacket *rxa; + uint8_t nAcks; int i, start, last; - u_int32_t firstPacket; + uint32_t firstPacket; - if (length < (int)sizeof(struct rx_header)) + if (length < sizeof(struct rx_header)) return; bp += sizeof(struct rx_header); - /* - * This may seem a little odd .... the rx_ackPacket structure - * contains an array of individual packet acknowledgements - * (used for selective ack/nack), but since it's variable in size, - * we don't want to truncate based on the size of the whole - * rx_ackPacket structure. - */ - - TCHECK2(bp[0], sizeof(struct rx_ackPacket) - RX_MAXACKS); + ND_TCHECK_LEN(bp, sizeof(struct rx_ackPacket)); - rxa = (struct rx_ackPacket *) bp; - bp += (sizeof(struct rx_ackPacket) - RX_MAXACKS); + rxa = (const struct rx_ackPacket *) bp; + bp += sizeof(struct rx_ackPacket); /* * Print out a few useful things from the ack packet structure */ - if (vflag > 2) - printf(" bufspace %d maxskew %d", - (int) EXTRACT_16BITS(&rxa->bufferSpace), - (int) EXTRACT_16BITS(&rxa->maxSkew)); + if (ndo->ndo_vflag > 2) + ND_PRINT(" bufspace %u maxskew %u", + GET_BE_U_2(rxa->bufferSpace), + GET_BE_U_2(rxa->maxSkew)); - firstPacket = EXTRACT_32BITS(&rxa->firstPacket); - printf(" first %d serial %d reason %s", - firstPacket, EXTRACT_32BITS(&rxa->serial), - tok2str(rx_ack_reasons, "#%d", (int) rxa->reason)); + firstPacket = GET_BE_U_4(rxa->firstPacket); + ND_PRINT(" first %u serial %u reason %s", + firstPacket, GET_BE_U_4(rxa->serial), + tok2str(rx_ack_reasons, "#%u", GET_U_1(rxa->reason))); /* * Okay, now we print out the ack array. The way _this_ works @@ -2663,17 +2708,18 @@ rx_ack_print(register const u_char *bp, int length) * to bp after this, so bp ends up at the right spot. Go figure. */ - if (rxa->nAcks != 0) { + nAcks = GET_U_1(rxa->nAcks); + if (nAcks != 0) { - TCHECK2(bp[0], rxa->nAcks); + ND_TCHECK_LEN(bp, nAcks); /* * Sigh, this is gross, but it seems to work to collapse * ranges correctly. */ - for (i = 0, start = last = -2; i < rxa->nAcks; i++) - if (rxa->acks[i] == RX_ACK_TYPE_ACK) { + for (i = 0, start = last = -2; i < nAcks; i++) + if (GET_U_1(bp + i) == RX_ACK_TYPE_ACK) { /* * I figured this deserved _some_ explanation. @@ -2683,22 +2729,21 @@ rx_ack_print(register const u_char *bp, int length) */ if (last == -2) { - printf(" acked %d", - firstPacket + i); + ND_PRINT(" acked %u", firstPacket + i); start = i; } /* - * Otherwise, if the there is a skip in + * Otherwise, if there is a skip in * the range (such as an nacked packet in * the middle of some acked packets), * then print the current packet number - * seperated from the last number by + * separated from the last number by * a comma. */ else if (last != i - 1) { - printf(",%d", firstPacket + i); + ND_PRINT(",%u", firstPacket + i); start = i; } @@ -2716,7 +2761,7 @@ rx_ack_print(register const u_char *bp, int length) * we hit a nack ... in _this_ case we * want to print out the range of packets * that were acked, so we need to print - * the _previous_ packet number seperated + * the _previous_ packet number separated * from the first by a dash (-). Since we * already printed the first packet above, * just print the final packet. Don't @@ -2724,7 +2769,7 @@ rx_ack_print(register const u_char *bp, int length) * range. */ } else if (last == i - 1 && start != last) - printf("-%d", firstPacket + i - 1); + ND_PRINT("-%u", firstPacket + i - 1); /* * So, what's going on here? We ran off the end of the @@ -2738,61 +2783,62 @@ rx_ack_print(register const u_char *bp, int length) */ if (last == i - 1 && start != last) - printf("-%d", firstPacket + i - 1); + ND_PRINT("-%u", firstPacket + i - 1); /* * Same as above, just without comments */ - for (i = 0, start = last = -2; i < rxa->nAcks; i++) - if (rxa->acks[i] == RX_ACK_TYPE_NACK) { + for (i = 0, start = last = -2; i < nAcks; i++) + if (GET_U_1(bp + i) == RX_ACK_TYPE_NACK) { if (last == -2) { - printf(" nacked %d", - firstPacket + i); + ND_PRINT(" nacked %u", firstPacket + i); start = i; } else if (last != i - 1) { - printf(",%d", firstPacket + i); + ND_PRINT(",%u", firstPacket + i); start = i; } last = i; } else if (last == i - 1 && start != last) - printf("-%d", firstPacket + i - 1); + ND_PRINT("-%u", firstPacket + i - 1); if (last == i - 1 && start != last) - printf("-%d", firstPacket + i - 1); + ND_PRINT("-%u", firstPacket + i - 1); - bp += rxa->nAcks; + bp += nAcks; } + /* Padding. */ + bp += 3; /* * These are optional fields; depending on your version of AFS, * you may or may not see them */ -#define TRUNCRET(n) if (snapend - bp + 1 <= n) return; +#define TRUNCRET(n) if (ndo->ndo_snapend - bp + 1 <= n) return; - if (vflag > 1) { + if (ndo->ndo_vflag > 1) { TRUNCRET(4); - printf(" ifmtu"); - INTOUT(); + ND_PRINT(" ifmtu"); + UINTOUT(); TRUNCRET(4); - printf(" maxmtu"); - INTOUT(); + ND_PRINT(" maxmtu"); + UINTOUT(); TRUNCRET(4); - printf(" rwind"); - INTOUT(); + ND_PRINT(" rwind"); + UINTOUT(); TRUNCRET(4); - printf(" maxpackets"); - INTOUT(); + ND_PRINT(" maxpackets"); + UINTOUT(); } return; trunc: - printf(" [|ack]"); + ND_PRINT(" [|ack]"); } #undef TRUNCRET