Use more the ND_TTEST_1() macro

[tcpdump] / print-forces.c

diff --git a/print-forces.c b/print-forces.c
index 5a19890e50b0bc94b882f57265e136494e76ef3b..f6be80c21243b5af6322edc1996551705e865ab5 100644 (file)
--- a/print-forces.c
+++ b/print-forces.c
@@ -14,23 +14,21 @@
  *
  */
 
  *
  */
 

+/* \summary: Forwarding and Control Element Separation (ForCES) Protocol printer */
+
+/* specification: RFC 5810 */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

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

 
 

-#include <stdio.h>
-#include <stdlib.h>
-
-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 
 static const char tstr[] = "[|forces]";
 
 #include "extract.h"
 
 static const char tstr[] = "[|forces]";
 

-/*
- * Per draft-ietf-forces-protocol-22
-*/

 #define        ForCES_VERS     1
 #define        ForCES_HDRL     24
 #define        ForCES_ALNL     4U
 #define        ForCES_VERS     1
 #define        ForCES_HDRL     24
 #define        ForCES_ALNL     4U


@@ -64,12 +62,12 @@ static const char tstr[] = "[|forces]";
 #define TTLV_T2                (ONE_MORE_TTLV|MAX_TLV)
 
 struct tom_h {
 #define TTLV_T2                (ONE_MORE_TTLV|MAX_TLV)
 
 struct tom_h {

-       u_int32_t v;
-       u_int16_t flags;
-       u_int16_t op_msk;
+       uint32_t v;
+       uint16_t flags;
+       uint16_t op_msk;

        const char *s;
        const char *s;

-       int (*print) (register const u_char * pptr, register u_int len,
-                     u_int16_t op_msk, int indent);
+       int (*print) (netdissect_options *ndo, const u_char * pptr, u_int len,
+                     uint16_t op_msk, int indent);

 };
 
 enum {
 };
 
 enum {


@@ -88,7 +86,7 @@ enum {
 };
 #define TOM_MAX_IND (_TOM_RSV_MAX - 1)
 
 };
 #define TOM_MAX_IND (_TOM_RSV_MAX - 1)
 

-static inline int tom_valid(u_int8_t tom)
+static inline int tom_valid(uint8_t tom)

 {
        if (tom > 0) {
                if (tom >= 0x7 && tom <= 0xe)
 {
        if (tom > 0) {
                if (tom >= 0x7 && tom <= 0xe)


@@ -102,7 +100,7 @@ static inline int tom_valid(u_int8_t tom)
                return 0;
 }
 
                return 0;
 }
 

-static inline const char *ForCES_node(u_int32_t node)
+static inline const char *ForCES_node(uint32_t node)

 {
        if (node <= 0x3FFFFFFF)
                return "FE";
 {
        if (node <= 0x3FFFFFFF)
                return "FE";


@@ -121,76 +119,58 @@ static inline const char *ForCES_node(u_int32_t node)
 
 }
 
 
 }
 

-static inline const char *ForCES_ACKp(u_int32_t flg)
-{
-       if (flg == 0x0)
-               return "NoACK";
-       if (flg == 0x1)
-               return "SuccessACK";
-       if (flg == 0x2)
-               return "FailureACK";
-       if (flg == 0x3)
-               return "AlwaysACK";
-       return "ACKUnknown";
-}
+static const struct tok ForCES_ACKs[] = {
+       {0x0, "NoACK"},
+       {0x1, "SuccessACK"},
+       {0x2, "FailureACK"},
+       {0x3, "AlwaysACK"},
+       {0, NULL}
+};

 
 

-static inline const char *ForCES_EMp(u_int32_t flg)
-{
-       if (flg == 0x0)
-               return "EMReserved";
-       if (flg == 0x1)
-               return "execute-all-or-none";
-       if (flg == 0x2)
-               return "execute-until-failure";
-       if (flg == 0x3)
-               return "continue-execute-on-failure";
-       return "EMUnknown";
-}
+static const struct tok ForCES_EMs[] = {
+       {0x0, "EMReserved"},
+       {0x1, "execute-all-or-none"},
+       {0x2, "execute-until-failure"},
+       {0x3, "continue-execute-on-failure"},
+       {0, NULL}
+};

 
 

-static inline const char *ForCES_ATp(u_int32_t flg)
-{
-       if (flg == 0x0)
-               return "Standalone";
-       if (flg == 0x1)
-               return "2PCtransaction";
-       return "ATUnknown";
-}
+static const struct tok ForCES_ATs[] = {
+       {0x0, "Standalone"},
+       {0x1, "2PCtransaction"},
+       {0, NULL}
+};

 
 

-static inline const char *ForCES_TPp(u_int32_t flg)
-{
-       if (flg == 0x0)
-               return "StartofTransaction";
-       if (flg == 0x1)
-               return "MiddleofTransaction";
-       if (flg == 0x2)
-               return "EndofTransaction";
-       if (flg == 0x3)
-               return "abort";
-       return "TPUnknown";
-}
+static const struct tok ForCES_TPs[] = {
+       {0x0, "StartofTransaction"},
+       {0x1, "MiddleofTransaction"},
+       {0x2, "EndofTransaction"},
+       {0x3, "abort"},
+       {0, NULL}
+};

 
 /*
  * Structure of forces header, naked of TLVs.
  */
 struct forcesh {
 
 /*
  * Structure of forces header, naked of TLVs.
  */
 struct forcesh {

-       u_int8_t fm_vrsvd;      /* version and reserved */
-#define ForCES_V(forcesh)      ((forcesh)->fm_vrsvd >> 4)
-       u_int8_t fm_tom;        /* type of message */
-       u_int16_t fm_len;       /* total length * 4 bytes */
-#define ForCES_BLN(forcesh)    ((u_int32_t)(EXTRACT_16BITS(&(forcesh)->fm_len) << 2))
-       u_int32_t fm_sid;       /* Source ID */
-#define ForCES_SID(forcesh)    EXTRACT_32BITS(&(forcesh)->fm_sid)
-       u_int32_t fm_did;       /* Destination ID */
-#define ForCES_DID(forcesh)    EXTRACT_32BITS(&(forcesh)->fm_did)
-       u_int8_t fm_cor[8];     /* correlator */
-       u_int32_t fm_flags;     /* flags */
-#define ForCES_ACK(forcesh)    ((EXTRACT_32BITS(&(forcesh)->fm_flags)&0xC0000000) >> 30)
-#define ForCES_PRI(forcesh)    ((EXTRACT_32BITS(&(forcesh)->fm_flags)&0x38000000) >> 27)
-#define ForCES_RS1(forcesh)    ((EXTRACT_32BITS(&(forcesh)->fm_flags)&0x07000000) >> 24)
-#define ForCES_EM(forcesh)     ((EXTRACT_32BITS(&(forcesh)->fm_flags)&0x00C00000) >> 22)
-#define ForCES_AT(forcesh)     ((EXTRACT_32BITS(&(forcesh)->fm_flags)&0x00200000) >> 21)
-#define ForCES_TP(forcesh)     ((EXTRACT_32BITS(&(forcesh)->fm_flags)&0x00180000) >> 19)
-#define ForCES_RS2(forcesh)    ((EXTRACT_32BITS(&(forcesh)->fm_flags)&0x0007FFFF) >> 0)
+       nd_uint8_t fm_vrsvd;    /* version and reserved */
+#define ForCES_V(forcesh)      (EXTRACT_U_1((forcesh)->fm_vrsvd) >> 4)
+       nd_uint8_t fm_tom;      /* type of message */
+       nd_uint16_t fm_len;     /* total length * 4 bytes */
+#define ForCES_BLN(forcesh)    ((uint32_t)(EXTRACT_BE_U_2((forcesh)->fm_len) << 2))
+       nd_uint32_t fm_sid;     /* Source ID */
+#define ForCES_SID(forcesh)    EXTRACT_BE_U_4((forcesh)->fm_sid)
+       nd_uint32_t fm_did;     /* Destination ID */
+#define ForCES_DID(forcesh)    EXTRACT_BE_U_4((forcesh)->fm_did)
+       nd_uint8_t fm_cor[8];   /* correlator */
+       nd_uint32_t fm_flags;   /* flags */
+#define ForCES_ACK(forcesh)    ((EXTRACT_BE_U_4((forcesh)->fm_flags)&0xC0000000) >> 30)
+#define ForCES_PRI(forcesh)    ((EXTRACT_BE_U_4((forcesh)->fm_flags)&0x38000000) >> 27)
+#define ForCES_RS1(forcesh)    ((EXTRACT_BE_U_4((forcesh)->fm_flags)&0x07000000) >> 24)
+#define ForCES_EM(forcesh)     ((EXTRACT_BE_U_4((forcesh)->fm_flags)&0x00C00000) >> 22)
+#define ForCES_AT(forcesh)     ((EXTRACT_BE_U_4((forcesh)->fm_flags)&0x00200000) >> 21)
+#define ForCES_TP(forcesh)     ((EXTRACT_BE_U_4((forcesh)->fm_flags)&0x00180000) >> 19)
+#define ForCES_RS2(forcesh)    ((EXTRACT_BE_U_4((forcesh)->fm_flags)&0x0007FFFF) >> 0)

 };
 
 #define ForCES_HLN_VALID(fhl,tlen) ((tlen) >= ForCES_HDRL && \
 };
 
 #define ForCES_HLN_VALID(fhl,tlen) ((tlen) >= ForCES_HDRL && \


@@ -207,26 +187,28 @@ static const struct tok ForCES_LFBs[] = {
        {0, NULL}
 };
 
        {0, NULL}
 };
 

+/* this is defined in RFC5810 section A.2 */
+/*   http://www.iana.org/assignments/forces/forces.xhtml#oper-tlv-types */

 enum {
 enum {

-       F_OP_RSV,
-       F_OP_SET,
-       F_OP_SETPROP,
-       F_OP_SETRESP,
-       F_OP_SETPRESP,
-       F_OP_DEL,
-       F_OP_DELRESP,
-       F_OP_GET,
-       F_OP_GETPROP,
-       F_OP_GETRESP,
-       F_OP_GETPRESP,
-       F_OP_REPORT,
-       F_OP_COMMIT,
-       F_OP_RCOMMIT,
-       F_OP_RTRCOMP,
+       F_OP_RSV        = 0,
+       F_OP_SET        = 1,
+       F_OP_SETPROP    = 2,
+       F_OP_SETRESP    = 3,
+       F_OP_SETPRESP   = 4,
+       F_OP_DEL        = 5,
+       F_OP_DELRESP    = 6,
+       F_OP_GET        = 7,
+       F_OP_GETPROP    = 8,
+       F_OP_GETRESP    = 9,
+       F_OP_GETPRESP   = 10,
+       F_OP_REPORT     = 11,
+       F_OP_COMMIT     = 12,
+       F_OP_RCOMMIT    = 13,
+       F_OP_RTRCOMP    = 14,

        _F_OP_MAX
 };
        _F_OP_MAX
 };

-

 #define F_OP_MAX       (_F_OP_MAX - 1)
 #define F_OP_MAX       (_F_OP_MAX - 1)

+

 enum {
        B_OP_SET = 1 << (F_OP_SET - 1),
        B_OP_SETPROP = 1 << (F_OP_SETPROP - 1),
 enum {
        B_OP_SET = 1 << (F_OP_SET - 1),
        B_OP_SETPROP = 1 << (F_OP_SETPROP - 1),


@@ -241,28 +223,28 @@ enum {
        B_OP_REPORT = 1 << (F_OP_REPORT - 1),
        B_OP_COMMIT = 1 << (F_OP_COMMIT - 1),
        B_OP_RCOMMIT = 1 << (F_OP_RCOMMIT - 1),
        B_OP_REPORT = 1 << (F_OP_REPORT - 1),
        B_OP_COMMIT = 1 << (F_OP_COMMIT - 1),
        B_OP_RCOMMIT = 1 << (F_OP_RCOMMIT - 1),

-       B_OP_RTRCOMP = 1 << (F_OP_RTRCOMP - 1),
+       B_OP_RTRCOMP = 1 << (F_OP_RTRCOMP - 1)

 };
 
 struct optlv_h {
 };
 
 struct optlv_h {

-       u_int16_t flags;
-       u_int16_t op_msk;
+       uint16_t flags;
+       uint16_t op_msk;

        const char *s;
        const char *s;

-       int (*print) (register const u_char * pptr, register u_int len,
-                     u_int16_t op_msk, int indent);
+       int (*print) (netdissect_options *ndo, const u_char * pptr, u_int len,
+                     uint16_t op_msk, int indent);

 };
 
 };
 

-static int genoptlv_print(register const u_char * pptr, register u_int len,
-                        u_int16_t op_msk, int indent);
-static int recpdoptlv_print(register const u_char * pptr, register u_int len,
-                           u_int16_t op_msk, int indent);
-static int invoptlv_print(register const u_char * pptr, register u_int len,
-                         u_int16_t op_msk, int indent);
+static int genoptlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                        uint16_t op_msk, int indent);
+static int recpdoptlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                           uint16_t op_msk, int indent);
+static int invoptlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                         uint16_t op_msk, int indent);

 
 #define OP_MIN_SIZ 8
 struct pathdata_h {
 
 #define OP_MIN_SIZ 8
 struct pathdata_h {

-       u_int16_t pflags;
-       u_int16_t pIDcnt;
+       nd_uint16_t pflags;
+       nd_uint16_t pIDcnt;

 };
 
 #define        B_FULLD         0x1
 };
 
 #define        B_FULLD         0x1


