More nd_ification of structures.

[tcpdump] / print-rx.c

diff --git a/print-rx.c b/print-rx.c
index 72c4822b8e18394f1cf482dbd234ab4552852b27..3f3eea1aed69c7d619000c14737a988a8654fc51 100644 (file)
--- 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.
  */
  * 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.
 /*
  * This code unmangles RX packets.  RX is the mutant form of RPC that AFS
  * uses to communicate between clients and servers.


@@ -39,9 +42,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 


@@ -72,12 +75,12 @@
 #define        PRSFS_ADMINISTER        64 /* Change ACL's */
 
 struct rx_header {
 #define        PRSFS_ADMINISTER        64 /* Change ACL's */
 
 struct rx_header {

-       u_int32_t epoch;
-       u_int32_t cid;
-       u_int32_t callNumber;
-       u_int32_t seq;
-       u_int32_t serial;
-       u_int8_t type;
+       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_DATA            1
 #define RX_PACKET_TYPE_ACK             2
 #define RX_PACKET_TYPE_BUSY            3


@@ -88,7 +91,7 @@ struct rx_header {
 #define RX_PACKET_TYPE_DEBUG           8
 #define RX_PACKET_TYPE_PARAMS          9
 #define RX_PACKET_TYPE_VERSION         13
 #define RX_PACKET_TYPE_DEBUG           8
 #define RX_PACKET_TYPE_PARAMS          9
 #define RX_PACKET_TYPE_VERSION         13

-       u_int8_t flags;
+       nd_uint8_t flags;

 #define RX_CLIENT_INITIATED    1
 #define RX_REQUEST_ACK         2
 #define RX_LAST_PACKET         4
 #define RX_CLIENT_INITIATED    1
 #define RX_REQUEST_ACK         2
 #define RX_LAST_PACKET         4


@@ -96,10 +99,10 @@ struct rx_header {
 #define RX_FREE_PACKET         16
 #define RX_SLOW_START_OK       32
 #define RX_JUMBO_PACKET                32
 #define RX_FREE_PACKET         16
 #define RX_SLOW_START_OK       32
 #define RX_JUMBO_PACKET                32

-       u_int8_t userStatus;
-       u_int8_t securityIndex;
-       u_int16_t spare;                /* How clever: even though the AFS */
-       u_int16_t serviceId;            /* header files indicate that the */
+       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! */
 };                                     /* serviceId is first, it's really */
                                        /* encoded _after_ the spare field */
                                        /* I wasted a day figuring that out! */


@@ -109,15 +112,18 @@ struct rx_header {
 #define RX_MAXACKS 255
 
 struct rx_ackPacket {
 #define RX_MAXACKS 255
 
 struct rx_ackPacket {

-       u_int16_t bufferSpace;          /* Number of packet buffers available */
-       u_int16_t maxSkew;              /* Max diff between ack'd packet and */
+       nd_uint16_t bufferSpace;        /* Number of packet buffers available */
+       nd_uint16_t maxSkew;            /* Max diff between ack'd packet and */

                                        /* highest packet received */
                                        /* highest packet received */

-       u_int32_t firstPacket;          /* The first packet in ack list */
-       u_int32_t previousPacket;       /* Previous packet recv'd (obsolete) */
-       u_int32_t serial;               /* # of packet that prompted the ack */
-       u_int8_t reason;                /* Reason for acknowledgement */
-       u_int8_t nAcks;                 /* Number of acknowledgements */
-       u_int8_t acks[RX_MAXACKS];      /* Up to RX_MAXACKS acknowledgements */
+       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

 };
 
 /*
 };
 
 /*


@@ -142,8 +148,8 @@ static const struct tok rx_types[] = {
 };
 
 static const struct double_tok {
 };
 
 static const struct double_tok {

-       int flag;               /* Rx flag */
-       int packetType;         /* Packet type */
+       uint32_t flag;          /* Rx flag */
+       uint32_t packetType;    /* Packet type */

        const char *s;          /* Flag string */
 } rx_flags[] = {
        { RX_CLIENT_INITIATED,  0,                      "client-init" },
        const char *s;          /* Flag string */
 } rx_flags[] = {
        { RX_CLIENT_INITIATED,  0,                      "client-init" },


@@ -446,7 +452,7 @@ static const struct tok afs_fs_errors[] = {
        { 110,          "volume busy" },
        { 111,          "volume moved" },
        { 112,          "AFS IO error" },
        { 110,          "volume busy" },
        { 111,          "volume moved" },
        { 112,          "AFS IO error" },

-       { -100,         "restarting fileserver" },
+       { 0xffffff9c,   "restarting fileserver" }, /* -100, sic! */

        { 0,            NULL }
 };
 
        { 0,            NULL }
 };
 


@@ -473,45 +479,45 @@ static const struct tok rx_ack_reasons[] = {
  */
 
 struct rx_cache_entry {
  */
 
 struct rx_cache_entry {

-       u_int32_t       callnum;        /* Call number (net order) */
+       uint32_t        callnum;        /* Call number (net order) */

        struct in_addr  client;         /* client IP address (net order) */
        struct in_addr  server;         /* server IP address (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) */
+       u_int           dport;          /* server 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];
 
 };
 
 #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 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 *, u_int);

 static int     rx_cache_find(const struct rx_header *, const struct ip *,
 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);
+                             uint32_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 *, int, 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
 
 /*
  * Handle the rx-level packet.  See if we know what port it's going to so


@@ -519,51 +525,55 @@ static int is_ubik(u_int32_t);
  */
 
 void
  */
 
 void

-rx_print(register const u_char *bp, int length, int sport, int dport,
-        u_char *bp2)
+rx_print(netdissect_options *ndo,
+         register const u_char *bp, u_int length, u_int sport, u_int dport,
+         const u_char *bp2)

 {
 {

-       register struct rx_header *rxh;
-       int i;
-       int32_t opcode;
+       register const struct rx_header *rxh;
+       uint32_t i;
+       uint8_t type, flags;
+       uint32_t opcode;

 
 

-       if (snapend - bp < (int)sizeof (struct rx_header)) {
-               printf(" [|rx] (%d)", length);
+       if (!ND_TTEST2(*bp, sizeof (struct rx_header))) {
+               ND_PRINT((ndo, " [|rx] (%u)", length));

                return;
        }
 
                return;
        }
 

-       rxh = (struct rx_header *) bp;
+       rxh = (const struct rx_header *) bp;

 
 

-       printf(" rx %s", tok2str(rx_types, "type %d", rxh->type));
+       type = EXTRACT_U_1(rxh->type);
+       ND_PRINT((ndo, " rx %s", tok2str(rx_types, "type %u", type)));

 
 

-       if (vflag) {
+       flags = EXTRACT_U_1(rxh->flags);
+       if (ndo->ndo_vflag) {

                int firstflag = 0;
 
                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((ndo, " cid %08x call# %u",
+                              EXTRACT_BE_U_4(rxh->cid),
+                              EXTRACT_BE_U_4(rxh->callNumber)));

 
 

-               printf(" seq %d ser %d",
-                      (int) EXTRACT_32BITS(&rxh->seq),
-                      (int) EXTRACT_32BITS(&rxh->serial));
+               ND_PRINT((ndo, " seq %u ser %u",
+                      EXTRACT_BE_U_4(rxh->seq),
+                      EXTRACT_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((ndo, " secindex %u serviceid %hu",
+                               EXTRACT_U_1(rxh->securityIndex),
+                               EXTRACT_BE_U_2(rxh->serviceId)));

 
 

-               if (vflag > 1)
+               if (ndo->ndo_vflag > 1)

                        for (i = 0; i < NUM_RX_FLAGS; i++) {
                        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 ||
                                    (!rx_flags[i].packetType ||

-                                    rxh->type == rx_flags[i].packetType)) {
+                                    type == rx_flags[i].packetType)) {

                                        if (!firstflag) {
                                                firstflag = 1;
                                        if (!firstflag) {
                                                firstflag = 1;

-                                               printf(" ");
+                                               ND_PRINT((ndo, " "));

                                        } else {
                                        } else {

-                                               printf(",");
+                                               ND_PRINT((ndo, ","));

                                        }
                                        }

-                                       printf("<%s>", rx_flags[i].s);
+                                       ND_PRINT((ndo, "<%s>", rx_flags[i].s));

                                }
                        }
        }
                                }
                        }
        }


@@ -577,38 +587,38 @@ rx_print(register const u_char *bp, int length, int sport, int dport,
         * as well.
         */
 
         * 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 &&
+           EXTRACT_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
                 */
 
 
                /*
                 * 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 */
 
                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 */
                                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 */
                                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 */
                                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 */
                                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 */
                                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 */
                                break;
                        case BOS_RX_PORT:       /* AFS BOS service */

-                               bos_print(bp, length);
+                               bos_print(ndo, bp, length);

                                break;
                        default:
                                ;
                                break;
                        default:
                                ;


@@ -621,34 +631,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.
         */
 
         * 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 &&
+       } else if (((type == RX_PACKET_TYPE_DATA &&
+                                       EXTRACT_BE_U_4(rxh->seq) == 1) ||
+                   type == RX_PACKET_TYPE_ABORT) &&
+                  (flags & RX_CLIENT_INITIATED) == 0 &&

                   rx_cache_find(rxh, (const struct ip *) bp2,
                                 sport, &opcode)) {
 
                switch (sport) {
                        case FS_RX_PORT:        /* AFS file service */
                   rx_cache_find(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 */
                                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 */
                                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 */
                                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 */
                                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 */
                                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 */
                                break;
                        case BOS_RX_PORT:       /* AFS BOS service */

-                               bos_reply_print(bp, length, opcode);
+                               bos_reply_print(ndo, bp, length, opcode);

                                break;
                        default:
                                ;
                                break;
                        default:
                                ;


@@ -660,11 +670,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)
         */
 
         * 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((ndo, " (%u)", length));

 }
 
 /*
 }
 
 /*


@@ -672,12 +682,13 @@ rx_print(register const u_char *bp, int length, int sport, int dport,
  */
 
 static void
  */
 
 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, u_int dport)

 {
        struct rx_cache_entry *rxent;
        const struct rx_header *rxh = (const struct rx_header *) bp;
 
 {
        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];
                return;
 
        rxent = &rx_cache[rx_cache_next];


@@ -685,12 +696,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;
 
        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 = EXTRACT_BE_U_4(rxh->callNumber);
+       UNALIGNED_MEMCPY(&rxent->client, &ip->ip_src, sizeof(uint32_t));
+       UNALIGNED_MEMCPY(&rxent->server, &ip->ip_dst, sizeof(uint32_t));

        rxent->dport = dport;
        rxent->dport = dport;

-       rxent->serviceId = rxh->serviceId;
-       rxent->opcode = EXTRACT_32BITS(bp + sizeof(struct rx_header));
+       rxent->serviceId = EXTRACT_BE_U_4(rxh->serviceId);
+       rxent->opcode = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 }
 
 /*
 }
 
 /*


@@ -701,23 +712,26 @@ rx_cache_insert(const u_char *bp, const struct ip *ip, int dport)
  */
 
 static int
  */
 
 static int

-rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport,
-             int32_t *opcode)
+rx_cache_find(const struct rx_header *rxh, const struct ip *ip, u_int sport,
+             uint32_t *opcode)

 {
 {

-       int i;
+       uint32_t i;

        struct rx_cache_entry *rxent;
        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;
+
+       UNALIGNED_MEMCPY(&clip, &ip->ip_dst, sizeof(uint32_t));
+       UNALIGNED_MEMCPY(&sip, &ip->ip_src, sizeof(uint32_t));

 
        /* Start the search where we last left off */
 
        i = rx_cache_hint;
        do {
                rxent = &rx_cache[i];
 
        /* Start the search where we last left off */
 
        i = rx_cache_hint;
        do {
                rxent = &rx_cache[i];

-               if (rxent->callnum == rxh->callNumber &&
+               if (rxent->callnum == EXTRACT_BE_U_4(rxh->callNumber) &&

                    rxent->client.s_addr == clip &&
                    rxent->server.s_addr == sip &&
                    rxent->client.s_addr == clip &&
                    rxent->server.s_addr == sip &&

-                   rxent->serviceId == rxh->serviceId &&
+                   rxent->serviceId == EXTRACT_BE_U_4(rxh->serviceId) &&

                    rxent->dport == sport) {
 
                        /* We got a match! */
                    rxent->dport == sport) {
 
                        /* We got a match! */


@@ -738,102 +752,102 @@ 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 extrememly 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_TCHECK2(bp[0], sizeof(uint32_t) * 3); \
+                       n1 = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       n2 = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       n3 = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       ND_PRINT((ndo, " 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_TCHECK2(bp[0], sizeof(uint32_t)); \
+                       _i = EXTRACT_BE_U_4(bp); \
+                       if (_i > (MAX)) \

                                goto trunc; \
                                goto trunc; \

-                       bp += sizeof(int32_t); \
-                       printf(" \""); \
-                       if (fn_printn(bp, i, snapend)) \
+                       bp += sizeof(uint32_t); \
+                       ND_PRINT((ndo, " \"")); \
+                       if (fn_printn(ndo, bp, _i, ndo->ndo_snapend)) \

                                goto trunc; \
                                goto trunc; \

-                       printf("\""); \
-                       bp += ((i + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t); \
+                       ND_PRINT((ndo, "\"")); \
+                       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; \
+                       ND_TCHECK_4(bp); \
+                       _i = EXTRACT_BE_S_4(bp); \

                        bp += sizeof(int32_t); \
                        bp += sizeof(int32_t); \

-                       printf(" %d", i); \
+                       ND_PRINT((ndo, " %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; \
+                       ND_TCHECK_4(bp); \
+                       _i = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       ND_PRINT((ndo, " %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(" %" PRIu64, i); \
+#define UINT64OUT() { uint64_t _i; \
+                       ND_TCHECK2(bp[0], sizeof(uint64_t)); \
+                       _i = EXTRACT_BE_U_8(bp); \
+                       bp += sizeof(uint64_t); \
+                       ND_PRINT((ndo, " %" 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]; \
+                       ND_TCHECK_4(bp); \
+                       _t = (time_t) EXTRACT_BE_S_4(bp); \

                        bp += sizeof(int32_t); \
                        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((ndo, " %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_TCHECK2(bp[0], (sizeof(uint32_t)*6)); \
+                       mask = EXTRACT_BE_U_4(bp); bp += sizeof(uint32_t); \
+                       if (mask) ND_PRINT((ndo, " StoreStatus")); \
+                       if (mask & 1) { ND_PRINT((ndo, " date")); DATEOUT(); } \
+                       else bp += sizeof(uint32_t); \
+                       _i = EXTRACT_BE_U_4(bp); bp += sizeof(uint32_t); \
+                       if (mask & 2) ND_PRINT((ndo, " owner %u", _i));  \
+                       _i = EXTRACT_BE_U_4(bp); bp += sizeof(uint32_t); \
+                       if (mask & 4) ND_PRINT((ndo, " group %u", _i)); \
+                       _i = EXTRACT_BE_U_4(bp); bp += sizeof(uint32_t); \
+                       if (mask & 8) ND_PRINT((ndo, " mode %o", _i & 07777)); \
+                       _i = EXTRACT_BE_U_4(bp); bp += sizeof(uint32_t); \
+                       if (mask & 16) ND_PRINT((ndo, " segsize %u", _i)); \

                        /* undocumented in 3.3 docu */ \
                        /* undocumented in 3.3 docu */ \

-                       if (mask & 1024) printf(" fsync");  \
+                       if (mask & 1024) ND_PRINT((ndo, " 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_TCHECK2(bp[0], sizeof(uint32_t) * 2); \
+                       epoch = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       counter = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       ND_PRINT((ndo, " %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_TCHECK2(bp[0], 11*sizeof(uint32_t)); \
+                       temp = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       ND_PRINT((ndo, " %08x", temp)); \
+                       temp = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       ND_PRINT((ndo, "%04x", temp)); \
+                       temp = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       ND_PRINT((ndo, "%04x", temp)); \
+                       for (_i = 0; _i < 8; _i++) { \
+                               temp = EXTRACT_BE_U_4(bp); \
+                               bp += sizeof(uint32_t); \
+                               ND_PRINT((ndo, "%02x", (unsigned char) temp)); \

                        } \
                }
 
                        } \
                }
 


@@ -843,30 +857,30 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport,
 
 #define VECOUT(MAX) { u_char *sp; \
                        u_char s[AFSNAMEMAX]; \
 
 #define VECOUT(MAX) { u_char *sp; \
                        u_char s[AFSNAMEMAX]; \

-                       int k; \
+                       uint32_t k; \

                        if ((MAX) + 1 > sizeof(s)) \
                                goto trunc; \
                        if ((MAX) + 1 > sizeof(s)) \
                                goto trunc; \

-                       TCHECK2(bp[0], (MAX) * sizeof(int32_t)); \
+                       ND_TCHECK2(bp[0], (MAX) * sizeof(uint32_t)); \

                        sp = s; \
                        for (k = 0; k < (MAX); k++) { \
                        sp = s; \
                        for (k = 0; k < (MAX); k++) { \

-                               *sp++ = (u_char) EXTRACT_32BITS(bp); \
-                               bp += sizeof(int32_t); \
+                               *sp++ = (u_char) EXTRACT_BE_U_4(bp); \
+                               bp += sizeof(uint32_t); \

                        } \
                        s[(MAX)] = '\0'; \
                        } \
                        s[(MAX)] = '\0'; \

-                       printf(" \""); \
-                       fn_print(s, NULL); \
-                       printf("\""); \
+                       ND_PRINT((ndo, " \"")); \
+                       fn_print(ndo, s, NULL); \
+                       ND_PRINT((ndo, "\"")); \

                }
 
                }
 

-#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_TCHECK2(bp[0], sizeof(uint32_t) * 3); \
+                       n1 = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       n2 = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       n3 = EXTRACT_BE_U_4(bp); \
+                       bp += sizeof(uint32_t); \
+                       ND_PRINT((ndo, " server %u:%u:%u", n1, n2, n3)); \

                }
 
 /*
                }
 
 /*


@@ -874,26 +888,24 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport,
  */
 
 static void
  */
 
 static void

-fs_print(register const u_char *bp, int length)
+fs_print(netdissect_options *ndo,
+         register 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;
 
                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
         */
 
        /*
         * 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));
+       ND_TCHECK_4(bp + sizeof(struct rx_header));
+       fs_op = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 
 

-       printf(" fs call %s", tok2str(fs_req, "op#%d", fs_op));
+       ND_PRINT((ndo, " fs call %s", tok2str(fs_req, "op#%u", fs_op)));

 
        /*
         * Print out arguments to some of the AFS calls.  This stuff is
 
        /*
         * Print out arguments to some of the AFS calls.  This stuff is


@@ -909,9 +921,9 @@ fs_print(register const u_char *bp, int length)
        switch (fs_op) {
                case 130:       /* Fetch data */
                        FIDOUT();
        switch (fs_op) {
                case 130:       /* Fetch data */
                        FIDOUT();

-                       printf(" offset");
+                       ND_PRINT((ndo, " offset"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" length");
+                       ND_PRINT((ndo, " length"));

                        UINTOUT();
                        break;
                case 131:       /* Fetch ACL */
                        UINTOUT();
                        break;
                case 131:       /* Fetch ACL */


@@ -931,25 +943,25 @@ fs_print(register const u_char *bp, int length)
                case 133:       /* Store data */
                        FIDOUT();
                        STOREATTROUT();
                case 133:       /* Store data */
                        FIDOUT();
                        STOREATTROUT();

-                       printf(" offset");
+                       ND_PRINT((ndo, " offset"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" length");
+                       ND_PRINT((ndo, " length"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" flen");
+                       ND_PRINT((ndo, " flen"));

                        UINTOUT();
                        break;
                case 134:       /* Store ACL */
                {
                        char a[AFSOPAQUEMAX+1];
                        FIDOUT();
                        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);
+                       ND_TCHECK_4(bp);
+                       i = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);
+                       ND_TCHECK2(bp[0], i);

                        i = min(AFSOPAQUEMAX, i);
                        i = min(AFSOPAQUEMAX, i);

-                       strncpy(a, (char *) bp, i);
+                       strncpy(a, (const char *) bp, i);

                        a[i] = '\0';
                        a[i] = '\0';

-                       acl_print((u_char *) a, sizeof(a), (u_char *) a + i);
+                       acl_print(ndo, (u_char *) a, sizeof(a), (u_char *) a + i);

                        break;
                }
                case 137:       /* Create file */
                        break;
                }
                case 137:       /* Create file */


@@ -964,23 +976,23 @@ fs_print(register const u_char *bp, int length)
                        STROUT(AFSNAMEMAX);
                        break;
                case 138:       /* Rename file */
                        STROUT(AFSNAMEMAX);
                        break;
                case 138:       /* Rename file */

-                       printf(" old");
+                       ND_PRINT((ndo, " old"));

                        FIDOUT();
                        STROUT(AFSNAMEMAX);
                        FIDOUT();
                        STROUT(AFSNAMEMAX);

-                       printf(" new");
+                       ND_PRINT((ndo, " new"));

                        FIDOUT();
                        STROUT(AFSNAMEMAX);
                        break;
                case 139:       /* Symlink */
                        FIDOUT();
                        STROUT(AFSNAMEMAX);
                        FIDOUT();
                        STROUT(AFSNAMEMAX);
                        break;
                case 139:       /* Symlink */
                        FIDOUT();
                        STROUT(AFSNAMEMAX);

-                       printf(" link to");
+                       ND_PRINT((ndo, " link to"));

                        STROUT(AFSNAMEMAX);
                        break;
                case 140:       /* Link */
                        FIDOUT();
                        STROUT(AFSNAMEMAX);
                        STROUT(AFSNAMEMAX);
                        break;
                case 140:       /* Link */
                        FIDOUT();
                        STROUT(AFSNAMEMAX);

-                       printf(" link to");
+                       ND_PRINT((ndo, " link to"));

                        FIDOUT();
                        break;
                case 148:       /* Get volume info */
                        FIDOUT();
                        break;
                case 148:       /* Get volume info */


@@ -988,48 +1000,48 @@ fs_print(register const u_char *bp, int length)
                        break;
                case 149:       /* Get volume stats */
                case 150:       /* Set volume stats */
                        break;
                case 149:       /* Get volume stats */
                case 150:       /* Set volume stats */

-                       printf(" volid");
+                       ND_PRINT((ndo, " volid"));

                        UINTOUT();
                        break;
                case 154:       /* New get volume info */
                        UINTOUT();
                        break;
                case 154:       /* New get volume info */

-                       printf(" volname");
+                       ND_PRINT((ndo, " volname"));

                        STROUT(AFSNAMEMAX);
                        break;
                case 155:       /* Bulk stat */
                case 65536:     /* Inline bulk stat */
                {
                        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;
+                       ND_TCHECK_4(bp);
+                       j = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

 
                        for (i = 0; i < j; i++) {
                                FIDOUT();
                                if (i != j - 1)
 
                        for (i = 0; i < j; i++) {
                                FIDOUT();
                                if (i != j - 1)

-                                       printf(",");
+                                       ND_PRINT((ndo, ","));

                        }
                        if (j == 0)
                        }
                        if (j == 0)

-                               printf(" <none!>");
+                               ND_PRINT((ndo, " <none!>"));

                }
                case 65537:     /* Fetch data 64 */
                        FIDOUT();
                }
                case 65537:     /* Fetch data 64 */
                        FIDOUT();

-                       printf(" offset");
+                       ND_PRINT((ndo, " offset"));

                        UINT64OUT();
                        UINT64OUT();

-                       printf(" length");
+                       ND_PRINT((ndo, " length"));

                        UINT64OUT();
                        break;
                case 65538:     /* Store data 64 */
                        FIDOUT();
                        STOREATTROUT();
                        UINT64OUT();
                        break;
                case 65538:     /* Store data 64 */
                        FIDOUT();
                        STOREATTROUT();

-                       printf(" offset");
+                       ND_PRINT((ndo, " offset"));

                        UINT64OUT();
                        UINT64OUT();

-                       printf(" length");
+                       ND_PRINT((ndo, " length"));

                        UINT64OUT();
                        UINT64OUT();

-                       printf(" flen");
+                       ND_PRINT((ndo, " flen"));

                        UINT64OUT();
                        break;
                case 65541:    /* CallBack rx conn address */
                        UINT64OUT();
                        break;
                case 65541:    /* CallBack rx conn address */

-                       printf(" addr");
+                       ND_PRINT((ndo, " addr"));

                        UINTOUT();
                default:
                        ;
                        UINTOUT();
                default:
                        ;


@@ -1038,7 +1050,7 @@ fs_print(register const u_char *bp, int length)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf(" [|fs]");
+       ND_PRINT((ndo, " [|fs]"));

 }
 
 /*
 }
 
 /*


@@ -1046,51 +1058,54 @@ trunc:
  */
 
 static void
  */
 
 static void

-fs_reply_print(register const u_char *bp, int length, int32_t opcode)
+fs_reply_print(netdissect_options *ndo,
+               register 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;
 
                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
         */
 
 
        /*
         * 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((ndo, " fs reply %s", tok2str(fs_req, "op#%u", opcode)));

 
 

+       type = EXTRACT_U_1(rxh->type);

        bp += sizeof(struct rx_header);
 
        /*
         * If it was a data packet, interpret the response
         */
 
        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];
                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);
+                       ND_TCHECK_4(bp);
+                       i = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);
+                       ND_TCHECK2(bp[0], i);

                        i = min(AFSOPAQUEMAX, i);
                        i = min(AFSOPAQUEMAX, i);

-                       strncpy(a, (char *) bp, i);
+                       strncpy(a, (const char *) bp, i);

                        a[i] = '\0';
                        a[i] = '\0';

-                       acl_print((u_char *) a, sizeof(a), (u_char *) a + i);
+                       acl_print(ndo, (u_char *) a, sizeof(a), (u_char *) a + i);

                        break;
                }
                case 137:       /* Create file */
                case 141:       /* MakeDir */
                        break;
                }
                case 137:       /* Create file */
                case 141:       /* MakeDir */

-                       printf(" new");
+                       ND_PRINT((ndo, " new"));

                        FIDOUT();
                        break;
                case 151:       /* Get root volume */
                        FIDOUT();
                        break;
                case 151:       /* Get root volume */

-                       printf(" root volume");
+                       ND_PRINT((ndo, " root volume"));

                        STROUT(AFSNAMEMAX);
                        break;
                case 153:       /* Get time */
                        STROUT(AFSNAMEMAX);
                        break;
                case 153:       /* Get time */


@@ -1099,25 +1114,25 @@ fs_reply_print(register const u_char *bp, int length, int32_t opcode)
                default:
                        ;
                }
                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
                 */
                /*
                 * Otherwise, just print out the return code
                 */

-               TCHECK2(bp[0], sizeof(int32_t));
-               i = (int) EXTRACT_32BITS(bp);
+               int32_t errcode;
+
+               ND_TCHECK_4(bp);
+               errcode = EXTRACT_BE_S_4(bp);

                bp += sizeof(int32_t);
 
                bp += sizeof(int32_t);
 

-               printf(" error %s", tok2str(afs_fs_errors, "#%d", i));
+               ND_PRINT((ndo, " error %s", tok2str(afs_fs_errors, "#%d", errcode)));

        } else {
        } else {

-               printf(" strange fs reply of type %d", rxh->type);
+               ND_PRINT((ndo, " strange fs reply of type %u", type));

        }
 
        return;
 
 trunc:
        }
 
        return;
 
 trunc:

-       printf(" [|fs]");
+       ND_PRINT((ndo, " [|fs]"));

 }
 
 /*
 }
 
 /*


@@ -1130,12 +1145,13 @@ trunc:
  *
  * "positive" and "negative" are integers which contain the number of
  * positive and negative ACL's in the string.  The uid/aclbits pair are
  *
  * "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
  */
 
 static void
  * representing a logical OR of all the ACL permission bits
  */
 
 static void

-acl_print(u_char *s, int maxsize, u_char *end)
+acl_print(netdissect_options *ndo,
+          u_char *s, int maxsize, u_char *end)

 {
        int pos, neg, acl;
        int n, i;
 {
        int pos, neg, acl;
        int n, i;


@@ -1158,31 +1174,25 @@ acl_print(u_char *s, int maxsize, u_char *end)
         */
 
 #define ACLOUT(acl) \
         */
 
 #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((ndo, "%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;
                s += n;
 
        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;
                s += n;

-               printf(" +{");
-               fn_print((u_char *)user, NULL);
-               printf(" ");
+               ND_PRINT((ndo, " +{"));
+               fn_print(ndo, (u_char *)user, NULL);
+               ND_PRINT((ndo, " "));

                ACLOUT(acl);
                ACLOUT(acl);

-               printf("}");
+               ND_PRINT((ndo, "}"));

                if (s > end)
                        goto finish;
        }
                if (s > end)
                        goto finish;
        }


@@ -1192,11 +1202,11 @@ acl_print(u_char *s, int maxsize, u_char *end)
                if (sscanf((char *) s, fmt, user, &acl, &n) != 2)
                        goto finish;
                s += n;
                if (sscanf((char *) s, fmt, user, &acl, &n) != 2)
                        goto finish;
                s += n;

-               printf(" -{");
-               fn_print((u_char *)user, NULL);
-               printf(" ");
+               ND_PRINT((ndo, " -{"));
+               fn_print(ndo, (u_char *)user, NULL);
+               ND_PRINT((ndo, " "));

                ACLOUT(acl);
                ACLOUT(acl);

-               printf("}");
+               ND_PRINT((ndo, "}"));

                if (s > end)
                        goto finish;
        }
                if (s > end)
                        goto finish;
        }


@@ -1213,26 +1223,24 @@ finish:
  */
 
 static void
  */
 
 static void

-cb_print(register const u_char *bp, int length)
+cb_print(netdissect_options *ndo,
+         register 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;
 
                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
         */
 
        /*
         * 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));
+       ND_TCHECK_4(bp + sizeof(struct rx_header));
+       cb_op = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 
 

-       printf(" cb call %s", tok2str(cb_req, "op#%d", cb_op));
+       ND_PRINT((ndo, " cb call %s", tok2str(cb_req, "op#%u", cb_op)));

 
        bp += sizeof(struct rx_header) + 4;
 
 
        bp += sizeof(struct rx_header) + 4;
 


@@ -1244,39 +1252,40 @@ cb_print(register const u_char *bp, int length)
        switch (cb_op) {
                case 204:               /* Callback */
                {
        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;
+                       ND_TCHECK_4(bp);
+                       j = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

 
                        for (i = 0; i < j; i++) {
                                FIDOUT();
                                if (i != j - 1)
 
                        for (i = 0; i < j; i++) {
                                FIDOUT();
                                if (i != j - 1)

-                                       printf(",");
+                                       ND_PRINT((ndo, ","));

                        }
 
                        if (j == 0)
                        }
 
                        if (j == 0)

-                               printf(" <none!>");
+                               ND_PRINT((ndo, " <none!>"));

 
 

-                       j = EXTRACT_32BITS(bp);
-                       bp += sizeof(int32_t);
+                       ND_TCHECK_4(bp);
+                       j = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

 
                        if (j != 0)
 
                        if (j != 0)

-                               printf(";");
+                               ND_PRINT((ndo, ";"));

 
                        for (i = 0; i < j; i++) {
 
                        for (i = 0; i < j; i++) {

-                               printf(" ver");
+                               ND_PRINT((ndo, " ver"));

                                INTOUT();
                                INTOUT();

-                               printf(" expires");
+                               ND_PRINT((ndo, " expires"));

                                DATEOUT();
                                DATEOUT();

-                               TCHECK2(bp[0], 4);
-                               t = EXTRACT_32BITS(bp);
-                               bp += sizeof(int32_t);
-                               tok2str(cb_types, "type %d", t);
+                               ND_TCHECK_4(bp);
+                               t = EXTRACT_BE_U_4(bp);
+                               bp += sizeof(uint32_t);
+                               tok2str(cb_types, "type %u", t);

                        }
                }
                case 214: {
                        }
                }
                case 214: {

-                       printf(" afsuuid");
+                       ND_PRINT((ndo, " afsuuid"));

                        AFSUUIDOUT();
                        break;
                }
                        AFSUUIDOUT();
                        break;
                }


@@ -1287,7 +1296,7 @@ cb_print(register const u_char *bp, int length)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf(" [|cb]");
+       ND_PRINT((ndo, " [|cb]"));

 }
 
 /*
 }
 
 /*


@@ -1295,29 +1304,32 @@ trunc:
  */
 
 static void
  */
 
 static void

-cb_reply_print(register const u_char *bp, int length, int32_t opcode)
+cb_reply_print(netdissect_options *ndo,
+               register 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;
 
                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
         */
 
 
        /*
         * 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((ndo, " cb reply %s", tok2str(cb_req, "op#%u", opcode)));

 
 

+       type = EXTRACT_U_1(rxh->type);

        bp += sizeof(struct rx_header);
 
        /*
         * If it was a data packet, interpret the response.
         */
 
        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();
                switch (opcode) {
                case 213:       /* InitCallBackState3 */
                        AFSUUIDOUT();


@@ -1329,14 +1341,14 @@ cb_reply_print(register const u_char *bp, int length, int32_t opcode)
                /*
                 * Otherwise, just print out the return code
                 */
                /*
                 * Otherwise, just print out the return code
                 */

-               printf(" errcode");
+               ND_PRINT((ndo, " errcode"));

                INTOUT();
        }
 
        return;
 
 trunc:
                INTOUT();
        }
 
        return;
 
 trunc:

-       printf(" [|cb]");
+       ND_PRINT((ndo, " [|cb]"));

 }
 
 /*
 }
 
 /*


@@ -1344,33 +1356,31 @@ trunc:
  */
 
 static void
  */
 
 static void

-prot_print(register const u_char *bp, int length)
+prot_print(netdissect_options *ndo,
+           register 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;
 
                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
         */
 
        /*
         * 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));
+       ND_TCHECK_4(bp + sizeof(struct rx_header));
+       pt_op = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 
 

-       printf(" pt");
+       ND_PRINT((ndo, " pt"));

 
        if (is_ubik(pt_op)) {
 
        if (is_ubik(pt_op)) {

-               ubik_print(bp);
+               ubik_print(ndo, bp);

                return;
        }
 
                return;
        }
 

-       printf(" call %s", tok2str(pt_req, "op#%d", pt_op));
+       ND_PRINT((ndo, " call %s", tok2str(pt_req, "op#%u", pt_op)));

 
        /*
         * Decode some of the arguments to the PT calls
 
        /*
         * Decode some of the arguments to the PT calls


@@ -1381,9 +1391,9 @@ prot_print(register const u_char *bp, int length)
        switch (pt_op) {
                case 500:       /* I New User */
                        STROUT(PRNAMEMAX);
        switch (pt_op) {
                case 500:       /* I New User */
                        STROUT(PRNAMEMAX);

-                       printf(" id");
+                       ND_PRINT((ndo, " id"));

                        INTOUT();
                        INTOUT();

-                       printf(" oldid");
+                       ND_PRINT((ndo, " oldid"));

                        INTOUT();
                        break;
                case 501:       /* Where is it */
                        INTOUT();
                        break;
                case 501:       /* Where is it */


@@ -1395,27 +1405,27 @@ prot_print(register const u_char *bp, int length)
                case 518:       /* Get CPS2 */
                case 519:       /* Get host CPS */
                case 530:       /* List super groups */
                case 518:       /* Get CPS2 */
                case 519:       /* Get host CPS */
                case 530:       /* List super groups */

-                       printf(" id");
+                       ND_PRINT((ndo, " id"));

                        INTOUT();
                        break;
                case 502:       /* Dump entry */
                        INTOUT();
                        break;
                case 502:       /* Dump entry */

-                       printf(" pos");
+                       ND_PRINT((ndo, " pos"));

                        INTOUT();
                        break;
                case 503:       /* Add to group */
                case 507:       /* Remove from group */
                case 515:       /* Is a member of? */
                        INTOUT();
                        break;
                case 503:       /* Add to group */
                case 507:       /* Remove from group */
                case 515:       /* Is a member of? */

-                       printf(" uid");
+                       ND_PRINT((ndo, " uid"));

                        INTOUT();
                        INTOUT();

-                       printf(" gid");
+                       ND_PRINT((ndo, " gid"));

                        INTOUT();
                        break;
                case 504:       /* Name to ID */
                {
                        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;
+                       ND_TCHECK_4(bp);
+                       j = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

 
                        /*
                         * Who designed this chicken-shit protocol?
 
                        /*
                         * Who designed this chicken-shit protocol?


@@ -1428,46 +1438,46 @@ prot_print(register const u_char *bp, int length)
                                VECOUT(PRNAMEMAX);
                        }
                        if (j == 0)
                                VECOUT(PRNAMEMAX);
                        }
                        if (j == 0)

-                               printf(" <none!>");
+                               ND_PRINT((ndo, " <none!>"));

                }
                        break;
                case 505:       /* Id to name */
                {
                }
                        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((ndo, " ids:"));
+                       ND_TCHECK_4(bp);
+                       i = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

                        for (j = 0; j < i; j++)
                                INTOUT();
                        if (j == 0)
                        for (j = 0; j < i; j++)
                                INTOUT();
                        if (j == 0)

-                               printf(" <none!>");
+                               ND_PRINT((ndo, " <none!>"));

                }
                        break;
                case 509:       /* New entry */
                        STROUT(PRNAMEMAX);
                }
                        break;
                case 509:       /* New entry */
                        STROUT(PRNAMEMAX);

-                       printf(" flag");
+                       ND_PRINT((ndo, " flag"));

                        INTOUT();
                        INTOUT();

-                       printf(" oid");
+                       ND_PRINT((ndo, " oid"));

                        INTOUT();
                        break;
                case 511:       /* Set max */
                        INTOUT();
                        break;
                case 511:       /* Set max */

-                       printf(" id");
+                       ND_PRINT((ndo, " id"));

                        INTOUT();
                        INTOUT();

-                       printf(" gflag");
+                       ND_PRINT((ndo, " gflag"));

                        INTOUT();
                        break;
                case 513:       /* Change entry */
                        INTOUT();
                        break;
                case 513:       /* Change entry */

-                       printf(" id");
+                       ND_PRINT((ndo, " id"));

                        INTOUT();
                        STROUT(PRNAMEMAX);
                        INTOUT();
                        STROUT(PRNAMEMAX);

-                       printf(" oldid");
+                       ND_PRINT((ndo, " oldid"));

                        INTOUT();
                        INTOUT();

-                       printf(" newid");
+                       ND_PRINT((ndo, " newid"));

                        INTOUT();
                        break;
                case 520:       /* Update entry */
                        INTOUT();
                        break;
                case 520:       /* Update entry */

-                       printf(" id");
+                       ND_PRINT((ndo, " id"));

                        INTOUT();
                        STROUT(PRNAMEMAX);
                        break;
                        INTOUT();
                        STROUT(PRNAMEMAX);
                        break;


@@ -1479,7 +1489,7 @@ prot_print(register const u_char *bp, int length)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf(" [|pt]");
+       ND_PRINT((ndo, " [|pt]"));

 }
 
 /*
 }
 
 /*


@@ -1487,15 +1497,17 @@ trunc:
  */
 
 static void
  */
 
 static void

-prot_reply_print(register const u_char *bp, int length, int32_t opcode)
+prot_reply_print(netdissect_options *ndo,
+                 register 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;
 
                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
 
        /*
         * Print out the afs call we're invoking.  The table used here was


@@ -1503,42 +1515,43 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode)
         * Ubik call, however.
         */
 
         * Ubik call, however.
         */
 

-       printf(" pt");
+       ND_PRINT((ndo, " pt"));

 
        if (is_ubik(opcode)) {
 
        if (is_ubik(opcode)) {

-               ubik_reply_print(bp, length, opcode);
+               ubik_reply_print(ndo, bp, length, opcode);

                return;
        }
 
                return;
        }
 

-       printf(" reply %s", tok2str(pt_req, "op#%d", opcode));
+       ND_PRINT((ndo, " reply %s", tok2str(pt_req, "op#%u", opcode)));

 
 

+       type = EXTRACT_U_1(rxh->type);

        bp += sizeof(struct rx_header);
 
        /*
         * If it was a data packet, interpret the response
         */
 
        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 */
                {
                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((ndo, " ids:"));
+                       ND_TCHECK_4(bp);
+                       i = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

                        for (j = 0; j < i; j++)
                                INTOUT();
                        if (j == 0)
                        for (j = 0; j < i; j++)
                                INTOUT();
                        if (j == 0)

-                               printf(" <none!>");
+                               ND_PRINT((ndo, " <none!>"));

                }
                        break;
                case 505:               /* ID to name */
                {
                }
                        break;
                case 505:               /* ID to name */
                {

-                       unsigned long j;
-                       TCHECK2(bp[0], 4);
-                       j = EXTRACT_32BITS(bp);
-                       bp += sizeof(int32_t);
+                       uint32_t j;
+                       ND_TCHECK_4(bp);
+                       j = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

 
                        /*
                         * Who designed this chicken-shit protocol?
 
                        /*
                         * Who designed this chicken-shit protocol?


@@ -1551,7 +1564,7 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode)
                                VECOUT(PRNAMEMAX);
                        }
                        if (j == 0)
                                VECOUT(PRNAMEMAX);
                        }
                        if (j == 0)

-                               printf(" <none!>");
+                               ND_PRINT((ndo, " <none!>"));

                }
                        break;
                case 508:               /* Get CPS */
                }
                        break;
                case 508:               /* Get CPS */


@@ -1560,21 +1573,21 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode)
                case 518:               /* Get CPS2 */
                case 519:               /* Get host CPS */
                {
                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;
+                       ND_TCHECK_4(bp);
+                       j = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

                        for (i = 0; i < j; i++) {
                                INTOUT();
                        }
                        if (j == 0)
                        for (i = 0; i < j; i++) {
                                INTOUT();
                        }
                        if (j == 0)

-                               printf(" <none!>");
+                               ND_PRINT((ndo, " <none!>"));

                }
                        break;
                case 510:               /* List max */
                }
                        break;
                case 510:               /* List max */

-                       printf(" maxuid");
+                       ND_PRINT((ndo, " maxuid"));

                        INTOUT();
                        INTOUT();

-                       printf(" maxgid");
+                       ND_PRINT((ndo, " maxgid"));

                        INTOUT();
                        break;
                default:
                        INTOUT();
                        break;
                default:


@@ -1584,14 +1597,14 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode)
                /*
                 * Otherwise, just print out the return code
                 */
                /*
                 * Otherwise, just print out the return code
                 */

-               printf(" errcode");
+               ND_PRINT((ndo, " errcode"));

                INTOUT();
        }
 
        return;
 
 trunc:
                INTOUT();
        }
 
        return;
 
 trunc:

-       printf(" [|pt]");
+       ND_PRINT((ndo, " [|pt]"));

 }
 
 /*
 }
 
 /*


@@ -1599,32 +1612,30 @@ trunc:
  */
 
 static void
  */
 
 static void

-vldb_print(register const u_char *bp, int length)
+vldb_print(netdissect_options *ndo,
+           register 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;
 
                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
         */
 
        /*
         * 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));
+       ND_TCHECK_4(bp + sizeof(struct rx_header));
+       vldb_op = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 
 

-       printf(" vldb");
+       ND_PRINT((ndo, " vldb"));

 
        if (is_ubik(vldb_op)) {
 
        if (is_ubik(vldb_op)) {

-               ubik_print(bp);
+               ubik_print(ndo, bp);

                return;
        }
                return;
        }

-       printf(" call %s", tok2str(vldb_req, "op#%d", vldb_op));
+       ND_PRINT((ndo, " call %s", tok2str(vldb_req, "op#%u", vldb_op)));

 
        /*
         * Decode some of the arguments to the VLDB calls
 
        /*
         * Decode some of the arguments to the VLDB calls


@@ -1643,13 +1654,13 @@ vldb_print(register const u_char *bp, int length)
                case 508:       /* Set lock */
                case 509:       /* Release lock */
                case 518:       /* Get entry by ID N */
                case 508:       /* Set lock */
                case 509:       /* Release lock */
                case 518:       /* Get entry by ID N */

-                       printf(" volid");
+                       ND_PRINT((ndo, " volid"));

                        INTOUT();
                        INTOUT();

-                       TCHECK2(bp[0], sizeof(int32_t));
-                       i = EXTRACT_32BITS(bp);
-                       bp += sizeof(int32_t);
+                       ND_TCHECK_4(bp);
+                       i = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

                        if (i <= 2)
                        if (i <= 2)

-                               printf(" type %s", voltype[i]);
+                               ND_PRINT((ndo, " type %s", voltype[i]));

                        break;
                case 504:       /* Get entry by name */
                case 519:       /* Get entry by name N */
                        break;
                case 504:       /* Get entry by name */
                case 519:       /* Get entry by name N */


@@ -1658,23 +1669,23 @@ vldb_print(register const u_char *bp, int length)
                        STROUT(VLNAMEMAX);
                        break;
                case 505:       /* Get new vol id */
                        STROUT(VLNAMEMAX);
                        break;
                case 505:       /* Get new vol id */

-                       printf(" bump");
+                       ND_PRINT((ndo, " bump"));

                        INTOUT();
                        break;
                case 506:       /* Replace entry */
                case 520:       /* Replace entry N */
                        INTOUT();
                        break;
                case 506:       /* Replace entry */
                case 520:       /* Replace entry N */

-                       printf(" volid");
+                       ND_PRINT((ndo, " volid"));

                        INTOUT();
                        INTOUT();

-                       TCHECK2(bp[0], sizeof(int32_t));
-                       i = EXTRACT_32BITS(bp);
-                       bp += sizeof(int32_t);
+                       ND_TCHECK_4(bp);
+                       i = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);

                        if (i <= 2)
                        if (i <= 2)

-                               printf(" type %s", voltype[i]);
+                               ND_PRINT((ndo, " type %s", voltype[i]));

                        VECOUT(VLNAMEMAX);
                        break;
                case 510:       /* List entry */
                case 521:       /* List entry N */
                        VECOUT(VLNAMEMAX);
                        break;
                case 510:       /* List entry */
                case 521:       /* List entry N */

-                       printf(" index");
+                       ND_PRINT((ndo, " index"));

                        INTOUT();
                        break;
                default:
                        INTOUT();
                        break;
                default:


@@ -1684,7 +1695,7 @@ vldb_print(register const u_char *bp, int length)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf(" [|vldb]");
+       ND_PRINT((ndo, " [|vldb]"));

 }
 
 /*
 }
 
 /*


@@ -1692,15 +1703,17 @@ trunc:
  */
 
 static void
  */
 
 static void

-vldb_reply_print(register const u_char *bp, int length, int32_t opcode)
+vldb_reply_print(netdissect_options *ndo,
+                 register 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;
 
                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
 
        /*
         * Print out the afs call we're invoking.  The table used here was


@@ -1708,152 +1721,153 @@ vldb_reply_print(register const u_char *bp, int length, int32_t opcode)
         * Ubik call, however.
         */
 
         * Ubik call, however.
         */
 

-       printf(" vldb");
+       ND_PRINT((ndo, " vldb"));

 
        if (is_ubik(opcode)) {
 
        if (is_ubik(opcode)) {

-               ubik_reply_print(bp, length, opcode);
+               ubik_reply_print(ndo, bp, length, opcode);

                return;
        }
 
                return;
        }
 

-       printf(" reply %s", tok2str(vldb_req, "op#%d", opcode));
+       ND_PRINT((ndo, " reply %s", tok2str(vldb_req, "op#%u", opcode)));

 
 

+       type = EXTRACT_U_1(rxh->type);

        bp += sizeof(struct rx_header);
 
        /*
         * If it was a data packet, interpret the response
         */
 
        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 */
                switch (opcode) {
                case 510:       /* List entry */

-                       printf(" count");
+                       ND_PRINT((ndo, " count"));

                        INTOUT();
                        INTOUT();

-                       printf(" nextindex");
+                       ND_PRINT((ndo, " nextindex"));

                        INTOUT();
                case 503:       /* Get entry by id */
                case 504:       /* Get entry by name */
                        INTOUT();
                case 503:       /* Get entry by id */
                case 504:       /* Get entry by name */

-               {       unsigned long nservers, j;
+               {       uint32_t nservers, j;

                        VECOUT(VLNAMEMAX);
                        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((ndo, " numservers"));
+                       ND_TCHECK_4(bp);
+                       nservers = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);
+                       ND_PRINT((ndo, " %u", nservers));
+                       ND_PRINT((ndo, " servers"));

                        for (i = 0; i < 8; i++) {
                        for (i = 0; i < 8; i++) {

-                               TCHECK2(bp[0], sizeof(int32_t));
+                               ND_TCHECK_4(bp);

                                if (i < nservers)
                                if (i < nservers)

-                                       printf(" %s",
-                                          intoa(((struct in_addr *) bp)->s_addr));
-                               bp += sizeof(int32_t);
+                                       ND_PRINT((ndo, " %s",
+                                          intoa(((const struct in_addr *) bp)->s_addr)));
+                               bp += sizeof(uint32_t);

                        }
                        }

-                       printf(" partitions");
+                       ND_PRINT((ndo, " partitions"));

                        for (i = 0; i < 8; i++) {
                        for (i = 0; i < 8; i++) {

-                               TCHECK2(bp[0], sizeof(int32_t));
-                               j = EXTRACT_32BITS(bp);
+                               ND_TCHECK_4(bp);
+                               j = EXTRACT_BE_U_4(bp);

                                if (i < nservers && j <= 26)
                                if (i < nservers && j <= 26)

-                                       printf(" %c", 'a' + (int)j);
+                                       ND_PRINT((ndo, " %c", 'a' + j));

                                else if (i < nservers)
                                else if (i < nservers)

-                                       printf(" %lu", j);
-                               bp += sizeof(int32_t);
+                                       ND_PRINT((ndo, " %u", j));
+                               bp += sizeof(uint32_t);

                        }
                        }

-                       TCHECK2(bp[0], 8 * sizeof(int32_t));
-                       bp += 8 * sizeof(int32_t);
-                       printf(" rwvol");
+                       ND_TCHECK2(bp[0], 8 * sizeof(uint32_t));
+                       bp += 8 * sizeof(uint32_t);
+                       ND_PRINT((ndo, " rwvol"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" rovol");
+                       ND_PRINT((ndo, " rovol"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" backup");
+                       ND_PRINT((ndo, " backup"));

                        UINTOUT();
                }
                        break;
                case 505:       /* Get new volume ID */
                        UINTOUT();
                }
                        break;
                case 505:       /* Get new volume ID */

-                       printf(" newvol");
+                       ND_PRINT((ndo, " newvol"));

                        UINTOUT();
                        break;
                case 521:       /* List entry */
                case 529:       /* List entry U */
                        UINTOUT();
                        break;
                case 521:       /* List entry */
                case 529:       /* List entry U */

-                       printf(" count");
+                       ND_PRINT((ndo, " count"));

                        INTOUT();
                        INTOUT();

-                       printf(" nextindex");
+                       ND_PRINT((ndo, " nextindex"));

                        INTOUT();
                case 518:       /* Get entry by ID N */
                case 519:       /* Get entry by name N */
                        INTOUT();
                case 518:       /* Get entry by ID N */
                case 519:       /* Get entry by name N */

-               {       unsigned long nservers, j;
+               {       uint32_t nservers, j;

                        VECOUT(VLNAMEMAX);
                        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((ndo, " numservers"));
+                       ND_TCHECK_4(bp);
+                       nservers = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);
+                       ND_PRINT((ndo, " %u", nservers));
+                       ND_PRINT((ndo, " servers"));

                        for (i = 0; i < 13; i++) {
                        for (i = 0; i < 13; i++) {

-                               TCHECK2(bp[0], sizeof(int32_t));
+                               ND_TCHECK_4(bp);

                                if (i < nservers)
                                if (i < nservers)

-                                       printf(" %s",
-                                          intoa(((struct in_addr *) bp)->s_addr));
-                               bp += sizeof(int32_t);
+                                       ND_PRINT((ndo, " %s",
+                                          intoa(((const struct in_addr *) bp)->s_addr)));
+                               bp += sizeof(uint32_t);

                        }
                        }

-                       printf(" partitions");
+                       ND_PRINT((ndo, " partitions"));

                        for (i = 0; i < 13; i++) {
                        for (i = 0; i < 13; i++) {

-                               TCHECK2(bp[0], sizeof(int32_t));
-                               j = EXTRACT_32BITS(bp);
+                               ND_TCHECK_4(bp);
+                               j = EXTRACT_BE_U_4(bp);

                                if (i < nservers && j <= 26)
                                if (i < nservers && j <= 26)

-                                       printf(" %c", 'a' + (int)j);
+                                       ND_PRINT((ndo, " %c", 'a' + j));

                                else if (i < nservers)
                                else if (i < nservers)

-                                       printf(" %lu", j);
-                               bp += sizeof(int32_t);
+                                       ND_PRINT((ndo, " %u", j));
+                               bp += sizeof(uint32_t);

                        }
                        }

-                       TCHECK2(bp[0], 13 * sizeof(int32_t));
-                       bp += 13 * sizeof(int32_t);
-                       printf(" rwvol");
+                       ND_TCHECK2(bp[0], 13 * sizeof(uint32_t));
+                       bp += 13 * sizeof(uint32_t);
+                       ND_PRINT((ndo, " rwvol"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" rovol");
+                       ND_PRINT((ndo, " rovol"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" backup");
+                       ND_PRINT((ndo, " backup"));

                        UINTOUT();
                }
                        break;
                case 526:       /* Get entry by ID U */
                case 527:       /* Get entry by name U */
                        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);
                        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((ndo, " numservers"));
+                       ND_TCHECK_4(bp);
+                       nservers = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);
+                       ND_PRINT((ndo, " %u", nservers));
+                       ND_PRINT((ndo, " servers"));

                        for (i = 0; i < 13; i++) {
                                if (i < nservers) {
                        for (i = 0; i < 13; i++) {
                                if (i < nservers) {

-                                       printf(" afsuuid");
+                                       ND_PRINT((ndo, " afsuuid"));

                                        AFSUUIDOUT();
                                } else {
                                        AFSUUIDOUT();
                                } else {

-                                       TCHECK2(bp[0], 44);
+                                       ND_TCHECK2(bp[0], 44);

                                        bp += 44;
                                }
                        }
                                        bp += 44;
                                }
                        }

-                       TCHECK2(bp[0], 4 * 13);
+                       ND_TCHECK2(bp[0], 4 * 13);

                        bp += 4 * 13;
                        bp += 4 * 13;

-                       printf(" partitions");
+                       ND_PRINT((ndo, " partitions"));

                        for (i = 0; i < 13; i++) {
                        for (i = 0; i < 13; i++) {

-                               TCHECK2(bp[0], sizeof(int32_t));
-                               j = EXTRACT_32BITS(bp);
+                               ND_TCHECK_4(bp);
+                               j = EXTRACT_BE_U_4(bp);

                                if (i < nservers && j <= 26)
                                if (i < nservers && j <= 26)

-                                       printf(" %c", 'a' + (int)j);
+                                       ND_PRINT((ndo, " %c", 'a' + j));

                                else if (i < nservers)
                                else if (i < nservers)

-                                       printf(" %lu", j);
-                               bp += sizeof(int32_t);
+                                       ND_PRINT((ndo, " %u", j));
+                               bp += sizeof(uint32_t);

                        }
                        }

-                       TCHECK2(bp[0], 13 * sizeof(int32_t));
-                       bp += 13 * sizeof(int32_t);
-                       printf(" rwvol");
+                       ND_TCHECK2(bp[0], 13 * sizeof(uint32_t));
+                       bp += 13 * sizeof(uint32_t);
+                       ND_PRINT((ndo, " rwvol"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" rovol");
+                       ND_PRINT((ndo, " rovol"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" backup");
+                       ND_PRINT((ndo, " backup"));

                        UINTOUT();
                }
                default:
                        UINTOUT();
                }
                default:


@@ -1864,14 +1878,14 @@ vldb_reply_print(register const u_char *bp, int length, int32_t opcode)
                /*
                 * Otherwise, just print out the return code
                 */
                /*
                 * Otherwise, just print out the return code
                 */

-               printf(" errcode");
+               ND_PRINT((ndo, " errcode"));

                INTOUT();
        }
 
        return;
 
 trunc:
                INTOUT();
        }
 
        return;
 
 trunc:

-       printf(" [|vldb]");
+       ND_PRINT((ndo, " [|vldb]"));

 }
 
 /*
 }
 
 /*


@@ -1879,33 +1893,31 @@ trunc:
  */
 
 static void
  */
 
 static void

-kauth_print(register const u_char *bp, int length)
+kauth_print(netdissect_options *ndo,
+            register 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;
 
                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
         */
 
        /*
         * 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));
+       ND_TCHECK_4(bp + sizeof(struct rx_header));
+       kauth_op = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 
 

-       printf(" kauth");
+       ND_PRINT((ndo, " kauth"));

 
        if (is_ubik(kauth_op)) {
 
        if (is_ubik(kauth_op)) {

-               ubik_print(bp);
+               ubik_print(ndo, bp);

                return;
        }
 
 
                return;
        }
 
 

-       printf(" call %s", tok2str(kauth_req, "op#%d", kauth_op));
+       ND_PRINT((ndo, " call %s", tok2str(kauth_req, "op#%u", kauth_op)));

 
        /*
         * Decode some of the arguments to the KA calls
 
        /*
         * Decode some of the arguments to the KA calls


@@ -1914,7 +1926,7 @@ kauth_print(register const u_char *bp, int length)
        bp += sizeof(struct rx_header) + 4;
 
        switch (kauth_op) {
        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 */
                case 21:        /* Authenticate */
                case 22:        /* Authenticate-V2 */
                case 2:         /* Change PW */


@@ -1924,37 +1936,37 @@ kauth_print(register const u_char *bp, int length)
                case 8:         /* Get entry */
                case 14:        /* Unlock */
                case 15:        /* Lock status */
                case 8:         /* Get entry */
                case 14:        /* Unlock */
                case 15:        /* Lock status */

-                       printf(" principal");
+                       ND_PRINT((ndo, " principal"));

                        STROUT(KANAMEMAX);
                        STROUT(KANAMEMAX);
                        break;
                case 3:         /* GetTicket-old */
                case 23:        /* GetTicket */
                {
                        STROUT(KANAMEMAX);
                        STROUT(KANAMEMAX);
                        break;
                case 3:         /* GetTicket-old */
                case 23:        /* GetTicket */
                {

-                       int i;
-                       printf(" kvno");
+                       uint32_t i;
+                       ND_PRINT((ndo, " kvno"));

                        INTOUT();
                        INTOUT();

-                       printf(" domain");
+                       ND_PRINT((ndo, " domain"));

                        STROUT(KANAMEMAX);
                        STROUT(KANAMEMAX);

-                       TCHECK2(bp[0], sizeof(int32_t));
-                       i = (int) EXTRACT_32BITS(bp);
-                       bp += sizeof(int32_t);
-                       TCHECK2(bp[0], i);
+                       ND_TCHECK_4(bp);
+                       i = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);
+                       ND_TCHECK2(bp[0], i);

                        bp += i;
                        bp += i;

-                       printf(" principal");
+                       ND_PRINT((ndo, " principal"));

                        STROUT(KANAMEMAX);
                        STROUT(KANAMEMAX);
                        break;
                }
                case 4:         /* Set Password */
                        STROUT(KANAMEMAX);
                        STROUT(KANAMEMAX);
                        break;
                }
                case 4:         /* Set Password */

-                       printf(" principal");
+                       ND_PRINT((ndo, " principal"));

                        STROUT(KANAMEMAX);
                        STROUT(KANAMEMAX);
                        STROUT(KANAMEMAX);
                        STROUT(KANAMEMAX);

-                       printf(" kvno");
+                       ND_PRINT((ndo, " kvno"));

                        INTOUT();
                        break;
                case 12:        /* Get password */
                        INTOUT();
                        break;
                case 12:        /* Get password */

-                       printf(" name");
+                       ND_PRINT((ndo, " name"));

                        STROUT(KANAMEMAX);
                        break;
                default:
                        STROUT(KANAMEMAX);
                        break;
                default:


@@ -1964,7 +1976,7 @@ kauth_print(register const u_char *bp, int length)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf(" [|kauth]");
+       ND_PRINT((ndo, " [|kauth]"));

 }
 
 /*
 }
 
 /*


@@ -1972,50 +1984,53 @@ trunc:
  */
 
 static void
  */
 
 static void

-kauth_reply_print(register const u_char *bp, int length, int32_t opcode)
+kauth_reply_print(netdissect_options *ndo,
+                  register 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;
 
                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
         */
 
 
        /*
         * Print out the afs call we're invoking.  The table used here was
         * gleaned from kauth/kauth.rg
         */
 

-       printf(" kauth");
+       ND_PRINT((ndo, " kauth"));

 
        if (is_ubik(opcode)) {
 
        if (is_ubik(opcode)) {

-               ubik_reply_print(bp, length, opcode);
+               ubik_reply_print(ndo, bp, length, opcode);

                return;
        }
 
                return;
        }
 

-       printf(" reply %s", tok2str(kauth_req, "op#%d", opcode));
+       ND_PRINT((ndo, " reply %s", tok2str(kauth_req, "op#%u", opcode)));

 
 

+       type = EXTRACT_U_1(rxh->type);

        bp += sizeof(struct rx_header);
 
        /*
         * If it was a data packet, interpret the response.
         */
 
        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
                 */
                /* Well, no, not really.  Leave this for later */
                ;
        else {
                /*
                 * Otherwise, just print out the return code
                 */

-               printf(" errcode");
+               ND_PRINT((ndo, " errcode"));

                INTOUT();
        }
 
        return;
 
 trunc:
                INTOUT();
        }
 
        return;
 
 trunc:

-       printf(" [|kauth]");
+       ND_PRINT((ndo, " [|kauth]"));

 }
 
 /*
 }
 
 /*


@@ -2023,144 +2038,142 @@ trunc:
  */
 
 static void
  */
 
 static void

-vol_print(register const u_char *bp, int length)
+vol_print(netdissect_options *ndo,
+          register 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;
 
                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
         */
 
        /*
         * 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));
+       ND_TCHECK_4(bp + sizeof(struct rx_header));
+       vol_op = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 
 

-       printf(" vol call %s", tok2str(vol_req, "op#%d", vol_op));
+       ND_PRINT((ndo, " vol call %s", tok2str(vol_req, "op#%u", vol_op)));

 
        bp += sizeof(struct rx_header) + 4;
 
        switch (vol_op) {
                case 100:       /* Create volume */
 
        bp += sizeof(struct rx_header) + 4;
 
        switch (vol_op) {
                case 100:       /* Create volume */

-                       printf(" partition");
+                       ND_PRINT((ndo, " partition"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" name");
+                       ND_PRINT((ndo, " name"));

                        STROUT(AFSNAMEMAX);
                        STROUT(AFSNAMEMAX);

-                       printf(" type");
+                       ND_PRINT((ndo, " type"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" parent");
+                       ND_PRINT((ndo, " parent"));

                        UINTOUT();
                        break;
                case 101:       /* Delete volume */
                case 107:       /* Get flags */
                        UINTOUT();
                        break;
                case 101:       /* Delete volume */
                case 107:       /* Get flags */

-                       printf(" trans");
+                       ND_PRINT((ndo, " trans"));

                        UINTOUT();
                        break;
                case 102:       /* Restore */
                        UINTOUT();
                        break;
                case 102:       /* Restore */

-                       printf(" totrans");
+                       ND_PRINT((ndo, " totrans"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" flags");
+                       ND_PRINT((ndo, " flags"));

                        UINTOUT();
                        break;
                case 103:       /* Forward */
                        UINTOUT();
                        break;
                case 103:       /* Forward */

-                       printf(" fromtrans");
+                       ND_PRINT((ndo, " fromtrans"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" fromdate");
+                       ND_PRINT((ndo, " fromdate"));

                        DATEOUT();
                        DESTSERVEROUT();
                        DATEOUT();
                        DESTSERVEROUT();

-                       printf(" desttrans");
+                       ND_PRINT((ndo, " desttrans"));

                        INTOUT();
                        break;
                case 104:       /* End trans */
                        INTOUT();
                        break;
                case 104:       /* End trans */

-                       printf(" trans");
+                       ND_PRINT((ndo, " trans"));

                        UINTOUT();
                        break;
                case 105:       /* Clone */
                        UINTOUT();
                        break;
                case 105:       /* Clone */

-                       printf(" trans");
+                       ND_PRINT((ndo, " trans"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" purgevol");
+                       ND_PRINT((ndo, " purgevol"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" newtype");
+                       ND_PRINT((ndo, " newtype"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" newname");
+                       ND_PRINT((ndo, " newname"));

                        STROUT(AFSNAMEMAX);
                        break;
                case 106:       /* Set flags */
                        STROUT(AFSNAMEMAX);
                        break;
                case 106:       /* Set flags */

-                       printf(" trans");
+                       ND_PRINT((ndo, " trans"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" flags");
+                       ND_PRINT((ndo, " flags"));

                        UINTOUT();
                        break;
                case 108:       /* Trans create */
                        UINTOUT();
                        break;
                case 108:       /* Trans create */

-                       printf(" vol");
+                       ND_PRINT((ndo, " vol"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" partition");
+                       ND_PRINT((ndo, " partition"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" flags");
+                       ND_PRINT((ndo, " flags"));

                        UINTOUT();
                        break;
                case 109:       /* Dump */
                case 655537:    /* Get size */
                        UINTOUT();
                        break;
                case 109:       /* Dump */
                case 655537:    /* Get size */

-                       printf(" fromtrans");
+                       ND_PRINT((ndo, " fromtrans"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" fromdate");
+                       ND_PRINT((ndo, " fromdate"));

                        DATEOUT();
                        break;
                case 110:       /* Get n-th volume */
                        DATEOUT();
                        break;
                case 110:       /* Get n-th volume */

-                       printf(" index");
+                       ND_PRINT((ndo, " index"));

                        UINTOUT();
                        break;
                case 111:       /* Set forwarding */
                        UINTOUT();
                        break;
                case 111:       /* Set forwarding */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" newsite");
+                       ND_PRINT((ndo, " newsite"));

                        UINTOUT();
                        break;
                case 112:       /* Get name */
                case 113:       /* Get status */
                        UINTOUT();
                        break;
                case 112:       /* Get name */
                case 113:       /* Get status */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        break;
                case 114:       /* Signal restore */
                        break;
                case 114:       /* Signal restore */

-                       printf(" name");
+                       ND_PRINT((ndo, " name"));

                        STROUT(AFSNAMEMAX);
                        STROUT(AFSNAMEMAX);

-                       printf(" type");
+                       ND_PRINT((ndo, " type"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" pid");
+                       ND_PRINT((ndo, " pid"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" cloneid");
+                       ND_PRINT((ndo, " cloneid"));

                        UINTOUT();
                        break;
                case 116:       /* List volumes */
                        UINTOUT();
                        break;
                case 116:       /* List volumes */

-                       printf(" partition");
+                       ND_PRINT((ndo, " partition"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" flags");
+                       ND_PRINT((ndo, " flags"));

                        UINTOUT();
                        break;
                case 117:       /* Set id types */
                        UINTOUT();
                        break;
                case 117:       /* Set id types */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" name");
+                       ND_PRINT((ndo, " name"));

                        STROUT(AFSNAMEMAX);
                        STROUT(AFSNAMEMAX);

-                       printf(" type");
+                       ND_PRINT((ndo, " type"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" pid");
+                       ND_PRINT((ndo, " pid"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" clone");
+                       ND_PRINT((ndo, " clone"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" backup");
+                       ND_PRINT((ndo, " backup"));

                        UINTOUT();
                        break;
                case 119:       /* Partition info */
                        UINTOUT();
                        break;
                case 119:       /* Partition info */

-                       printf(" name");
+                       ND_PRINT((ndo, " name"));

                        STROUT(AFSNAMEMAX);
                        break;
                case 120:       /* Reclone */
                        STROUT(AFSNAMEMAX);
                        break;
                case 120:       /* Reclone */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UINTOUT();
                        break;
                case 121:       /* List one volume */
                        UINTOUT();
                        break;
                case 121:       /* List one volume */


@@ -2168,46 +2181,46 @@ 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 */
                case 124:       /* Extended List volumes */
                case 125:       /* Extended List one volume */
                case 65536:     /* Convert RO to RW volume */

-                       printf(" partid");
+                       ND_PRINT((ndo, " partid"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" volid");
+                       ND_PRINT((ndo, " volid"));

                        UINTOUT();
                        break;
                case 123:       /* Set date */
                        UINTOUT();
                        break;
                case 123:       /* Set date */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" date");
+                       ND_PRINT((ndo, " date"));

                        DATEOUT();
                        break;
                case 126:       /* Set info */
                        DATEOUT();
                        break;
                case 126:       /* Set info */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UINTOUT();
                        break;
                case 128:       /* Forward multiple */
                        UINTOUT();
                        break;
                case 128:       /* Forward multiple */

-                       printf(" fromtrans");
+                       ND_PRINT((ndo, " fromtrans"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" fromdate");
+                       ND_PRINT((ndo, " fromdate"));

                        DATEOUT();
                        {
                        DATEOUT();
                        {

-                               unsigned long i, j;
-                               TCHECK2(bp[0], 4);
-                               j = EXTRACT_32BITS(bp);
-                               bp += sizeof(int32_t);
+                               uint32_t i, j;
+                               ND_TCHECK_4(bp);
+                               j = EXTRACT_BE_U_4(bp);
+                               bp += sizeof(uint32_t);

                                for (i = 0; i < j; i++) {
                                        DESTSERVEROUT();
                                        if (i != j - 1)
                                for (i = 0; i < j; i++) {
                                        DESTSERVEROUT();
                                        if (i != j - 1)

-                                               printf(",");
+                                               ND_PRINT((ndo, ","));

                                }
                                if (j == 0)
                                }
                                if (j == 0)

-                                       printf(" <none!>");
+                                       ND_PRINT((ndo, " <none!>"));

                        }
                        break;
                case 65538:     /* Dump version 2 */
                        }
                        break;
                case 65538:     /* Dump version 2 */

-                       printf(" fromtrans");
+                       ND_PRINT((ndo, " fromtrans"));

                        UINTOUT();
                        UINTOUT();

-                       printf(" fromdate");
+                       ND_PRINT((ndo, " fromdate"));

                        DATEOUT();
                        DATEOUT();

-                       printf(" flags");
+                       ND_PRINT((ndo, " flags"));

                        UINTOUT();
                        break;
                default:
                        UINTOUT();
                        break;
                default:


@@ -2216,7 +2229,7 @@ vol_print(register const u_char *bp, int length)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf(" [|vol]");
+       ND_PRINT((ndo, " [|vol]"));

 }
 
 /*
 }
 
 /*


@@ -2224,91 +2237,94 @@ trunc:
  */
 
 static void
  */
 
 static void

-vol_reply_print(register const u_char *bp, int length, int32_t opcode)
+vol_reply_print(netdissect_options *ndo,
+                register 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;
 
                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
         */
 
 
        /*
         * 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((ndo, " vol reply %s", tok2str(vol_req, "op#%u", opcode)));

 
 

+       type = EXTRACT_U_1(rxh->type);

        bp += sizeof(struct rx_header);
 
        /*
         * If it was a data packet, interpret the response.
         */
 
        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 */
                switch (opcode) {
                        case 100:       /* Create volume */

-                               printf(" volid");
+                               ND_PRINT((ndo, " volid"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" trans");
+                               ND_PRINT((ndo, " trans"));

                                UINTOUT();
                                break;
                        case 104:       /* End transaction */
                                UINTOUT();
                                break;
                        case 105:       /* Clone */
                                UINTOUT();
                                break;
                        case 104:       /* End transaction */
                                UINTOUT();
                                break;
                        case 105:       /* Clone */

-                               printf(" newvol");
+                               ND_PRINT((ndo, " newvol"));

                                UINTOUT();
                                break;
                        case 107:       /* Get flags */
                                UINTOUT();
                                break;
                        case 108:       /* Transaction create */
                                UINTOUT();
                                break;
                        case 107:       /* Get flags */
                                UINTOUT();
                                break;
                        case 108:       /* Transaction create */

-                               printf(" trans");
+                               ND_PRINT((ndo, " trans"));

                                UINTOUT();
                                break;
                        case 110:       /* Get n-th volume */
                                UINTOUT();
                                break;
                        case 110:       /* Get n-th volume */

-                               printf(" volume");
+                               ND_PRINT((ndo, " volume"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" partition");
+                               ND_PRINT((ndo, " partition"));

                                UINTOUT();
                                break;
                        case 112:       /* Get name */
                                STROUT(AFSNAMEMAX);
                                break;
                        case 113:       /* Get status */
                                UINTOUT();
                                break;
                        case 112:       /* Get name */
                                STROUT(AFSNAMEMAX);
                                break;
                        case 113:       /* Get status */

-                               printf(" volid");
+                               ND_PRINT((ndo, " volid"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" nextuniq");
+                               ND_PRINT((ndo, " nextuniq"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" type");
+                               ND_PRINT((ndo, " type"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" parentid");
+                               ND_PRINT((ndo, " parentid"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" clone");
+                               ND_PRINT((ndo, " clone"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" backup");
+                               ND_PRINT((ndo, " backup"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" restore");
+                               ND_PRINT((ndo, " restore"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" maxquota");
+                               ND_PRINT((ndo, " maxquota"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" minquota");
+                               ND_PRINT((ndo, " minquota"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" owner");
+                               ND_PRINT((ndo, " owner"));

                                UINTOUT();
                                UINTOUT();

-                               printf(" create");
+                               ND_PRINT((ndo, " create"));

                                DATEOUT();
                                DATEOUT();

-                               printf(" access");
+                               ND_PRINT((ndo, " access"));

                                DATEOUT();
                                DATEOUT();

-                               printf(" update");
+                               ND_PRINT((ndo, " update"));

                                DATEOUT();
                                DATEOUT();

-                               printf(" expire");
+                               ND_PRINT((ndo, " expire"));

                                DATEOUT();
                                DATEOUT();

-                               printf(" backup");
+                               ND_PRINT((ndo, " backup"));

                                DATEOUT();
                                DATEOUT();

-                               printf(" copy");
+                               ND_PRINT((ndo, " copy"));

                                DATEOUT();
                                break;
                        case 115:       /* Old list partitions */
                                DATEOUT();
                                break;
                        case 115:       /* Old list partitions */


@@ -2316,22 +2332,22 @@ vol_reply_print(register const u_char *bp, int length, int32_t opcode)
                        case 116:       /* List volumes */
                        case 121:       /* List one volume */
                                {
                        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;
+                                       ND_TCHECK_4(bp);
+                                       j = EXTRACT_BE_U_4(bp);
+                                       bp += sizeof(uint32_t);

                                        for (i = 0; i < j; i++) {
                                        for (i = 0; i < j; i++) {

-                                               printf(" name");
+                                               ND_PRINT((ndo, " name"));

                                                VECOUT(32);
                                                VECOUT(32);

-                                               printf(" volid");
+                                               ND_PRINT((ndo, " volid"));

                                                UINTOUT();
                                                UINTOUT();

-                                               printf(" type");
-                                               bp += sizeof(int32_t) * 21;
+                                               ND_PRINT((ndo, " type"));
+                                               bp += sizeof(uint32_t) * 21;

                                                if (i != j - 1)
                                                if (i != j - 1)

-                                                       printf(",");
+                                                       ND_PRINT((ndo, ","));

                                        }
                                        if (j == 0)
                                        }
                                        if (j == 0)

-                                               printf(" <none!>");
+                                               ND_PRINT((ndo, " <none!>"));

                                }
                                break;
 
                                }
                                break;
 


@@ -2343,14 +2359,14 @@ vol_reply_print(register const u_char *bp, int length, int32_t opcode)
                /*
                 * Otherwise, just print out the return code
                 */
                /*
                 * Otherwise, just print out the return code
                 */

-               printf(" errcode");
+               ND_PRINT((ndo, " errcode"));

                INTOUT();
        }
 
        return;
 
 trunc:
                INTOUT();
        }
 
        return;
 
 trunc:

-       printf(" [|vol]");
+       ND_PRINT((ndo, " [|vol]"));

 }
 
 /*
 }
 
 /*


@@ -2358,25 +2374,23 @@ trunc:
  */
 
 static void
  */
 
 static void

-bos_print(register const u_char *bp, int length)
+bos_print(netdissect_options *ndo,
+          register 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;
 
                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
         */
 
        /*
         * 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));
+       ND_TCHECK_4(bp + sizeof(struct rx_header));
+       bos_op = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 
 

-       printf(" bos call %s", tok2str(bos_req, "op#%d", bos_op));
+       ND_PRINT((ndo, " bos call %s", tok2str(bos_req, "op#%u", bos_op)));

 
        /*
         * Decode some of the arguments to the BOS calls
 
        /*
         * Decode some of the arguments to the BOS calls


@@ -2386,9 +2400,9 @@ bos_print(register const u_char *bp, int length)
 
        switch (bos_op) {
                case 80:        /* Create B node */
 
        switch (bos_op) {
                case 80:        /* Create B node */

-                       printf(" type");
+                       ND_PRINT((ndo, " type"));

                        STROUT(BOSNAMEMAX);
                        STROUT(BOSNAMEMAX);

-                       printf(" instance");
+                       ND_PRINT((ndo, " instance"));

                        STROUT(BOSNAMEMAX);
                        break;
                case 81:        /* Delete B node */
                        STROUT(BOSNAMEMAX);
                        break;
                case 81:        /* Delete B node */


@@ -2409,12 +2423,12 @@ bos_print(register const u_char *bp, int length)
                case 82:        /* Set status */
                case 98:        /* Set T status */
                        STROUT(BOSNAMEMAX);
                case 82:        /* Set status */
                case 98:        /* Set T status */
                        STROUT(BOSNAMEMAX);

-                       printf(" status");
+                       ND_PRINT((ndo, " status"));

                        INTOUT();
                        break;
                case 86:        /* Get instance parm */
                        STROUT(BOSNAMEMAX);
                        INTOUT();
                        break;
                case 86:        /* Get instance parm */
                        STROUT(BOSNAMEMAX);

-                       printf(" num");
+                       ND_PRINT((ndo, " num"));

                        INTOUT();
                        break;
                case 84:        /* Enumerate instance */
                        INTOUT();
                        break;
                case 84:        /* Enumerate instance */


@@ -2427,11 +2441,11 @@ bos_print(register const u_char *bp, int length)
                        break;
                case 105:       /* Install */
                        STROUT(BOSNAMEMAX);
                        break;
                case 105:       /* Install */
                        STROUT(BOSNAMEMAX);

-                       printf(" size");
+                       ND_PRINT((ndo, " size"));

                        INTOUT();
                        INTOUT();

-                       printf(" flags");
+                       ND_PRINT((ndo, " flags"));

                        INTOUT();
                        INTOUT();

-                       printf(" date");
+                       ND_PRINT((ndo, " date"));

                        INTOUT();
                        break;
                default:
                        INTOUT();
                        break;
                default:


@@ -2441,7 +2455,7 @@ bos_print(register const u_char *bp, int length)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf(" [|bos]");
+       ND_PRINT((ndo, " [|bos]"));

 }
 
 /*
 }
 
 /*


@@ -2449,43 +2463,46 @@ trunc:
  */
 
 static void
  */
 
 static void

-bos_reply_print(register const u_char *bp, int length, int32_t opcode)
+bos_reply_print(netdissect_options *ndo,
+                register 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;
 
                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
         */
 
 
        /*
         * 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((ndo, " bos reply %s", tok2str(bos_req, "op#%u", opcode)));

 
 

+       type = EXTRACT_U_1(rxh->type);

        bp += sizeof(struct rx_header);
 
        /*
         * If it was a data packet, interpret the response.
         */
 
        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
                 */
                /* Well, no, not really.  Leave this for later */
                ;
        else {
                /*
                 * Otherwise, just print out the return code
                 */

-               printf(" errcode");
+               ND_PRINT((ndo, " errcode"));

                INTOUT();
        }
 
        return;
 
 trunc:
                INTOUT();
        }
 
        return;
 
 trunc:

-       printf(" [|bos]");
+       ND_PRINT((ndo, " [|bos]"));

 }
 
 /*
 }
 
 /*


@@ -2493,7 +2510,7 @@ trunc:
  */
 
 static int
  */
 
 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))
 {
        if ((opcode >= VOTE_LOW && opcode <= VOTE_HIGH) ||
            (opcode >= DISK_LOW && opcode <= DISK_HIGH))


@@ -2507,19 +2524,24 @@ is_ubik(u_int32_t opcode)
  */
 
 static void
  */
 
 static void

-ubik_print(register const u_char *bp)
+ubik_print(netdissect_options *ndo,
+           register 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
         */
 
 
        /*
         * 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 = EXTRACT_BE_U_4(bp + sizeof(struct rx_header));

 
 

-       printf(" ubik call %s", tok2str(ubik_req, "op#%d", ubik_op));
+       ND_PRINT((ndo, " ubik call %s", tok2str(ubik_req, "op#%u", ubik_op)));

 
        /*
         * Decode some of the arguments to the Ubik calls
 
        /*
         * Decode some of the arguments to the Ubik calls


@@ -2529,19 +2551,19 @@ ubik_print(register const u_char *bp)
 
        switch (ubik_op) {
                case 10000:             /* Beacon */
 
        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");
+                       ND_TCHECK_4(bp);
+                       temp = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);
+                       ND_PRINT((ndo, " syncsite %s", temp ? "yes" : "no"));
+                       ND_PRINT((ndo, " votestart"));

                        DATEOUT();
                        DATEOUT();

-                       printf(" dbversion");
+                       ND_PRINT((ndo, " dbversion"));

                        UBIK_VERSIONOUT();
                        UBIK_VERSIONOUT();

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UBIK_VERSIONOUT();
                        break;
                case 10003:             /* Get sync site */
                        UBIK_VERSIONOUT();
                        break;
                case 10003:             /* Get sync site */

-                       printf(" site");
+                       ND_PRINT((ndo, " site"));

                        UINTOUT();
                        break;
                case 20000:             /* Begin */
                        UINTOUT();
                        break;
                case 20000:             /* Begin */


@@ -2549,56 +2571,57 @@ ubik_print(register const u_char *bp)
                case 20007:             /* Abort */
                case 20008:             /* Release locks */
                case 20010:             /* Writev */
                case 20007:             /* Abort */
                case 20008:             /* Release locks */
                case 20010:             /* Writev */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UBIK_VERSIONOUT();
                        break;
                case 20002:             /* Lock */
                        UBIK_VERSIONOUT();
                        break;
                case 20002:             /* Lock */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UBIK_VERSIONOUT();
                        UBIK_VERSIONOUT();

-                       printf(" file");
+                       ND_PRINT((ndo, " file"));

                        INTOUT();
                        INTOUT();

-                       printf(" pos");
+                       ND_PRINT((ndo, " pos"));

                        INTOUT();
                        INTOUT();

-                       printf(" length");
+                       ND_PRINT((ndo, " length"));

                        INTOUT();
                        INTOUT();

-                       temp = EXTRACT_32BITS(bp);
-                       bp += sizeof(int32_t);
-                       tok2str(ubik_lock_types, "type %d", temp);
+                       ND_TCHECK_4(bp);
+                       temp = EXTRACT_BE_U_4(bp);
+                       bp += sizeof(uint32_t);
+                       tok2str(ubik_lock_types, "type %u", temp);

                        break;
                case 20003:             /* Write */
                        break;
                case 20003:             /* Write */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UBIK_VERSIONOUT();
                        UBIK_VERSIONOUT();

-                       printf(" file");
+                       ND_PRINT((ndo, " file"));

                        INTOUT();
                        INTOUT();

-                       printf(" pos");
+                       ND_PRINT((ndo, " pos"));

                        INTOUT();
                        break;
                case 20005:             /* Get file */
                        INTOUT();
                        break;
                case 20005:             /* Get file */

-                       printf(" file");
+                       ND_PRINT((ndo, " file"));

                        INTOUT();
                        break;
                case 20006:             /* Send file */
                        INTOUT();
                        break;
                case 20006:             /* Send file */

-                       printf(" file");
+                       ND_PRINT((ndo, " file"));

                        INTOUT();
                        INTOUT();

-                       printf(" length");
+                       ND_PRINT((ndo, " length"));

                        INTOUT();
                        INTOUT();

-                       printf(" dbversion");
+                       ND_PRINT((ndo, " dbversion"));

                        UBIK_VERSIONOUT();
                        break;
                case 20009:             /* Truncate */
                        UBIK_VERSIONOUT();
                        break;
                case 20009:             /* Truncate */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UBIK_VERSIONOUT();
                        UBIK_VERSIONOUT();

-                       printf(" file");
+                       ND_PRINT((ndo, " file"));

                        INTOUT();
                        INTOUT();

-                       printf(" length");
+                       ND_PRINT((ndo, " length"));

                        INTOUT();
                        break;
                case 20012:             /* Set version */
                        INTOUT();
                        break;
                case 20012:             /* Set version */

-                       printf(" tid");
+                       ND_PRINT((ndo, " tid"));

                        UBIK_VERSIONOUT();
                        UBIK_VERSIONOUT();

-                       printf(" oldversion");
+                       ND_PRINT((ndo, " oldversion"));

                        UBIK_VERSIONOUT();
                        UBIK_VERSIONOUT();

-                       printf(" newversion");
+                       ND_PRINT((ndo, " newversion"));

                        UBIK_VERSIONOUT();
                        break;
                default:
                        UBIK_VERSIONOUT();
                        break;
                default:


@@ -2608,7 +2631,7 @@ ubik_print(register const u_char *bp)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf(" [|ubik]");
+       ND_PRINT((ndo, " [|ubik]"));

 }
 
 /*
 }
 
 /*


@@ -2616,35 +2639,38 @@ trunc:
  */
 
 static void
  */
 
 static void

-ubik_reply_print(register const u_char *bp, int length, int32_t opcode)
+ubik_reply_print(netdissect_options *ndo,
+                 register 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;
 
                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
         */
 
 
        /*
         * 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((ndo, " ubik reply %s", tok2str(ubik_req, "op#%u", opcode)));

 
 

+       type = EXTRACT_U_1(rxh->type);

        bp += sizeof(struct rx_header);
 
        /*
         * If it was a data packet, print out the arguments to the Ubik calls
         */
 
        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 */
                switch (opcode) {
                case 10000:             /* Beacon */

-                       printf(" vote no");
+                       ND_PRINT((ndo, " vote no"));

                        break;
                case 20004:             /* Get version */
                        break;
                case 20004:             /* Get version */

-                       printf(" dbversion");
+                       ND_PRINT((ndo, " dbversion"));

                        UBIK_VERSIONOUT();
                        break;
                default:
                        UBIK_VERSIONOUT();
                        break;
                default:


@@ -2660,18 +2686,18 @@ ubik_reply_print(register const u_char *bp, int length, int32_t opcode)
        else
                switch (opcode) {
                case 10000:             /* Beacon */
        else
                switch (opcode) {
                case 10000:             /* Beacon */

-                       printf(" vote yes until");
+                       ND_PRINT((ndo, " vote yes until"));

                        DATEOUT();
                        break;
                default:
                        DATEOUT();
                        break;
                default:

-                       printf(" errcode");
+                       ND_PRINT((ndo, " errcode"));

                        INTOUT();
                }
 
        return;
 
 trunc:
                        INTOUT();
                }
 
        return;
 
 trunc:

-       printf(" [|ubik]");
+       ND_PRINT((ndo, " [|ubik]"));

 }
 
 /*
 }
 
 /*


@@ -2679,43 +2705,37 @@ trunc:
  */
 
 static void
  */
 
 static void

-rx_ack_print(register const u_char *bp, int length)
+rx_ack_print(netdissect_options *ndo,
+             register const u_char *bp, u_int length)

 {
 {

-       struct rx_ackPacket *rxa;
+       const struct rx_ackPacket *rxa;
+       uint8_t nAcks;

        int i, start, last;
        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);
 
                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_TCHECK2(bp[0], 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
         */
 
 
        /*
         * 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((ndo, " bufspace %u maxskew %d",
+                      EXTRACT_BE_U_2(rxa->bufferSpace),
+                      EXTRACT_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 = EXTRACT_BE_U_4(rxa->firstPacket);
+       ND_PRINT((ndo, " first %u serial %u reason %s",
+              firstPacket, EXTRACT_BE_U_4(rxa->serial),
+              tok2str(rx_ack_reasons, "#%u", EXTRACT_U_1(rxa->reason))));

 
        /*
         * Okay, now we print out the ack array.  The way _this_ works
 
        /*
         * Okay, now we print out the ack array.  The way _this_ works


@@ -2736,17 +2756,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.
         */
 
         * to bp after this, so bp ends up at the right spot.  Go figure.
         */
 

-       if (rxa->nAcks != 0) {
+       nAcks = EXTRACT_U_1(rxa->nAcks);
+       if (nAcks != 0) {

 
 

-               TCHECK2(bp[0], rxa->nAcks);
+               ND_TCHECK2(bp[0], nAcks);

 
                /*
                 * Sigh, this is gross, but it seems to work to collapse
                 * ranges correctly.
                 */
 
 
                /*
                 * 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 (EXTRACT_U_1(bp + i) == RX_ACK_TYPE_ACK) {

 
                                /*
                                 * I figured this deserved _some_ explanation.
 
                                /*
                                 * I figured this deserved _some_ explanation.


@@ -2756,13 +2777,12 @@ rx_ack_print(register const u_char *bp, int length)
                                 */
 
                                if (last == -2) {
                                 */
 
                                if (last == -2) {

-                                       printf(" acked %d",
-                                              firstPacket + i);
+                                       ND_PRINT((ndo, " acked %u", firstPacket + i));

                                        start = 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
                                 * the range (such as an nacked packet in
                                 * the middle of some acked packets),
                                 * then print the current packet number


@@ -2771,7 +2791,7 @@ rx_ack_print(register const u_char *bp, int length)
                                 */
 
                                else if (last != i - 1) {
                                 */
 
                                else if (last != i - 1) {

-                                       printf(",%d", firstPacket + i);
+                                       ND_PRINT((ndo, ",%u", firstPacket + i));

                                        start = i;
                                }
 
                                        start = i;
                                }
 


@@ -2797,7 +2817,7 @@ rx_ack_print(register const u_char *bp, int length)
                                 * range.
                                 */
                        } else if (last == i - 1 && start != last)
                                 * range.
                                 */
                        } else if (last == i - 1 && start != last)

-                               printf("-%d", firstPacket + i - 1);
+                               ND_PRINT((ndo, "-%u", firstPacket + i - 1));

 
                /*
                 * So, what's going on here?  We ran off the end of the
 
                /*
                 * So, what's going on here?  We ran off the end of the


@@ -2811,61 +2831,62 @@ rx_ack_print(register const u_char *bp, int length)
                 */
 
                if (last == i - 1 && start != last)
                 */
 
                if (last == i - 1 && start != last)

-                       printf("-%d", firstPacket + i - 1);
+                       ND_PRINT((ndo, "-%u", firstPacket + i - 1));

 
                /*
                 * Same as above, just without comments
                 */
 
 
                /*
                 * 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 (EXTRACT_U_1(bp + i) == RX_ACK_TYPE_NACK) {

                                if (last == -2) {
                                if (last == -2) {

-                                       printf(" nacked %d",
-                                              firstPacket + i);
+                                       ND_PRINT((ndo, " nacked %u", firstPacket + i));

                                        start = i;
                                } else if (last != i - 1) {
                                        start = i;
                                } else if (last != i - 1) {

-                                       printf(",%d", firstPacket + i);
+                                       ND_PRINT((ndo, ",%u", firstPacket + i));

                                        start = i;
                                }
                                last = i;
                        } else if (last == i - 1 && start != last)
                                        start = i;
                                }
                                last = i;
                        } else if (last == i - 1 && start != last)

-                               printf("-%d", firstPacket + i - 1);
+                               ND_PRINT((ndo, "-%u", firstPacket + i - 1));

 
                if (last == i - 1 && start != last)
 
                if (last == i - 1 && start != last)

-                       printf("-%d", firstPacket + i - 1);
+                       ND_PRINT((ndo, "-%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
         */
 
 
        /*
         * 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);
                TRUNCRET(4);

-               printf(" ifmtu");
-               INTOUT();
+               ND_PRINT((ndo, " ifmtu"));
+               UINTOUT();

 
                TRUNCRET(4);
 
                TRUNCRET(4);

-               printf(" maxmtu");
-               INTOUT();
+               ND_PRINT((ndo, " maxmtu"));
+               UINTOUT();

 
                TRUNCRET(4);
 
                TRUNCRET(4);

-               printf(" rwind");
-               INTOUT();
+               ND_PRINT((ndo, " rwind"));
+               UINTOUT();

 
                TRUNCRET(4);
 
                TRUNCRET(4);

-               printf(" maxpackets");
-               INTOUT();
+               ND_PRINT((ndo, " maxpackets"));
+               UINTOUT();

        }
 
        return;
 
 trunc:
        }
 
        return;
 
 trunc:

-       printf(" [|ack]");
+       ND_PRINT((ndo, " [|ack]"));

 }
 #undef TRUNCRET
 }
 #undef TRUNCRET