@@ -294,9 +276,9 @@ static const struct optlv_h OPTLV_msg[F_OP_MAX + 1] = {
        /* F_OP_RTRCOMP */ {ZERO_TTLV, 0, " RTRCOMP", NULL},
 };
 
        /* F_OP_RTRCOMP */ {ZERO_TTLV, 0, " RTRCOMP", NULL},
 };
 

-static inline const struct optlv_h *get_forces_optlv_h(u_int16_t opt)
+static inline const struct optlv_h *get_forces_optlv_h(uint16_t opt)

 {
 {

-       if (opt > F_OP_MAX || opt <= F_OP_RSV)
+       if (opt > F_OP_MAX || opt == F_OP_RSV)

                return &OPTLV_msg[F_OP_RSV];
 
        return &OPTLV_msg[opt];
                return &OPTLV_msg[F_OP_RSV];
 
        return &OPTLV_msg[opt];


@@ -306,7 +288,7 @@ static inline const struct optlv_h *get_forces_optlv_h(u_int16_t opt)
 #define IND_CHR ' '
 #define IND_PREF '\n'
 #define IND_SUF 0x0
 #define IND_CHR ' '
 #define IND_PREF '\n'
 #define IND_SUF 0x0

-char ind_buf[IND_SIZE];
+static char ind_buf[IND_SIZE];

 
 static inline char *indent_pr(int indent, int nlpref)
 {
 
 static inline char *indent_pr(int indent, int nlpref)
 {


@@ -329,14 +311,12 @@ static inline char *indent_pr(int indent, int nlpref)
        return r;
 }
 
        return r;
 }
 

-static inline int op_valid(u_int16_t op, u_int16_t mask)
+static inline int op_valid(uint16_t op, uint16_t mask)

 {
 {

-       int opb = 1 << (op - 1);
-

        if (op == 0)
                return 0;
        if (op == 0)
                return 0;

-       if (opb & mask)
-               return 1;
+       if (op <= F_OP_MAX)
+               return (1 << (op - 1)) & mask; /* works only for 0x0001 through 0x0010 */

        /* I guess we should allow vendor operations? */
        if (op >= 0x8000)
                return 1;
        /* I guess we should allow vendor operations? */
        if (op >= 0x8000)
                return 1;


@@ -377,7 +357,7 @@ static const struct tok ForCES_TLV[] = {
 };
 
 #define TLV_HLN        4
 };
 
 #define TLV_HLN        4

-static inline int ttlv_valid(u_int16_t ttlv)
+static inline int ttlv_valid(uint16_t ttlv)

 {
        if (ttlv > 0) {
                if (ttlv == 1 || ttlv == 0x1000)
 {
        if (ttlv > 0) {
                if (ttlv == 1 || ttlv == 0x1000)


@@ -394,35 +374,35 @@ static inline int ttlv_valid(u_int16_t ttlv)
 }
 
 struct forces_ilv {
 }
 
 struct forces_ilv {

-       u_int32_t type;
-       u_int32_t length;
+       nd_uint32_t type;
+       nd_uint32_t length;

 };
 
 struct forces_tlv {
 };
 
 struct forces_tlv {

-       u_int16_t type;
-       u_int16_t length;
+       nd_uint16_t type;
+       nd_uint16_t length;

 };
 
 #define F_ALN_LEN(len) ( ((len)+ForCES_ALNL-1) & ~(ForCES_ALNL-1) )
 };
 
 #define F_ALN_LEN(len) ( ((len)+ForCES_ALNL-1) & ~(ForCES_ALNL-1) )

-#define        GET_TOP_TLV(fhdr) ((struct forces_tlv *)((fhdr) + sizeof (struct forcesh)))
+#define        GET_TOP_TLV(fhdr) ((const struct forces_tlv *)((fhdr) + sizeof (struct forcesh)))

 #define TLV_SET_LEN(len)  (F_ALN_LEN(TLV_HDRL) + (len))
 #define TLV_ALN_LEN(len)  F_ALN_LEN(TLV_SET_LEN(len))
 #define TLV_SET_LEN(len)  (F_ALN_LEN(TLV_HDRL) + (len))
 #define TLV_ALN_LEN(len)  F_ALN_LEN(TLV_SET_LEN(len))

-#define TLV_RDAT_LEN(tlv) ((int)(EXTRACT_16BITS(&(tlv)->length) - TLV_SET_LEN(0))
-#define TLV_DATA(tlvp)   ((void*)(((char*)(tlvp)) + TLV_SET_LEN(0)))
-#define GO_NXT_TLV(tlv,rlen) ((rlen) -= F_ALN_LEN(EXTRACT_16BITS(&(tlv)->length)), \
-                             (struct forces_tlv*)(((char*)(tlv)) \
-                                     + F_ALN_LEN(EXTRACT_16BITS(&(tlv)->length))))
+#define TLV_RDAT_LEN(tlv) (EXTRACT_BE_U_2(&(tlv)->length) - TLV_SET_LEN(0)
+#define TLV_DATA(tlvp)   ((const void*)(((const char*)(tlvp)) + TLV_SET_LEN(0)))
+#define GO_NXT_TLV(tlv,rlen) ((rlen) -= F_ALN_LEN(EXTRACT_BE_U_2(&(tlv)->length)), \
+                             (const struct forces_tlv*)(((const char*)(tlv)) \
+                                     + F_ALN_LEN(EXTRACT_BE_U_2(&(tlv)->length))))

 #define ILV_SET_LEN(len)  (F_ALN_LEN(ILV_HDRL) + (len))
 #define ILV_ALN_LEN(len)  F_ALN_LEN(ILV_SET_LEN(len))
 #define ILV_SET_LEN(len)  (F_ALN_LEN(ILV_HDRL) + (len))
 #define ILV_ALN_LEN(len)  F_ALN_LEN(ILV_SET_LEN(len))

-#define ILV_RDAT_LEN(ilv) ((int)(EXTRACT_32BITS(&(ilv)->length)) - ILV_SET_LEN(0))
-#define ILV_DATA(ilvp)   ((void*)(((char*)(ilvp)) + ILV_SET_LEN(0)))
-#define GO_NXT_ILV(ilv,rlen) ((rlen) -= F_ALN_LEN(EXTRACT_32BITS(&(ilv)->length)), \
-                             (struct forces_ilv *)(((char*)(ilv)) \
-                                     + F_ALN_LEN(EXTRACT_32BITS(&(ilv)->length))))
-#define INVALID_RLEN -1
-#define INVALID_STLN -2
-#define INVALID_LTLN -3
-#define INVALID_ALEN -4
+#define ILV_RDAT_LEN(ilv) (EXTRACT_BE_U_4(&(ilv)->length)) - ILV_SET_LEN(0)
+#define ILV_DATA(ilvp)   ((const void*)(((const char*)(ilvp)) + ILV_SET_LEN(0)))
+#define GO_NXT_ILV(ilv,rlen) ((rlen) -= F_ALN_LEN(EXTRACT_BE_U_4(&(ilv)->length)), \
+                             (const struct forces_ilv *)(((const char*)(ilv)) \
+                                     + F_ALN_LEN(EXTRACT_BE_U_4(&(ilv)->length))))
+#define INVALID_RLEN 1
+#define INVALID_STLN 2
+#define INVALID_LTLN 3
+#define INVALID_ALEN 4

 
 static const struct tok ForCES_TLV_err[] = {
        {INVALID_RLEN, "Invalid total length"},
 
 static const struct tok ForCES_TLV_err[] = {
        {INVALID_RLEN, "Invalid total length"},


@@ -432,15 +412,15 @@ static const struct tok ForCES_TLV_err[] = {
        {0, NULL}
 };
 
        {0, NULL}
 };
 

-static inline int tlv_valid(const struct forces_tlv *tlv, u_int rlen)
+static inline u_int tlv_valid(const struct forces_tlv *tlv, u_int rlen)

 {
        if (rlen < TLV_HDRL)
                return INVALID_RLEN;
 {
        if (rlen < TLV_HDRL)
                return INVALID_RLEN;

-       if (EXTRACT_16BITS(&tlv->length) < TLV_HDRL)
+       if (EXTRACT_BE_U_2(&tlv->length) < TLV_HDRL)

                return INVALID_STLN;
                return INVALID_STLN;

-       if (EXTRACT_16BITS(&tlv->length) > rlen)
+       if (EXTRACT_BE_U_2(&tlv->length) > rlen)

                return INVALID_LTLN;
                return INVALID_LTLN;

-       if (rlen < F_ALN_LEN(EXTRACT_16BITS(&tlv->length)))
+       if (rlen < F_ALN_LEN(EXTRACT_BE_U_2(&tlv->length)))

                return INVALID_ALEN;
 
        return 0;
                return INVALID_ALEN;
 
        return 0;


@@ -450,28 +430,28 @@ static inline int ilv_valid(const struct forces_ilv *ilv, u_int rlen)
 {
        if (rlen < ILV_HDRL)
                return INVALID_RLEN;
 {
        if (rlen < ILV_HDRL)
                return INVALID_RLEN;

-       if (EXTRACT_32BITS(&ilv->length) < ILV_HDRL)
+       if (EXTRACT_BE_U_4(&ilv->length) < ILV_HDRL)

                return INVALID_STLN;
                return INVALID_STLN;

-       if (EXTRACT_32BITS(&ilv->length) > rlen)
+       if (EXTRACT_BE_U_4(&ilv->length) > rlen)

                return INVALID_LTLN;
                return INVALID_LTLN;

-       if (rlen < F_ALN_LEN(EXTRACT_32BITS(&ilv->length)))
+       if (rlen < F_ALN_LEN(EXTRACT_BE_U_4(&ilv->length)))

                return INVALID_ALEN;
 
        return 0;
 }
 
                return INVALID_ALEN;
 
        return 0;
 }
 

-static int lfbselect_print(register const u_char * pptr, register u_int len,
-                          u_int16_t op_msk, int indent);
-static int redirect_print(register const u_char * pptr, register u_int len,
-                         u_int16_t op_msk, int indent);
-static int asrtlv_print(register const u_char * pptr, register u_int len,
-                       u_int16_t op_msk, int indent);
-static int asttlv_print(register const u_char * pptr, register u_int len,
-                       u_int16_t op_msk, int indent);
+static int lfbselect_print(netdissect_options *, const u_char * pptr, u_int len,
+                          uint16_t op_msk, int indent);
+static int redirect_print(netdissect_options *, const u_char * pptr, u_int len,
+                         uint16_t op_msk, int indent);
+static int asrtlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                       uint16_t op_msk, int indent);
+static int asttlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                       uint16_t op_msk, int indent);

 
 struct forces_lfbsh {
 
 struct forces_lfbsh {

-       u_int32_t class;
-       u_int32_t instance;
+       nd_uint32_t class;
+       nd_uint32_t instance;

 };
 
 #define ASSNS_OPS (B_OP_REPORT)
 };
 
 #define ASSNS_OPS (B_OP_REPORT)


@@ -502,7 +482,7 @@ static const struct tom_h ForCES_msg[TOM_MAX_IND + 1] = {
            {TOM_QUERYREP, TTLV_T2, CFG_QYR, "Query Response", lfbselect_print},
 };
 
            {TOM_QUERYREP, TTLV_T2, CFG_QYR, "Query Response", lfbselect_print},
 };
 

-static inline const struct tom_h *get_forces_tom(u_int8_t tom)
+static inline const struct tom_h *get_forces_tom(uint8_t tom)

 {
        int i;
        for (i = TOM_RSV_I; i <= TOM_MAX_IND; i++) {
 {
        int i;
        for (i = TOM_RSV_I; i <= TOM_MAX_IND; i++) {


@@ -514,12 +494,12 @@ static inline const struct tom_h *get_forces_tom(u_int8_t tom)
 }
 
 struct pdata_ops {
 }
 
 struct pdata_ops {

-       u_int32_t v;
-       u_int16_t flags;
-       u_int16_t op_msk;
+       uint32_t v;
+       uint16_t flags;
+       uint16_t op_msk;

        const char *s;
        const char *s;

-       int (*print) (register const u_char * pptr, register u_int len,
-                     u_int16_t op_msk, int indent);
+       int (*print) (netdissect_options *, const u_char * pptr, u_int len,
+                     uint16_t op_msk, int indent);

 };
 
 enum {
 };
 
 enum {


@@ -533,26 +513,26 @@ enum {
 };
 #define PD_MAX_IND (_TOM_RSV_MAX - 1)
 
 };
 #define PD_MAX_IND (_TOM_RSV_MAX - 1)
 

-static inline int pd_valid(u_int16_t pd)
+static inline int pd_valid(uint16_t pd)

 {
        if (pd >= F_TLV_PDAT && pd <= F_TLV_REST)
                return 1;
        return 0;
 }
 
 {
        if (pd >= F_TLV_PDAT && pd <= F_TLV_REST)
                return 1;
        return 0;
 }
 

-static inline void chk_op_type(u_int16_t type, u_int16_t msk, u_int16_t omsk)
+static inline void
+chk_op_type(netdissect_options *ndo,
+            uint16_t type, uint16_t msk, uint16_t omsk)

 {
        if (type != F_TLV_PDAT) {
                if (msk & B_KEYIN) {
                        if (type != F_TLV_KEYI) {
 {
        if (type != F_TLV_PDAT) {
                if (msk & B_KEYIN) {
                        if (type != F_TLV_KEYI) {

-                               printf
-                                   ("Based on flags expected KEYINFO TLV!\n");
+                               ND_PRINT((ndo, "Based on flags expected KEYINFO TLV!\n"));

                        }
                } else {
                        if (!(msk & omsk)) {
                        }
                } else {
                        if (!(msk & omsk)) {

-                               printf
-                                   ("Illegal DATA encoding for type 0x%x programmed %x got %x \n",
-                                    type, omsk, msk);
+                               ND_PRINT((ndo, "Illegal DATA encoding for type 0x%x programmed %x got %x \n",
+                                         type, omsk, msk));

                        }
                }
        }
                        }
                }
        }


@@ -564,19 +544,19 @@ static inline void chk_op_type(u_int16_t type, u_int16_t msk, u_int16_t omsk)
 #define F_TABAPPEND 4
 
 struct res_val {
 #define F_TABAPPEND 4
 
 struct res_val {

-       u_int8_t result;
-       u_int8_t resv1;
-       u_int16_t resv2;
+       nd_uint8_t result;
+       nd_uint8_t resv1;
+       nd_uint16_t resv2;

 };
 
 };
 

-static int prestlv_print(register const u_char * pptr, register u_int len,
-                        u_int16_t op_msk, int indent);
-static int pkeyitlv_print(register const u_char * pptr, register u_int len,
-                         u_int16_t op_msk, int indent);
-static int fdatatlv_print(register const u_char * pptr, register u_int len,
-                         u_int16_t op_msk, int indent);
-static int sdatatlv_print(register const u_char * pptr, register u_int len,
-                         u_int16_t op_msk, int indent);
+static int prestlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                        uint16_t op_msk, int indent);
+static int pkeyitlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                         uint16_t op_msk, int indent);
+static int fdatatlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                         uint16_t op_msk, int indent);
+static int sdatatlv_print(netdissect_options *, const u_char * pptr, u_int len,
+                         uint16_t op_msk, int indent);

 
 static const struct pdata_ops ForCES_pdata[PD_MAX_IND + 1] = {
        /* PD_RSV_I */ {0, 0, 0, "Invalid message", NULL},
 
 static const struct pdata_ops ForCES_pdata[PD_MAX_IND + 1] = {
        /* PD_RSV_I */ {0, 0, 0, "Invalid message", NULL},


@@ -588,7 +568,7 @@ static const struct pdata_ops ForCES_pdata[PD_MAX_IND + 1] = {
            {F_TLV_PDAT, 0, 0, "Inner PATH-DATA TLV", recpdoptlv_print},
 };
 
            {F_TLV_PDAT, 0, 0, "Inner PATH-DATA TLV", recpdoptlv_print},
 };
 

-static inline const struct pdata_ops *get_forces_pd(u_int16_t pd)
+static inline const struct pdata_ops *get_forces_pd(uint16_t pd)

 {
        int i;
        for (i = PD_RSV_I + 1; i <= PD_MAX_IND; i++) {
 {
        int i;
        for (i = PD_RSV_I + 1; i <= PD_MAX_IND; i++) {


@@ -660,13 +640,15 @@ static const struct tok ForCES_errs[] = {
 #define RESLEN 4
 
 static int
 #define RESLEN 4
 
 static int

-prestlv_print(register const u_char * pptr, register u_int len,
-             u_int16_t op_msk _U_, int indent)
+prestlv_print(netdissect_options *ndo,
+              const u_char * pptr, u_int len,
+              uint16_t op_msk _U_, int indent)

 {
 {

-       const struct forces_tlv *tlv = (struct forces_tlv *)pptr;
-       register const u_char *tdp = (u_char *) TLV_DATA(tlv);
-       struct res_val *r = (struct res_val *)tdp;
+       const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
+       const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+       const struct res_val *r = (const struct res_val *)tdp;

        u_int dlen;
        u_int dlen;

+       uint8_t result;

 
        /*
         * pdatacnt_print() has ensured that len (the TLV length)
 
        /*
         * pdatacnt_print() has ensured that len (the TLV length)


@@ -674,95 +656,98 @@ prestlv_print(register const u_char * pptr, register u_int len,
         */
        dlen = len - TLV_HDRL;
        if (dlen != RESLEN) {
         */
        dlen = len - TLV_HDRL;
        if (dlen != RESLEN) {

-               printf("illegal RESULT-TLV: %d bytes!\n", dlen);
+               ND_PRINT((ndo, "illegal RESULT-TLV: %d bytes!\n", dlen));

                return -1;
        }
 
                return -1;
        }
 

-       TCHECK(*r);
-       if (r->result >= 0x18 && r->result <= 0xFE) {
-               printf("illegal reserved result code: 0x%x!\n", r->result);
+       ND_TCHECK(*r);
+       result = EXTRACT_U_1(r->result);
+       if (result >= 0x18 && result <= 0xFE) {
+               ND_PRINT((ndo, "illegal reserved result code: 0x%x!\n", result));

                return -1;
        }
 
                return -1;
        }
 

-       if (vflag >= 3) {
+       if (ndo->ndo_vflag >= 3) {

                char *ib = indent_pr(indent, 0);
                char *ib = indent_pr(indent, 0);

-               printf("%s  Result: %s (code 0x%x)\n", ib,
-                      tok2str(ForCES_errs, NULL, r->result), r->result);
+               ND_PRINT((ndo, "%s  Result: %s (code 0x%x)\n", ib,
+                      tok2str(ForCES_errs, NULL, result), result));

        }
        return 0;
 
 trunc:
        }
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-fdatatlv_print(register const u_char * pptr, register u_int len,
-              u_int16_t op_msk _U_, int indent)
+fdatatlv_print(netdissect_options *ndo,
+               const u_char * pptr, u_int len,
+               uint16_t op_msk _U_, int indent)

 {
 {

-       const struct forces_tlv *tlv = (struct forces_tlv *)pptr;
+       const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;

        u_int rlen;
        u_int rlen;

-       register const u_char *tdp = (u_char *) TLV_DATA(tlv);
-       u_int16_t type;
+       const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+       uint16_t type;

 
        /*
         * pdatacnt_print() or pkeyitlv_print() has ensured that len
         * (the TLV length) >= TLV_HDRL.
         */
        rlen = len - TLV_HDRL;
 
        /*
         * pdatacnt_print() or pkeyitlv_print() has ensured that len
         * (the TLV length) >= TLV_HDRL.
         */
        rlen = len - TLV_HDRL;

-       TCHECK(*tlv);
-       type = EXTRACT_16BITS(&tlv->type);
+       ND_TCHECK(*tlv);
+       type = EXTRACT_BE_U_2(&tlv->type);

        if (type != F_TLV_FULD) {
        if (type != F_TLV_FULD) {

-               printf("Error: expecting FULLDATA!\n");
+               ND_PRINT((ndo, "Error: expecting FULLDATA!\n"));

                return -1;
        }
 
                return -1;
        }
 

-       if (vflag >= 3) {
+       if (ndo->ndo_vflag >= 3) {

                char *ib = indent_pr(indent + 2, 1);
                char *ib = indent_pr(indent + 2, 1);

-               printf("%s[", &ib[1]);
-               hex_print_with_offset(gndo,ib, tdp, rlen, 0);
-               printf("\n%s]\n", &ib[1]);
+               ND_PRINT((ndo, "%s[", &ib[1]));
+               hex_print_with_offset(ndo, ib, tdp, rlen, 0);
+               ND_PRINT((ndo, "\n%s]\n", &ib[1]));

        }
        return 0;
 
 trunc:
        }
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-sdatailv_print(register const u_char * pptr, register u_int len,
-              u_int16_t op_msk _U_, int indent)
+sdatailv_print(netdissect_options *ndo,
+               const u_char * pptr, u_int len,
+               uint16_t op_msk _U_, int indent)

 {
        u_int rlen;
 {
        u_int rlen;

-       const struct forces_ilv *ilv = (struct forces_ilv *)pptr;
+       const struct forces_ilv *ilv = (const struct forces_ilv *)pptr;

        int invilv;
 
        if (len < ILV_HDRL) {
        int invilv;
 
        if (len < ILV_HDRL) {

-               printf("Error: BAD SPARSEDATA-TLV!\n");
+               ND_PRINT((ndo, "Error: BAD SPARSEDATA-TLV!\n"));

                return -1;
        }
        rlen = len;
        indent += 1;
        while (rlen != 0) {
 #if 0
                return -1;
        }
        rlen = len;
        indent += 1;
        while (rlen != 0) {
 #if 0

-               printf("Jamal - outstanding length <%d>\n", rlen);
+               ND_PRINT((ndo, "Jamal - outstanding length <%d>\n", rlen));

 #endif
                char *ib = indent_pr(indent, 1);
 #endif
                char *ib = indent_pr(indent, 1);

-               register const u_char *tdp = (u_char *) ILV_DATA(ilv);
-               TCHECK(*ilv);
+               const u_char *tdp = (const u_char *) ILV_DATA(ilv);
+               ND_TCHECK(*ilv);

                invilv = ilv_valid(ilv, rlen);
                if (invilv) {
                invilv = ilv_valid(ilv, rlen);
                if (invilv) {

-                       printf("%s[", &ib[1]);
-                       hex_print_with_offset(gndo,ib, tdp, rlen, 0);
-                       printf("\n%s]\n", &ib[1]);
+                       ND_PRINT((ndo, "%s[", &ib[1]));
+                       hex_print_with_offset(ndo, ib, tdp, rlen, 0);
+                       ND_PRINT((ndo, "\n%s]\n", &ib[1]));

                        return -1;
                }
                        return -1;
                }

-               if (vflag >= 3) {
-                       int ilvl = EXTRACT_32BITS(&ilv->length);
-                       printf("\n%s ILV: type %x length %d\n", &ib[1],
-                              EXTRACT_32BITS(&ilv->type), ilvl);
-                       hex_print_with_offset(gndo,"\t\t[", tdp, ilvl-ILV_HDRL, 0);
+               if (ndo->ndo_vflag >= 3) {
+                       int ilvl = EXTRACT_BE_U_4(&ilv->length);
+                       ND_PRINT((ndo, "\n%s ILV: type %x length %d\n", &ib[1],
+                              EXTRACT_BE_U_4(&ilv->type), ilvl));
+                       hex_print_with_offset(ndo, "\t\t[", tdp, ilvl-ILV_HDRL, 0);

                }
 
                ilv = GO_NXT_ILV(ilv, rlen);
                }
 
                ilv = GO_NXT_ILV(ilv, rlen);


@@ -771,62 +756,64 @@ sdatailv_print(register const u_char * pptr, register u_int len,
        return 0;
 
 trunc:
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-sdatatlv_print(register const u_char * pptr, register u_int len,
-              u_int16_t op_msk, int indent)
+sdatatlv_print(netdissect_options *ndo,
+               const u_char * pptr, u_int len,
+               uint16_t op_msk, int indent)

 {
 {

-       const struct forces_tlv *tlv = (struct forces_tlv *)pptr;
+       const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;

        u_int rlen;
        u_int rlen;

-       register const u_char *tdp = (u_char *) TLV_DATA(tlv);
-       u_int16_t type;
+       const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+       uint16_t type;

 
        /*
         * pdatacnt_print() has ensured that len (the TLV length)
         * >= TLV_HDRL.
         */
        rlen = len - TLV_HDRL;
 
        /*
         * pdatacnt_print() has ensured that len (the TLV length)
         * >= TLV_HDRL.
         */
        rlen = len - TLV_HDRL;

-       TCHECK(*tlv);
-       type = EXTRACT_16BITS(&tlv->type);
+       ND_TCHECK(*tlv);
+       type = EXTRACT_BE_U_2(&tlv->type);

        if (type != F_TLV_SPAD) {
        if (type != F_TLV_SPAD) {

-               printf("Error: expecting SPARSEDATA!\n");
+               ND_PRINT((ndo, "Error: expecting SPARSEDATA!\n"));

                return -1;
        }
 
                return -1;
        }
 

-       return sdatailv_print(tdp, rlen, op_msk, indent);
+       return sdatailv_print(ndo, tdp, rlen, op_msk, indent);

 
 trunc:
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-pkeyitlv_print(register const u_char * pptr, register u_int len,
-              u_int16_t op_msk, int indent)
+pkeyitlv_print(netdissect_options *ndo,
+               const u_char * pptr, u_int len,
+               uint16_t op_msk, int indent)

 {
 {

-       const struct forces_tlv *tlv = (struct forces_tlv *)pptr;
-       register const u_char *tdp = (u_char *) TLV_DATA(tlv);
-       register const u_char *dp = tdp + 4;
-       const struct forces_tlv *kdtlv = (struct forces_tlv *)dp;
-       u_int32_t id;
+       const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
+       const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+       const u_char *dp = tdp + 4;
+       const struct forces_tlv *kdtlv = (const struct forces_tlv *)dp;
+       uint32_t id;

        char *ib = indent_pr(indent, 0);
        char *ib = indent_pr(indent, 0);

-       u_int16_t type, tll;
-       int invtlv;
-
-       TCHECK(*tdp);
-       id = EXTRACT_32BITS(tdp);
-       printf("%sKeyinfo: Key 0x%x\n", ib, id);
-       TCHECK(*kdtlv);
-       type = EXTRACT_16BITS(&kdtlv->type);
+       uint16_t type, tll;
+       u_int invtlv;
+
+       ND_TCHECK_1(tdp);
+       id = EXTRACT_BE_U_4(tdp);
+       ND_PRINT((ndo, "%sKeyinfo: Key 0x%x\n", ib, id));
+       ND_TCHECK(*kdtlv);
+       type = EXTRACT_BE_U_2(&kdtlv->type);

        invtlv = tlv_valid(kdtlv, len);
 
        if (invtlv) {
        invtlv = tlv_valid(kdtlv, len);
 
        if (invtlv) {

-               printf("%s TLV type 0x%x len %d\n",
+               ND_PRINT((ndo, "%s TLV type 0x%x len %d\n",

                       tok2str(ForCES_TLV_err, NULL, invtlv), type,
                       tok2str(ForCES_TLV_err, NULL, invtlv), type,

-                      EXTRACT_16BITS(&kdtlv->length));
+                      EXTRACT_BE_U_2(&kdtlv->length)));

                return -1;
        }
        /*
                return -1;
        }
        /*


@@ -834,91 +821,92 @@ pkeyitlv_print(register const u_char * pptr, register u_int len,
         * length is large enough but not too large (it doesn't
         * go past the end of the containing TLV).
         */
         * length is large enough but not too large (it doesn't
         * go past the end of the containing TLV).
         */

-       tll = EXTRACT_16BITS(&kdtlv->length);
-       dp = (u_char *) TLV_DATA(kdtlv);
-       return fdatatlv_print(dp, tll, op_msk, indent);
+       tll = EXTRACT_BE_U_2(&kdtlv->length);
+       dp = (const u_char *) TLV_DATA(kdtlv);
+       return fdatatlv_print(ndo, dp, tll, op_msk, indent);

 
 trunc:
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 #define PTH_DESC_SIZE 12
 
 static int
        return -1;
 }
 
 #define PTH_DESC_SIZE 12
 
 static int

-pdatacnt_print(register const u_char * pptr, register u_int len,
-              u_int16_t IDcnt, u_int16_t op_msk, int indent)
+pdatacnt_print(netdissect_options *ndo,
+               const u_char * pptr, u_int len,
+               uint16_t IDcnt, uint16_t op_msk, int indent)

 {
        u_int i;
 {
        u_int i;

-       u_int32_t id;
+       uint32_t id;

        char *ib = indent_pr(indent, 0);
 
        char *ib = indent_pr(indent, 0);
 

-       if ((op_msk & B_APPND) && vflag >= 3) {
-               printf("%sTABLE APPEND\n", ib);
+       if ((op_msk & B_APPND) && ndo->ndo_vflag >= 3) {
+               ND_PRINT((ndo, "%sTABLE APPEND\n", ib));

        }
        for (i = 0; i < IDcnt; i++) {
        }
        for (i = 0; i < IDcnt; i++) {

-               TCHECK2(*pptr, 4);
+               ND_TCHECK_4(pptr);

                if (len < 4)
                        goto trunc;
                if (len < 4)
                        goto trunc;

-               id = EXTRACT_32BITS(pptr);
-               if (vflag >= 3)
-                       printf("%sID#%02u: %d\n", ib, i + 1, id);
+               id = EXTRACT_BE_U_4(pptr);
+               if (ndo->ndo_vflag >= 3)
+                       ND_PRINT((ndo, "%sID#%02u: %d\n", ib, i + 1, id));

                len -= 4;
                pptr += 4;
        }
 
        if ((op_msk & B_TRNG) || (op_msk & B_KEYIN)) {
                if (op_msk & B_TRNG) {
                len -= 4;
                pptr += 4;
        }
 
        if ((op_msk & B_TRNG) || (op_msk & B_KEYIN)) {
                if (op_msk & B_TRNG) {

-                       u_int32_t starti, endi;
+                       uint32_t starti, endi;

 
                        if (len < PTH_DESC_SIZE) {
 
                        if (len < PTH_DESC_SIZE) {

-                               printf("pathlength %d with key/range too short %d\n",
-                                      len, PTH_DESC_SIZE);
+                               ND_PRINT((ndo, "pathlength %d with key/range too short %d\n",
+                                      len, PTH_DESC_SIZE));

                                return -1;
                        }
 
                        pptr += sizeof(struct forces_tlv);
                        len -= sizeof(struct forces_tlv);
 
                                return -1;
                        }
 
                        pptr += sizeof(struct forces_tlv);
                        len -= sizeof(struct forces_tlv);
 

-                       starti = EXTRACT_32BITS(pptr);
+                       starti = EXTRACT_BE_U_4(pptr);

                        pptr += 4;
                        len -= 4;
 
                        pptr += 4;
                        len -= 4;
 

-                       endi = EXTRACT_32BITS(pptr);
+                       endi = EXTRACT_BE_U_4(pptr);

                        pptr += 4;
                        len -= 4;
 
                        pptr += 4;
                        len -= 4;
 

-                       if (vflag >= 3)
-                               printf("%sTable range: [%d,%d]\n", ib, starti, endi);
+                       if (ndo->ndo_vflag >= 3)
+                               ND_PRINT((ndo, "%sTable range: [%d,%d]\n", ib, starti, endi));

                }
 
                if (op_msk & B_KEYIN) {
                }
 
                if (op_msk & B_KEYIN) {

-                       struct forces_tlv *keytlv;
-                       u_int16_t tll;
+                       const struct forces_tlv *keytlv;
+                       uint16_t tll;

 
                        if (len < PTH_DESC_SIZE) {
 
                        if (len < PTH_DESC_SIZE) {

-                               printf("pathlength %d with key/range too short %d\n",
-                                      len, PTH_DESC_SIZE);
+                               ND_PRINT((ndo, "pathlength %d with key/range too short %d\n",
+                                      len, PTH_DESC_SIZE));

                                return -1;
                        }
 
                        /* skip keyid */
                        pptr += 4;
                        len -= 4;
                                return -1;
                        }
 
                        /* skip keyid */
                        pptr += 4;
                        len -= 4;

-                       keytlv = (struct forces_tlv *)pptr;
+                       keytlv = (const struct forces_tlv *)pptr;

                        /* skip header */
                        pptr += sizeof(struct forces_tlv);
                        len -= sizeof(struct forces_tlv);
                        /* skip key content */
                        /* skip header */
                        pptr += sizeof(struct forces_tlv);
                        len -= sizeof(struct forces_tlv);
                        /* skip key content */

-                       tll = EXTRACT_16BITS(&keytlv->length);
+                       tll = EXTRACT_BE_U_2(&keytlv->length);

                        if (tll < TLV_HDRL) {
                        if (tll < TLV_HDRL) {

-                               printf("key content length %u < %u\n",
-                                       tll, TLV_HDRL);
+                               ND_PRINT((ndo, "key content length %u < %u\n",
+                                       tll, TLV_HDRL));

                                return -1;
                        }
                        tll -= TLV_HDRL;
                        if (len < tll) {
                                return -1;
                        }
                        tll -= TLV_HDRL;
                        if (len < tll) {

-                               printf("key content too short\n");
+                               ND_PRINT((ndo, "key content too short\n"));

                                return -1;
                        }
                        pptr += tll;
                                return -1;
                        }
                        pptr += tll;


@@ -928,21 +916,20 @@ pdatacnt_print(register const u_char * pptr, register u_int len,
        }
 
        if (len) {
        }
 
        if (len) {

-               const struct forces_tlv *pdtlv = (struct forces_tlv *)pptr;
-               u_int16_t type;
-               u_int16_t tll;
+               const struct forces_tlv *pdtlv = (const struct forces_tlv *)pptr;
+               uint16_t type;
+               uint16_t tll;

                int pad = 0;
                u_int aln;
                int pad = 0;
                u_int aln;

-               int invtlv;
+               u_int invtlv;

 
 

-               TCHECK(*pdtlv);
-               type = EXTRACT_16BITS(&pdtlv->type);
+               ND_TCHECK(*pdtlv);
+               type = EXTRACT_BE_U_2(&pdtlv->type);

                invtlv = tlv_valid(pdtlv, len);
                if (invtlv) {
                invtlv = tlv_valid(pdtlv, len);
                if (invtlv) {

-                       printf
-                           ("%s Outstanding bytes %d for TLV type 0x%x TLV len %d\n",
-                            tok2str(ForCES_TLV_err, NULL, invtlv), len, type,
-                            EXTRACT_16BITS(&pdtlv->length));
+                       ND_PRINT((ndo, "%s Outstanding bytes %d for TLV type 0x%x TLV len %d\n",
+                                 tok2str(ForCES_TLV_err, NULL, invtlv), len, type,
+                                 EXTRACT_BE_U_2(&pdtlv->length)));

                        goto pd_err;
                }
                /*
                        goto pd_err;
                }
                /*


@@ -950,48 +937,44 @@ pdatacnt_print(register const u_char * pptr, register u_int len,
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */

-               tll = EXTRACT_16BITS(&pdtlv->length) - TLV_HDRL;
-               aln = F_ALN_LEN(EXTRACT_16BITS(&pdtlv->length));
-               if (aln > EXTRACT_16BITS(&pdtlv->length)) {
+               tll = EXTRACT_BE_U_2(&pdtlv->length) - TLV_HDRL;
+               aln = F_ALN_LEN(EXTRACT_BE_U_2(&pdtlv->length));
+               if (aln > EXTRACT_BE_U_2(&pdtlv->length)) {

                        if (aln > len) {
                        if (aln > len) {

-                               printf
-                                   ("Invalid padded pathdata TLV type 0x%x len %d missing %d pad bytes\n",
-                                    type, EXTRACT_16BITS(&pdtlv->length), aln - len);
+                               ND_PRINT((ndo,
+                                         "Invalid padded pathdata TLV type 0x%x len %d missing %d pad bytes\n",
+                                         type, EXTRACT_BE_U_2(&pdtlv->length), aln - len));

                        } else {
                        } else {

-                               pad = aln - EXTRACT_16BITS(&pdtlv->length);
+                               pad = aln - EXTRACT_BE_U_2(&pdtlv->length);

                        }
                }
                if (pd_valid(type)) {
                        const struct pdata_ops *ops = get_forces_pd(type);
 
                        }
                }
                if (pd_valid(type)) {
                        const struct pdata_ops *ops = get_forces_pd(type);
 

-                       if (vflag >= 3 && ops->v != F_TLV_PDAT) {
+                       if (ndo->ndo_vflag >= 3 && ops->v != F_TLV_PDAT) {

                                if (pad)
                                if (pad)

-                                       printf
-                                           ("%s  %s (Length %d DataLen %d pad %d Bytes)\n",
-                                            ib, ops->s, EXTRACT_16BITS(&pdtlv->length),
-                                            tll, pad);
+                                       ND_PRINT((ndo, "%s  %s (Length %d DataLen %d pad %d Bytes)\n",
+                                                 ib, ops->s, EXTRACT_BE_U_2(&pdtlv->length), tll, pad));

                                else
                                else

-                                       printf
-                                           ("%s  %s (Length %d DataLen %d Bytes)\n",
-                                            ib, ops->s, EXTRACT_16BITS(&pdtlv->length),
-                                            tll);
+                                       ND_PRINT((ndo, "%s  %s (Length %d DataLen %d Bytes)\n",
+                                                 ib, ops->s, EXTRACT_BE_U_2(&pdtlv->length), tll));

                        }
 
                        }
 

-                       chk_op_type(type, op_msk, ops->op_msk);
+                       chk_op_type(ndo, type, op_msk, ops->op_msk);

 
 

-                       if (ops->print((const u_char *)pdtlv,
+                       if (ops->print(ndo, (const u_char *)pdtlv,

                                        tll + pad + TLV_HDRL, op_msk,
                                        indent + 2) == -1)
                                return -1;
                        len -= (TLV_HDRL + pad + tll);
                } else {
                                        tll + pad + TLV_HDRL, op_msk,
                                        indent + 2) == -1)
                                return -1;
                        len -= (TLV_HDRL + pad + tll);
                } else {

-                       printf("Invalid path data content type 0x%x len %d\n",
-                              type, EXTRACT_16BITS(&pdtlv->length));
+                       ND_PRINT((ndo, "Invalid path data content type 0x%x len %d\n",
+                              type, EXTRACT_BE_U_2(&pdtlv->length)));

 pd_err:
 pd_err:

-                       if (EXTRACT_16BITS(&pdtlv->length)) {
-                                hex_print_with_offset(gndo,"Bad Data val\n\t  [",
+                       if (EXTRACT_BE_U_2(&pdtlv->length)) {
+                                hex_print_with_offset(ndo, "Bad Data val\n\t  [",

                                                      pptr, len, 0);
                                                      pptr, len, 0);

-                               printf("]\n");
+                               ND_PRINT((ndo, "]\n"));

 
                                return -1;
                        }
 
                                return -1;
                        }


@@ -1000,131 +983,134 @@ pd_err:
        return len;
 
 trunc:
        return len;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-pdata_print(register const u_char * pptr, register u_int len,
-           u_int16_t op_msk, int indent)
+pdata_print(netdissect_options *ndo,
+            const u_char * pptr, u_int len,
+            uint16_t op_msk, int indent)

 {
 {

-       const struct pathdata_h *pdh = (struct pathdata_h *)pptr;
+       const struct pathdata_h *pdh = (const struct pathdata_h *)pptr;

        char *ib = indent_pr(indent, 0);
        u_int minsize = 0;
        int more_pd = 0;
        char *ib = indent_pr(indent, 0);
        u_int minsize = 0;
        int more_pd = 0;

-       u_int16_t idcnt = 0;
+       uint16_t idcnt = 0;

 
 

-       TCHECK(*pdh);
+       ND_TCHECK(*pdh);

        if (len < sizeof(struct pathdata_h))
                goto trunc;
        if (len < sizeof(struct pathdata_h))
                goto trunc;

-       if (vflag >= 3) {
-               printf("\n%sPathdata: Flags 0x%x ID count %d\n",
-                      ib, EXTRACT_16BITS(&pdh->pflags), EXTRACT_16BITS(&pdh->pIDcnt));
+       if (ndo->ndo_vflag >= 3) {
+               ND_PRINT((ndo, "\n%sPathdata: Flags 0x%x ID count %d\n",
+                      ib, EXTRACT_BE_U_2(&pdh->pflags), EXTRACT_BE_U_2(&pdh->pIDcnt)));

        }
 
        }
 

-       if (EXTRACT_16BITS(&pdh->pflags) & F_SELKEY) {
+       if (EXTRACT_BE_U_2(&pdh->pflags) & F_SELKEY) {

                op_msk |= B_KEYIN;
        }
 
        /* Table GET Range operation */
                op_msk |= B_KEYIN;
        }
 
        /* Table GET Range operation */

-       if (EXTRACT_16BITS(&pdh->pflags) & F_SELTABRANGE) {
+       if (EXTRACT_BE_U_2(&pdh->pflags) & F_SELTABRANGE) {

                op_msk |= B_TRNG;
        }
        /* Table SET append operation */
                op_msk |= B_TRNG;
        }
        /* Table SET append operation */

-       if (EXTRACT_16BITS(&pdh->pflags) & F_TABAPPEND) {
+       if (EXTRACT_BE_U_2(&pdh->pflags) & F_TABAPPEND) {

                op_msk |= B_APPND;
        }
 
        pptr += sizeof(struct pathdata_h);
        len -= sizeof(struct pathdata_h);
                op_msk |= B_APPND;
        }
 
        pptr += sizeof(struct pathdata_h);
        len -= sizeof(struct pathdata_h);

-       idcnt = EXTRACT_16BITS(&pdh->pIDcnt);
+       idcnt = EXTRACT_BE_U_2(&pdh->pIDcnt);

        minsize = idcnt * 4;
        if (len < minsize) {
        minsize = idcnt * 4;
        if (len < minsize) {

-               printf("\t\t\ttruncated IDs expected %uB got %uB\n", minsize,
-                      len);
-               hex_print_with_offset(gndo,"\t\t\tID Data[", pptr, len, 0);
-               printf("]\n");
+               ND_PRINT((ndo, "\t\t\ttruncated IDs expected %uB got %uB\n", minsize,
+                      len));
+               hex_print_with_offset(ndo, "\t\t\tID Data[", pptr, len, 0);
+               ND_PRINT((ndo, "]\n"));

                return -1;
        }
 
        if ((op_msk & B_TRNG) && (op_msk & B_KEYIN)) {
                return -1;
        }
 
        if ((op_msk & B_TRNG) && (op_msk & B_KEYIN)) {

-               printf("\t\t\tIllegal to have both Table ranges and keys\n");
+               ND_PRINT((ndo, "\t\t\tIllegal to have both Table ranges and keys\n"));

                return -1;
        }
 
                return -1;
        }
 

-       more_pd = pdatacnt_print(pptr, len, idcnt, op_msk, indent);
+       more_pd = pdatacnt_print(ndo, pptr, len, idcnt, op_msk, indent);

        if (more_pd > 0) {
                int consumed = len - more_pd;
                pptr += consumed;
                len = more_pd;
                /* XXX: Argh, recurse some more */
        if (more_pd > 0) {
                int consumed = len - more_pd;
                pptr += consumed;
                len = more_pd;
                /* XXX: Argh, recurse some more */

-               return recpdoptlv_print(pptr, len, op_msk, indent+1);
+               return recpdoptlv_print(ndo, pptr, len, op_msk, indent+1);

        } else
                return 0;
 
 trunc:
        } else
                return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-genoptlv_print(register const u_char * pptr, register u_int len,
-              u_int16_t op_msk, int indent)
+genoptlv_print(netdissect_options *ndo,
+               const u_char * pptr, u_int len,
+               uint16_t op_msk, int indent)

 {
 {

-       const struct forces_tlv *pdtlv = (struct forces_tlv *)pptr;
-       u_int16_t type;
+       const struct forces_tlv *pdtlv = (const struct forces_tlv *)pptr;
+       uint16_t type;

        int tll;
        int tll;

-       int invtlv;
+       u_int invtlv;

        char *ib = indent_pr(indent, 0);
 
        char *ib = indent_pr(indent, 0);
 

-       TCHECK(*pdtlv);
-       type = EXTRACT_16BITS(&pdtlv->type);
-       tll = EXTRACT_16BITS(&pdtlv->length) - TLV_HDRL;
+       ND_TCHECK(*pdtlv);
+       type = EXTRACT_BE_U_2(&pdtlv->type);
+       tll = EXTRACT_BE_U_2(&pdtlv->length) - TLV_HDRL;

        invtlv = tlv_valid(pdtlv, len);
        invtlv = tlv_valid(pdtlv, len);

-       printf("genoptlvprint - %s TLV type 0x%x len %d\n",
-              tok2str(ForCES_TLV, NULL, type), type, EXTRACT_16BITS(&pdtlv->length));
+       ND_PRINT((ndo, "genoptlvprint - %s TLV type 0x%x len %d\n",
+              tok2str(ForCES_TLV, NULL, type), type, EXTRACT_BE_U_2(&pdtlv->length)));

        if (!invtlv) {
                /*
                 * At this point, tlv_valid() has ensured that the TLV
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */
        if (!invtlv) {
                /*
                 * At this point, tlv_valid() has ensured that the TLV
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */

-               register const u_char *dp = (u_char *) TLV_DATA(pdtlv);
+               const u_char *dp = (const u_char *) TLV_DATA(pdtlv);

                if (!ttlv_valid(type)) {
                if (!ttlv_valid(type)) {

-                       printf("%s TLV type 0x%x len %d\n",
+                       ND_PRINT((ndo, "%s TLV type 0x%x len %d\n",

                               tok2str(ForCES_TLV_err, NULL, invtlv), type,
                               tok2str(ForCES_TLV_err, NULL, invtlv), type,

-                              EXTRACT_16BITS(&pdtlv->length));
+                              EXTRACT_BE_U_2(&pdtlv->length)));

                        return -1;
                }
                        return -1;
                }

-               if (vflag >= 3)
-                       printf("%s%s, length %d (data length %d Bytes)",
+               if (ndo->ndo_vflag >= 3)
+                       ND_PRINT((ndo, "%s%s, length %d (data length %d Bytes)",

                               ib, tok2str(ForCES_TLV, NULL, type),
                               ib, tok2str(ForCES_TLV, NULL, type),

-                              EXTRACT_16BITS(&pdtlv->length), tll);
+                              EXTRACT_BE_U_2(&pdtlv->length), tll));

 
 

-               return pdata_print(dp, tll, op_msk, indent + 1);
+               return pdata_print(ndo, dp, tll, op_msk, indent + 1);

        } else {
        } else {

-               printf("\t\t\tInvalid ForCES TLV type=%x", type);
+               ND_PRINT((ndo, "\t\t\tInvalid ForCES TLV type=%x", type));

                return -1;
        }
 
 trunc:
                return -1;
        }
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-recpdoptlv_print(register const u_char * pptr, register u_int len,
-                u_int16_t op_msk, int indent)
+recpdoptlv_print(netdissect_options *ndo,
+                 const u_char * pptr, u_int len,
+                 uint16_t op_msk, int indent)

 {
 {

-       const struct forces_tlv *pdtlv = (struct forces_tlv *)pptr;
+       const struct forces_tlv *pdtlv = (const struct forces_tlv *)pptr;

        int tll;
        int tll;

-       int invtlv;
-       u_int16_t type;
-       register const u_char *dp;
+       u_int invtlv;
+       uint16_t type;
+       const u_char *dp;

        char *ib;
 
        while (len != 0) {
        char *ib;
 
        while (len != 0) {

-               TCHECK(*pdtlv);
+               ND_TCHECK(*pdtlv);

                invtlv = tlv_valid(pdtlv, len);
                if (invtlv) {
                        break;
                invtlv = tlv_valid(pdtlv, len);
                if (invtlv) {
                        break;


@@ -1136,103 +1122,102 @@ recpdoptlv_print(register const u_char * pptr, register u_int len,
                 * go past the end of the containing TLV).
                 */
                ib = indent_pr(indent, 0);
                 * go past the end of the containing TLV).
                 */
                ib = indent_pr(indent, 0);

-               type = EXTRACT_16BITS(&pdtlv->type);
-               dp = (u_char *) TLV_DATA(pdtlv);
-               tll = EXTRACT_16BITS(&pdtlv->length) - TLV_HDRL;
-
-               if (vflag >= 3)
-                       printf
-                           ("%s%s, length %d (data encapsulated %d Bytes)",
-                            ib, tok2str(ForCES_TLV, NULL, type),
-                            EXTRACT_16BITS(&pdtlv->length),
-                            EXTRACT_16BITS(&pdtlv->length) - TLV_HDRL);
-
-               if (pdata_print(dp, tll, op_msk, indent + 1) == -1)
+               type = EXTRACT_BE_U_2(&pdtlv->type);
+               dp = (const u_char *) TLV_DATA(pdtlv);
+               tll = EXTRACT_BE_U_2(&pdtlv->length) - TLV_HDRL;
+
+               if (ndo->ndo_vflag >= 3)
+                       ND_PRINT((ndo, "%s%s, length %d (data encapsulated %d Bytes)",
+                                 ib, tok2str(ForCES_TLV, NULL, type),
+                                 EXTRACT_BE_U_2(&pdtlv->length),
+                                 EXTRACT_BE_U_2(&pdtlv->length) - TLV_HDRL));
+
+               if (pdata_print(ndo, dp, tll, op_msk, indent + 1) == -1)

                        return -1;
                pdtlv = GO_NXT_TLV(pdtlv, len);
        }
 
        if (len) {
                        return -1;
                pdtlv = GO_NXT_TLV(pdtlv, len);
        }
 
        if (len) {

-               printf
-                   ("\n\t\tMessy PATHDATA TLV header, type (0x%x)\n\t\texcess of %d Bytes ",
-                    EXTRACT_16BITS(&pdtlv->type), len - EXTRACT_16BITS(&pdtlv->length));
+               ND_PRINT((ndo,
+                         "\n\t\tMessy PATHDATA TLV header, type (0x%x)\n\t\texcess of %d Bytes ",
+                         EXTRACT_BE_U_2(&pdtlv->type), len - EXTRACT_BE_U_2(&pdtlv->length)));

                return -1;
        }
 
        return 0;
 
 trunc:
                return -1;
        }
 
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-invoptlv_print(register const u_char * pptr, register u_int len,
-              u_int16_t op_msk _U_, int indent)
+invoptlv_print(netdissect_options *ndo,
+               const u_char * pptr, u_int len,
+               uint16_t op_msk _U_, int indent)

 {
        char *ib = indent_pr(indent, 1);
 
 {
        char *ib = indent_pr(indent, 1);
 

-       if (vflag >= 3) {
-               printf("%sData[", &ib[1]);
-               hex_print_with_offset(gndo,ib, pptr, len, 0);
-               printf("%s]\n", ib);
+       if (ndo->ndo_vflag >= 3) {
+               ND_PRINT((ndo, "%sData[", &ib[1]));
+               hex_print_with_offset(ndo, ib, pptr, len, 0);
+               ND_PRINT((ndo, "%s]\n", ib));

        }
        return -1;
 }
 
 static int
        }
        return -1;
 }
 
 static int

-otlv_print(const struct forces_tlv *otlv, u_int16_t op_msk _U_, int indent)
+otlv_print(netdissect_options *ndo,
+           const struct forces_tlv *otlv, uint16_t op_msk _U_, int indent)

 {
        int rc = 0;
 {
        int rc = 0;

-       register const u_char *dp = (u_char *) TLV_DATA(otlv);
-       u_int16_t type;
+       const u_char *dp = (const u_char *) TLV_DATA(otlv);
+       uint16_t type;

        int tll;
        char *ib = indent_pr(indent, 0);
        const struct optlv_h *ops;
 
        /*
        int tll;
        char *ib = indent_pr(indent, 0);
        const struct optlv_h *ops;
 
        /*

-        * lfbselect_print() has ensured that EXTRACT_16BITS(&otlv->length)
+        * lfbselect_print() has ensured that EXTRACT_BE_U_2(&otlv->length)

         * >= TLV_HDRL.
         */
         * >= TLV_HDRL.
         */

-       TCHECK(*otlv);
-       type = EXTRACT_16BITS(&otlv->type);
-       tll = EXTRACT_16BITS(&otlv->length) - TLV_HDRL;
+       ND_TCHECK(*otlv);
+       type = EXTRACT_BE_U_2(&otlv->type);
+       tll = EXTRACT_BE_U_2(&otlv->length) - TLV_HDRL;

        ops = get_forces_optlv_h(type);
        ops = get_forces_optlv_h(type);

-       if (vflag >= 3) {
-               printf("%sOper TLV %s(0x%x) length %d\n", ib, ops->s, type,
-                      EXTRACT_16BITS(&otlv->length));
-       }
-       /* empty TLVs like COMMIT and TRCOMMIT are empty, we stop here .. */
-       if (!ops->flags & ZERO_TTLV) {
-               if (tll != 0)   /* instead of "if (tll)" - for readability .. */
-                       printf("%s: Illegal - MUST be empty\n", ops->s);
-               return rc;
+       if (ndo->ndo_vflag >= 3) {
+               ND_PRINT((ndo, "%sOper TLV %s(0x%x) length %d\n", ib, ops->s, type,
+                      EXTRACT_BE_U_2(&otlv->length)));

        }
        /* rest of ops must at least have 12B {pathinfo} */
        if (tll < OP_MIN_SIZ) {
        }
        /* rest of ops must at least have 12B {pathinfo} */
        if (tll < OP_MIN_SIZ) {

-               printf("\t\tOper TLV %s(0x%x) length %d\n", ops->s, type,
-                      EXTRACT_16BITS(&otlv->length));
-               printf("\t\tTruncated data size %d minimum required %d\n", tll,
-                      OP_MIN_SIZ);
-               return invoptlv_print(dp, tll, ops->op_msk, indent);
+               ND_PRINT((ndo, "\t\tOper TLV %s(0x%x) length %d\n", ops->s, type,
+                      EXTRACT_BE_U_2(&otlv->length)));
+               ND_PRINT((ndo, "\t\tTruncated data size %d minimum required %d\n", tll,
+                      OP_MIN_SIZ));
+               return invoptlv_print(ndo, dp, tll, ops->op_msk, indent);

 
        }
 
 
        }
 

-       rc = ops->print(dp, tll, ops->op_msk, indent + 1);
+       /* XXX - do anything with ops->flags? */
+        if(ops->print) {
+                rc = ops->print(ndo, dp, tll, ops->op_msk, indent + 1);
+        }

        return rc;
 
 trunc:
        return rc;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 #define ASTDLN 4
 #define ASTMCD 255
 static int
        return -1;
 }
 
 #define ASTDLN 4
 #define ASTMCD 255
 static int

-asttlv_print(register const u_char * pptr, register u_int len,
-            u_int16_t op_msk _U_, int indent)
+asttlv_print(netdissect_options *ndo,
+             const u_char * pptr, u_int len,
+             uint16_t op_msk _U_, int indent)

 {
 {

-       u_int32_t rescode;
+       uint32_t rescode;

        u_int dlen;
        char *ib = indent_pr(indent, 0);
 
        u_int dlen;
        char *ib = indent_pr(indent, 0);
 


@@ -1242,54 +1227,55 @@ asttlv_print(register const u_char * pptr, register u_int len,
         */
        dlen = len - TLV_HDRL;
        if (dlen != ASTDLN) {
         */
        dlen = len - TLV_HDRL;
        if (dlen != ASTDLN) {

-               printf("illegal ASTresult-TLV: %d bytes!\n", dlen);
+               ND_PRINT((ndo, "illegal ASTresult-TLV: %d bytes!\n", dlen));

                return -1;
        }
                return -1;
        }

-       TCHECK2(*pptr, 4);
-       rescode = EXTRACT_32BITS(pptr);
+       ND_TCHECK_4(pptr);
+       rescode = EXTRACT_BE_U_4(pptr);

        if (rescode > ASTMCD) {
        if (rescode > ASTMCD) {

-               printf("illegal ASTresult result code: %d!\n", rescode);
+               ND_PRINT((ndo, "illegal ASTresult result code: %d!\n", rescode));

                return -1;
        }
 
                return -1;
        }
 

-       if (vflag >= 3) {
-               printf("Teardown reason:\n%s", ib);
+       if (ndo->ndo_vflag >= 3) {
+               ND_PRINT((ndo, "Teardown reason:\n%s", ib));

                switch (rescode) {
                case 0:
                switch (rescode) {
                case 0:

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

                        break;
                case 1:
                        break;
                case 1:

-                       printf("Loss of Heartbeats");
+                       ND_PRINT((ndo, "Loss of Heartbeats"));

                        break;
                case 2:
                        break;
                case 2:

-                       printf("Out of bandwidth");
+                       ND_PRINT((ndo, "Out of bandwidth"));

                        break;
                case 3:
                        break;
                case 3:

-                       printf("Out of Memory");
+                       ND_PRINT((ndo, "Out of Memory"));

                        break;
                case 4:
                        break;
                case 4:

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

                        break;
                default:
                        break;
                default:

-                       printf("Unknown Teardown reason");
+                       ND_PRINT((ndo, "Unknown Teardown reason"));

                        break;
                }
                        break;
                }

-               printf("(%x)\n%s", rescode, ib);
+               ND_PRINT((ndo, "(%x)\n%s", rescode, ib));

        }
        return 0;
 
 trunc:
        }
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 #define ASRDLN 4
 #define ASRMCD 3
 static int
        return -1;
 }
 
 #define ASRDLN 4
 #define ASRMCD 3
 static int

-asrtlv_print(register const u_char * pptr, register u_int len,
-            u_int16_t op_msk _U_, int indent)
+asrtlv_print(netdissect_options *ndo,
+             const u_char * pptr, u_int len,
+             uint16_t op_msk _U_, int indent)

 {
 {

-       u_int32_t rescode;
+       uint32_t rescode;

        u_int dlen;
        char *ib = indent_pr(indent, 0);
 
        u_int dlen;
        char *ib = indent_pr(indent, 0);
 


@@ -1299,39 +1285,39 @@ asrtlv_print(register const u_char * pptr, register u_int len,
         */
        dlen = len - TLV_HDRL;
        if (dlen != ASRDLN) {   /* id, instance, oper tlv */
         */
        dlen = len - TLV_HDRL;
        if (dlen != ASRDLN) {   /* id, instance, oper tlv */

-               printf("illegal ASRresult-TLV: %d bytes!\n", dlen);
+               ND_PRINT((ndo, "illegal ASRresult-TLV: %d bytes!\n", dlen));

                return -1;
        }
                return -1;
        }

-       TCHECK2(*pptr, 4);
-       rescode = EXTRACT_32BITS(pptr);
+       ND_TCHECK_4(pptr);
+       rescode = EXTRACT_BE_U_4(pptr);

 
        if (rescode > ASRMCD) {
 
        if (rescode > ASRMCD) {

-               printf("illegal ASRresult result code: %d!\n", rescode);
+               ND_PRINT((ndo, "illegal ASRresult result code: %d!\n", rescode));

                return -1;
        }
 
                return -1;
        }
 

-       if (vflag >= 3) {
-               printf("\n%s", ib);
+       if (ndo->ndo_vflag >= 3) {
+               ND_PRINT((ndo, "\n%s", ib));

                switch (rescode) {
                case 0:
                switch (rescode) {
                case 0:

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

                        break;
                case 1:
                        break;
                case 1:

-                       printf("FE ID invalid ");
+                       ND_PRINT((ndo, "FE ID invalid "));

                        break;
                case 2:
                        break;
                case 2:

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

                        break;
                default:
                        break;
                default:

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

                        break;
                }
                        break;
                }

-               printf("(%x)\n%s", rescode, ib);
+               ND_PRINT((ndo, "(%x)\n%s", rescode, ib));

        }
        return 0;
 
 trunc:
        }
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
        return -1;
 }
 


@@ -1340,13 +1326,14 @@ trunc:
  * XXX - not used.
  */
 static int
  * XXX - not used.
  */
 static int

-gentltlv_print(register const u_char * pptr _U_, register u_int len,
-              u_int16_t op_msk _U_, int indent _U_)
+gentltlv_print(netdissect_options *ndo,
+               const u_char * pptr _U_, u_int len,
+               uint16_t op_msk _U_, int indent _U_)

 {
        u_int dlen = len - TLV_HDRL;
 
        if (dlen < 4) {         /* at least 32 bits must exist */
 {
        u_int dlen = len - TLV_HDRL;
 
        if (dlen < 4) {         /* at least 32 bits must exist */

-               printf("truncated TLV: %d bytes missing! ", 4 - dlen);
+               ND_PRINT((ndo, "truncated TLV: %d bytes missing! ", 4 - dlen));

                return -1;
        }
        return 0;
                return -1;
        }
        return 0;


@@ -1356,42 +1343,42 @@ gentltlv_print(register const u_char * pptr _U_, register u_int len,
 #define RD_MIN 8
 
 static int
 #define RD_MIN 8
 
 static int

-print_metailv(register const u_char * pptr, register u_int len,
-             u_int16_t op_msk _U_, int indent)
+print_metailv(netdissect_options *ndo,
+              const u_char * pptr, uint16_t op_msk _U_, int indent)

 {
        u_int rlen;
 {
        u_int rlen;

-       u_int plen;

        char *ib = indent_pr(indent, 0);
        /* XXX: check header length */
        char *ib = indent_pr(indent, 0);
        /* XXX: check header length */

-       const struct forces_ilv *ilv = (struct forces_ilv *)pptr;
+       const struct forces_ilv *ilv = (const struct forces_ilv *)pptr;

 
        /*
         * print_metatlv() has ensured that len (what remains in the
         * ILV) >= ILV_HDRL.
         */
 
        /*
         * print_metatlv() has ensured that len (what remains in the
         * ILV) >= ILV_HDRL.
         */

-       rlen = EXTRACT_32BITS(&ilv->length) - ILV_HDRL;
-       TCHECK(*ilv);
-       printf("%sMetaID 0x%x length %d\n", ib, EXTRACT_32BITS(&ilv->type),
-              EXTRACT_32BITS(&ilv->length));
-       if (vflag >= 3) {
-               hex_print_with_offset(gndo,"\t\t[", ILV_DATA(ilv), rlen, 0);
-               printf(" ]\n");
+       rlen = EXTRACT_BE_U_4(&ilv->length) - ILV_HDRL;
+       ND_TCHECK(*ilv);
+       ND_PRINT((ndo, "%sMetaID 0x%x length %d\n", ib, EXTRACT_BE_U_4(&ilv->type),
+                 EXTRACT_BE_U_4(&ilv->length)));
+       if (ndo->ndo_vflag >= 3) {
+               hex_print_with_offset(ndo, "\t\t[", ILV_DATA(ilv), rlen, 0);
+               ND_PRINT((ndo, " ]\n"));

        }
        return 0;
 
 trunc:
        }
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-print_metatlv(register const u_char * pptr, register u_int len,
-             u_int16_t op_msk _U_, int indent)
+print_metatlv(netdissect_options *ndo,
+              const u_char * pptr, u_int len,
+              uint16_t op_msk _U_, int indent)

 {
        u_int dlen;
        char *ib = indent_pr(indent, 0);
        u_int rlen;
 {
        u_int dlen;
        char *ib = indent_pr(indent, 0);
        u_int rlen;

-       const struct forces_ilv *ilv = (struct forces_ilv *)pptr;
+       const struct forces_ilv *ilv = (const struct forces_ilv *)pptr;

        int invilv;
 
        /*
        int invilv;
 
        /*


@@ -1400,9 +1387,9 @@ print_metatlv(register const u_char * pptr, register u_int len,
         */
        dlen = len - TLV_HDRL;
        rlen = dlen;
         */
        dlen = len - TLV_HDRL;
        rlen = dlen;

-       printf("\n%s METADATA length %d \n", ib, rlen);
+       ND_PRINT((ndo, "\n%s METADATA length %d \n", ib, rlen));

        while (rlen != 0) {
        while (rlen != 0) {

-               TCHECK(*ilv);
+               ND_TCHECK(*ilv);

                invilv = ilv_valid(ilv, rlen);
                if (invilv) {
                        break;
                invilv = ilv_valid(ilv, rlen);
                if (invilv) {
                        break;


@@ -1413,21 +1400,22 @@ print_metatlv(register const u_char * pptr, register u_int len,
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */

-               print_metailv((u_char *) ilv, rlen, 0, indent + 1);
+               print_metailv(ndo, (const u_char *) ilv, 0, indent + 1);

                ilv = GO_NXT_ILV(ilv, rlen);
        }
 
        return 0;
 
 trunc:
                ilv = GO_NXT_ILV(ilv, rlen);
        }
 
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 
 static int
        return -1;
 }
 
 
 static int

-print_reddata(register const u_char * pptr, register u_int len,
-             u_int16_t op_msk _U_, int indent _U_)
+print_reddata(netdissect_options *ndo,
+              const u_char * pptr, u_int len,
+              uint16_t op_msk _U_, int indent)

 {
        u_int dlen;
        char *ib = indent_pr(indent, 0);
 {
        u_int dlen;
        char *ib = indent_pr(indent, 0);


@@ -1435,25 +1423,26 @@ print_reddata(register const u_char * pptr, register u_int len,
 
        dlen = len - TLV_HDRL;
        rlen = dlen;
 
        dlen = len - TLV_HDRL;
        rlen = dlen;

-       printf("\n%s Redirect Data length %d \n", ib, rlen);
+       ND_PRINT((ndo, "\n%s Redirect Data length %d \n", ib, rlen));

 
 

-       if (vflag >= 3) {
-               printf("\t\t[");
-               hex_print_with_offset(gndo,"\n\t\t", pptr, rlen, 0);
-               printf("\n\t\t]");
+       if (ndo->ndo_vflag >= 3) {
+               ND_PRINT((ndo, "\t\t["));
+               hex_print_with_offset(ndo, "\n\t\t", pptr, rlen, 0);
+               ND_PRINT((ndo, "\n\t\t]"));

        }
 
        return 0;
 }
 
 static int
        }
 
        return 0;
 }
 
 static int

-redirect_print(register const u_char * pptr, register u_int len,
-              u_int16_t op_msk _U_, int indent)
+redirect_print(netdissect_options *ndo,
+               const u_char * pptr, u_int len,
+               uint16_t op_msk _U_, int indent)

 {
 {

-       const struct forces_tlv *tlv = (struct forces_tlv *)pptr;
+       const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;

        u_int dlen;
        u_int rlen;
        u_int dlen;
        u_int rlen;

-       int invtlv;
+       u_int invtlv;

 
        /*
         * forces_type_print() has ensured that len (the TLV length)
 
        /*
         * forces_type_print() has ensured that len (the TLV length)


@@ -1461,18 +1450,18 @@ redirect_print(register const u_char * pptr, register u_int len,
         */
        dlen = len - TLV_HDRL;
        if (dlen <= RD_MIN) {
         */
        dlen = len - TLV_HDRL;
        if (dlen <= RD_MIN) {

-               printf("\n\t\ttruncated Redirect TLV: %d bytes missing! ",
-                      RD_MIN - dlen);
+               ND_PRINT((ndo, "\n\t\ttruncated Redirect TLV: %d bytes missing! ",
+                      RD_MIN - dlen));

                return -1;
        }
 
        rlen = dlen;
        indent += 1;
        while (rlen != 0) {
                return -1;
        }
 
        rlen = dlen;
        indent += 1;
        while (rlen != 0) {

-               TCHECK(*tlv);
+               ND_TCHECK(*tlv);

                invtlv = tlv_valid(tlv, rlen);
                if (invtlv) {
                invtlv = tlv_valid(tlv, rlen);
                if (invtlv) {

-                       printf("Bad Redirect data\n");
+                       ND_PRINT((ndo, "Bad Redirect data\n"));

                        break;
                }
 
                        break;
                }
 


@@ -1481,33 +1470,35 @@ redirect_print(register const u_char * pptr, register u_int len,
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */

-               if (EXTRACT_16BITS(&tlv->type) == F_TLV_METD) {
-                       print_metatlv((u_char *) TLV_DATA(tlv),
-                                     EXTRACT_16BITS(&tlv->length), 0, indent);
-               } else if ((EXTRACT_16BITS(&tlv->type) == F_TLV_REDD)) {
-                       print_reddata((u_char *) TLV_DATA(tlv),
-                                     EXTRACT_16BITS(&tlv->length), 0, indent);
+               if (EXTRACT_BE_U_2(&tlv->type) == F_TLV_METD) {
+                       print_metatlv(ndo, (const u_char *) TLV_DATA(tlv),
+                                     EXTRACT_BE_U_2(&tlv->length), 0,
+                                     indent);
+               } else if ((EXTRACT_BE_U_2(&tlv->type) == F_TLV_REDD)) {
+                       print_reddata(ndo, (const u_char *) TLV_DATA(tlv),
+                                     EXTRACT_BE_U_2(&tlv->length), 0,
+                                     indent);

                } else {
                } else {

-                       printf("Unknown REDIRECT TLV 0x%x len %d\n",
-                              EXTRACT_16BITS(&tlv->type),
-                              EXTRACT_16BITS(&tlv->length));
+                       ND_PRINT((ndo, "Unknown REDIRECT TLV 0x%x len %d\n",
+                              EXTRACT_BE_U_2(&tlv->type),
+                              EXTRACT_BE_U_2(&tlv->length)));

                }
 
                tlv = GO_NXT_TLV(tlv, rlen);
        }
 
        if (rlen) {
                }
 
                tlv = GO_NXT_TLV(tlv, rlen);
        }
 
        if (rlen) {

-               printf
-                   ("\n\t\tMessy Redirect TLV header, type (0x%x)\n\t\texcess of %d Bytes ",
-                    EXTRACT_16BITS(&tlv->type),
-                    rlen - EXTRACT_16BITS(&tlv->length));
+               ND_PRINT((ndo,
+                         "\n\t\tMessy Redirect TLV header, type (0x%x)\n\t\texcess of %d Bytes ",
+                         EXTRACT_BE_U_2(&tlv->type),
+                         rlen - EXTRACT_BE_U_2(&tlv->length)));

                return -1;
        }
 
        return 0;
 
 trunc:
                return -1;
        }
 
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
        return -1;
 }
 


@@ -1515,15 +1506,16 @@ trunc:
 #define OP_MIN 12
 
 static int
 #define OP_MIN 12
 
 static int

-lfbselect_print(register const u_char * pptr, register u_int len,
-               u_int16_t op_msk, int indent)
+lfbselect_print(netdissect_options *ndo,
+                const u_char * pptr, u_int len,
+                uint16_t op_msk, int indent)

 {
        const struct forces_lfbsh *lfbs;
        const struct forces_tlv *otlv;
        char *ib = indent_pr(indent, 0);
        u_int dlen;
        u_int rlen;
 {
        const struct forces_lfbsh *lfbs;
        const struct forces_tlv *otlv;
        char *ib = indent_pr(indent, 0);
        u_int dlen;
        u_int rlen;

-       int invtlv;
+       u_int invtlv;

 
        /*
         * forces_type_print() has ensured that len (the TLV length)
 
        /*
         * forces_type_print() has ensured that len (the TLV length)


@@ -1531,8 +1523,8 @@ lfbselect_print(register const u_char * pptr, register u_int len,
         */
        dlen = len - TLV_HDRL;
        if (dlen <= OP_MIN) {   /* id, instance, oper tlv header .. */
         */
        dlen = len - TLV_HDRL;
        if (dlen <= OP_MIN) {   /* id, instance, oper tlv header .. */

-               printf("\n\t\ttruncated lfb selector: %d bytes missing! ",
-                      OP_MIN - dlen);
+               ND_PRINT((ndo, "\n\t\ttruncated lfb selector: %d bytes missing! ",
+                      OP_MIN - dlen));

                return -1;
        }
 
                return -1;
        }
 


@@ -1543,19 +1535,19 @@ lfbselect_print(register const u_char * pptr, register u_int len,
        rlen = dlen - OP_OFF;
 
        lfbs = (const struct forces_lfbsh *)pptr;
        rlen = dlen - OP_OFF;
 
        lfbs = (const struct forces_lfbsh *)pptr;

-       TCHECK(*lfbs);
-       if (vflag >= 3) {
-               printf("\n%s%s(Classid %x) instance %x\n",
-                      ib, tok2str(ForCES_LFBs, NULL, EXTRACT_32BITS(&lfbs->class)),
-                      EXTRACT_32BITS(&lfbs->class),
-                      EXTRACT_32BITS(&lfbs->instance));
+       ND_TCHECK(*lfbs);
+       if (ndo->ndo_vflag >= 3) {
+               ND_PRINT((ndo, "\n%s%s(Classid %x) instance %x\n",
+                      ib, tok2str(ForCES_LFBs, NULL, EXTRACT_BE_U_4(&lfbs->class)),
+                      EXTRACT_BE_U_4(&lfbs->class),
+                      EXTRACT_BE_U_4(&lfbs->instance)));

        }
 
        }
 

-       otlv = (struct forces_tlv *)(lfbs + 1);
+       otlv = (const struct forces_tlv *)(lfbs + 1);

 
        indent += 1;
        while (rlen != 0) {
 
        indent += 1;
        while (rlen != 0) {

-               TCHECK(*otlv);
+               ND_TCHECK(*otlv);

                invtlv = tlv_valid(otlv, rlen);
                if (invtlv)
                        break;
                invtlv = tlv_valid(otlv, rlen);
                if (invtlv)
                        break;


@@ -1565,40 +1557,41 @@ lfbselect_print(register const u_char * pptr, register u_int len,
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */
                 * length is large enough but not too large (it doesn't
                 * go past the end of the containing TLV).
                 */

-               if (op_valid(EXTRACT_16BITS(&otlv->type), op_msk)) {
-                       otlv_print(otlv, 0, indent);
+               if (op_valid(EXTRACT_BE_U_2(&otlv->type), op_msk)) {
+                       otlv_print(ndo, otlv, 0, indent);

                } else {
                } else {

-                       if (vflag < 3)
-                               printf("\n");
-                       printf
-                           ("\t\tINValid oper-TLV type 0x%x length %d for this ForCES message\n",
-                            EXTRACT_16BITS(&otlv->type), EXTRACT_16BITS(&otlv->length));
-                       invoptlv_print((u_char *)otlv, rlen, 0, indent);
+                       if (ndo->ndo_vflag < 3)
+                               ND_PRINT((ndo, "\n"));
+                       ND_PRINT((ndo,
+                                 "\t\tINValid oper-TLV type 0x%x length %d for this ForCES message\n",
+                                 EXTRACT_BE_U_2(&otlv->type), EXTRACT_BE_U_2(&otlv->length)));
+                       invoptlv_print(ndo, (const u_char *)otlv, rlen, 0, indent);

                }
                otlv = GO_NXT_TLV(otlv, rlen);
        }
 
        if (rlen) {
                }
                otlv = GO_NXT_TLV(otlv, rlen);
        }
 
        if (rlen) {

-               printf
-                   ("\n\t\tMessy oper TLV header, type (0x%x)\n\t\texcess of %d Bytes ",
-                    EXTRACT_16BITS(&otlv->type), rlen - EXTRACT_16BITS(&otlv->length));
+               ND_PRINT((ndo,
+                         "\n\t\tMessy oper TLV header, type (0x%x)\n\t\texcess of %d Bytes ",
+                         EXTRACT_BE_U_2(&otlv->type), rlen - EXTRACT_BE_U_2(&otlv->length)));

                return -1;
        }
 
        return 0;
 
 trunc:
                return -1;
        }
 
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 static int
        return -1;
 }
 
 static int

-forces_type_print(register const u_char * pptr, const struct forcesh *fhdr _U_,
-                 register u_int mlen, const struct tom_h *tops)
+forces_type_print(netdissect_options *ndo,
+                  const u_char * pptr, const struct forcesh *fhdr _U_,
+                  u_int mlen, const struct tom_h *tops)

 {
        const struct forces_tlv *tltlv;
        u_int rlen;
 {
        const struct forces_tlv *tltlv;
        u_int rlen;

-       int invtlv;
+       u_int invtlv;

        int rc = 0;
        int ttlv = 0;
 
        int rc = 0;
        int ttlv = 0;
 


@@ -1610,14 +1603,14 @@ forces_type_print(register const u_char * pptr, const struct forcesh *fhdr _U_,
 
        if (rlen > TLV_HLN) {
                if (tops->flags & ZERO_TTLV) {
 
        if (rlen > TLV_HLN) {
                if (tops->flags & ZERO_TTLV) {

-                       printf("<0x%x>Illegal Top level TLV!\n", tops->flags);
+                       ND_PRINT((ndo, "<0x%x>Illegal Top level TLV!\n", tops->flags));

                        return -1;
                }
        } else {
                if (tops->flags & ZERO_MORE_TTLV)
                        return 0;
                if (tops->flags & ONE_MORE_TTLV) {
                        return -1;
                }
        } else {
                if (tops->flags & ZERO_MORE_TTLV)
                        return 0;
                if (tops->flags & ONE_MORE_TTLV) {

-                       printf("\tTop level TLV Data missing!\n");
+                       ND_PRINT((ndo, "\tTop level TLV Data missing!\n"));

                        return -1;
                }
        }
                        return -1;
                }
        }


@@ -1632,7 +1625,7 @@ forces_type_print(register const u_char * pptr, const struct forcesh *fhdr _U_,
        /*XXX: 15 top level tlvs will probably be fine
           You are nuts if you send more ;-> */
        while (rlen != 0) {
        /*XXX: 15 top level tlvs will probably be fine
           You are nuts if you send more ;-> */
        while (rlen != 0) {

-               TCHECK(*tltlv);
+               ND_TCHECK(*tltlv);

                invtlv = tlv_valid(tltlv, rlen);
                if (invtlv)
                        break;
                invtlv = tlv_valid(tltlv, rlen);
                if (invtlv)
                        break;


@@ -1642,20 +1635,21 @@ forces_type_print(register const u_char * pptr, const struct forcesh *fhdr _U_,
                 * length is large enough but not too large (it doesn't
                 * go past the end of the packet).
                 */
                 * length is large enough but not too large (it doesn't
                 * go past the end of the packet).
                 */

-               if (!ttlv_valid(EXTRACT_16BITS(&tltlv->type))) {
-                       printf("\n\tInvalid ForCES Top TLV type=0x%x",
-                              EXTRACT_16BITS(&tltlv->type));
+               if (!ttlv_valid(EXTRACT_BE_U_2(&tltlv->type))) {
+                       ND_PRINT((ndo, "\n\tInvalid ForCES Top TLV type=0x%x",
+                              EXTRACT_BE_U_2(&tltlv->type)));

                        return -1;
                }
 
                        return -1;
                }
 

-               if (vflag >= 3)
-                       printf("\t%s, length %d (data length %d Bytes)",
-                              tok2str(ForCES_TLV, NULL, EXTRACT_16BITS(&tltlv->type)),
-                              EXTRACT_16BITS(&tltlv->length),
-                              EXTRACT_16BITS(&tltlv->length) - TLV_HDRL);
+               if (ndo->ndo_vflag >= 3)
+                       ND_PRINT((ndo, "\t%s, length %d (data length %d Bytes)",
+                              tok2str(ForCES_TLV, NULL, EXTRACT_BE_U_2(&tltlv->type)),
+                              EXTRACT_BE_U_2(&tltlv->length),
+                              EXTRACT_BE_U_2(&tltlv->length) - TLV_HDRL));

 
 

-               rc = tops->print((u_char *) TLV_DATA(tltlv),
-                                EXTRACT_16BITS(&tltlv->length), tops->op_msk, 9);
+               rc = tops->print(ndo, (const u_char *) TLV_DATA(tltlv),
+                                EXTRACT_BE_U_2(&tltlv->length),
+                                tops->op_msk, 9);

                if (rc < 0) {
                        return -1;
                }
                if (rc < 0) {
                        return -1;
                }


@@ -1669,91 +1663,99 @@ forces_type_print(register const u_char * pptr, const struct forcesh *fhdr _U_,
         * short, and didn't have *enough* TLVs in it?
         */
        if (rlen) {
         * short, and didn't have *enough* TLVs in it?
         */
        if (rlen) {

-               printf("\tMess TopTLV header: min %u, total %d advertised %d ",
-                      TLV_HDRL, rlen, EXTRACT_16BITS(&tltlv->length));
+               ND_PRINT((ndo, "\tMess TopTLV header: min %u, total %d advertised %d ",
+                      TLV_HDRL, rlen, EXTRACT_BE_U_2(&tltlv->length)));

                return -1;
        }
 
        return 0;
 
 trunc:
                return -1;
        }
 
        return 0;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

        return -1;
 }
 
 void
        return -1;
 }
 
 void

-forces_print(register const u_char * pptr, register u_int len)
+forces_print(netdissect_options *ndo,
+             const u_char * pptr, u_int len)

 {
        const struct forcesh *fhdr;
        u_int mlen;
 {
        const struct forcesh *fhdr;
        u_int mlen;

-       u_int32_t flg_raw;
+       uint32_t flg_raw;
+       uint8_t tom;

        const struct tom_h *tops;
        int rc = 0;
 
        fhdr = (const struct forcesh *)pptr;
        const struct tom_h *tops;
        int rc = 0;
 
        fhdr = (const struct forcesh *)pptr;

-       TCHECK(*fhdr);
-       if (!tom_valid(fhdr->fm_tom)) {
-               printf("Invalid ForCES message type %d\n", fhdr->fm_tom);
+       ND_TCHECK(*fhdr);
+       tom = EXTRACT_U_1(fhdr->fm_tom);
+       if (!tom_valid(tom)) {
+               ND_PRINT((ndo, "Invalid ForCES message type %d\n", tom));

                goto error;
        }
 
        mlen = ForCES_BLN(fhdr);
 
                goto error;
        }
 
        mlen = ForCES_BLN(fhdr);
 

-       tops = get_forces_tom(fhdr->fm_tom);
+       tops = get_forces_tom(tom);

        if (tops->v == TOM_RSVD) {
        if (tops->v == TOM_RSVD) {

-               printf("\n\tUnknown ForCES message type=0x%x", fhdr->fm_tom);
+               ND_PRINT((ndo, "\n\tUnknown ForCES message type=0x%x", tom));

                goto error;
        }
 
                goto error;
        }
 

-       printf("\n\tForCES %s ", tops->s);
+       ND_PRINT((ndo, "\n\tForCES %s ", tops->s));

        if (!ForCES_HLN_VALID(mlen, len)) {
        if (!ForCES_HLN_VALID(mlen, len)) {

-               printf
-                   ("Illegal ForCES pkt len - min %u, total recvd %d, advertised %d ",
-                    ForCES_HDRL, len, ForCES_BLN(fhdr));
+               ND_PRINT((ndo,
+                         "Illegal ForCES pkt len - min %u, total recvd %d, advertised %d ",
+                         ForCES_HDRL, len, ForCES_BLN(fhdr)));

                goto error;
        }
 
                goto error;
        }
 

-       TCHECK2(*(pptr + 20), 4);
-       flg_raw = EXTRACT_32BITS(pptr + 20);
-       if (vflag >= 1) {
-               printf("\n\tForCES Version %d len %uB flags 0x%08x ",
-                      ForCES_V(fhdr), mlen, flg_raw);
-               printf("\n\tSrcID 0x%x(%s) DstID 0x%x(%s) Correlator 0x%" PRIx64,
+       ND_TCHECK_4(pptr + 20);
+       flg_raw = EXTRACT_BE_U_4(pptr + 20);
+       if (ndo->ndo_vflag >= 1) {
+               ND_PRINT((ndo, "\n\tForCES Version %d len %uB flags 0x%08x ",
+                      ForCES_V(fhdr), mlen, flg_raw));
+               ND_PRINT((ndo,
+                      "\n\tSrcID 0x%x(%s) DstID 0x%x(%s) Correlator 0x%" PRIx64,

                       ForCES_SID(fhdr), ForCES_node(ForCES_SID(fhdr)),
                       ForCES_DID(fhdr), ForCES_node(ForCES_DID(fhdr)),
                       ForCES_SID(fhdr), ForCES_node(ForCES_SID(fhdr)),
                       ForCES_DID(fhdr), ForCES_node(ForCES_DID(fhdr)),

-                      EXTRACT_64BITS(fhdr->fm_cor));
+                      EXTRACT_BE_U_8(fhdr->fm_cor)));

 
        }
 
        }

-       if (vflag >= 2) {
-               printf
-                   ("\n\tForCES flags:\n\t  %s(0x%x), prio=%d, %s(0x%x),\n\t  %s(0x%x), %s(0x%x)\n",
-                    ForCES_ACKp(ForCES_ACK(fhdr)), ForCES_ACK(fhdr),
+       if (ndo->ndo_vflag >= 2) {
+               ND_PRINT((ndo,
+                    "\n\tForCES flags:\n\t  %s(0x%x), prio=%d, %s(0x%x),\n\t  %s(0x%x), %s(0x%x)\n",
+                    tok2str(ForCES_ACKs, "ACKUnknown", ForCES_ACK(fhdr)),
+                    ForCES_ACK(fhdr),

                     ForCES_PRI(fhdr),
                     ForCES_PRI(fhdr),

-                    ForCES_EMp(ForCES_EM(fhdr)), ForCES_EM(fhdr),
-                    ForCES_ATp(ForCES_AT(fhdr)), ForCES_AT(fhdr),
-                    ForCES_TPp(ForCES_TP(fhdr)), ForCES_TP(fhdr));
-               printf
-                   ("\t  Extra flags: rsv(b5-7) 0x%x rsv(b13-31) 0x%x\n",
-                    ForCES_RS1(fhdr), ForCES_RS2(fhdr));
+                    tok2str(ForCES_EMs, "EMUnknown", ForCES_EM(fhdr)),
+                    ForCES_EM(fhdr),
+                    tok2str(ForCES_ATs, "ATUnknown", ForCES_AT(fhdr)),
+                    ForCES_AT(fhdr),
+                    tok2str(ForCES_TPs, "TPUnknown", ForCES_TP(fhdr)),
+                    ForCES_TP(fhdr)));
+               ND_PRINT((ndo,
+                    "\t  Extra flags: rsv(b5-7) 0x%x rsv(b13-31) 0x%x\n",
+                    ForCES_RS1(fhdr), ForCES_RS2(fhdr)));

        }
        }

-       rc = forces_type_print(pptr, fhdr, mlen, tops);
+       rc = forces_type_print(ndo, pptr, fhdr, mlen, tops);

        if (rc < 0) {
 error:
        if (rc < 0) {
 error:

-               hex_print_with_offset(gndo,"\n\t[", pptr, len, 0);
-               printf("\n\t]");
+               hex_print_with_offset(ndo, "\n\t[", pptr, len, 0);
+               ND_PRINT((ndo, "\n\t]"));

                return;
        }
 
                return;
        }
 

-       if (vflag >= 4) {
-               printf("\n\t  Raw ForCES message\n\t [");
-               hex_print_with_offset(gndo,"\n\t ", pptr, len, 0);
-               printf("\n\t ]");
+       if (ndo->ndo_vflag >= 4) {
+               ND_PRINT((ndo, "\n\t  Raw ForCES message\n\t ["));
+               hex_print_with_offset(ndo, "\n\t ", pptr, len, 0);
+               ND_PRINT((ndo, "\n\t ]"));

        }
        }

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

        return;
 
 trunc:
        return;
 
 trunc:

-       printf("%s", tstr);
+       ND_PRINT((ndo, "%s", tstr));

 }
 /*
  * Local Variables:
 }
 /*
  * Local Variables: