Try the new ND_LCHECK*() macros. [skip ci]

[tcpdump] / print-rsvp.c
diff --git a/print-rsvp.c b/print-rsvp.c

index 421127ec1ab533dd6f0012eebbe3133fb38145fd..86744e063b9cb54ebdc2eb23dd8842125cb70c5e 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -20,11 +20,12 @@
  /* specification: RFC 2205 */
  
  #ifdef HAVE_CONFIG_H
  /* specification: RFC 2205 */
  
  #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
  #endif
  
  #endif
  
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
  
  
+#define ND_LONGJMP_FROM_TCHECK
  #include "netdissect.h"
  #include "extract.h"
  #include "addrtoname.h"
  #include "netdissect.h"
  #include "extract.h"
  #include "addrtoname.h"
@@ -33,7 +34,6 @@
  #include "af.h"
  #include "signature.h"
  
  #include "af.h"
  #include "signature.h"
  
-static const char tstr[] = " [|rsvp]";
  
  /*
   * RFC 2205 common header
  
  /*
   * RFC 2205 common header
@@ -114,6 +114,13 @@ static const struct tok rsvp_header_flag_values[] = {
      { 0, NULL}
  };
  
      { 0, NULL}
  };
  
+static const struct tok rsvp_obj_capability_flag_values[] = {
+    { 0x0004,                "RecoveryPath Transmit Enabled" },
+    { 0x0002,                "RecoveryPath Desired" },
+    { 0x0001,                "RecoveryPath Srefresh Capable" },
+    { 0, NULL}
+};
+
  #define        RSVP_OBJ_SESSION            1   /* rfc2205 */
  #define        RSVP_OBJ_RSVP_HOP           3   /* rfc2205, rfc3473 */
  #define        RSVP_OBJ_INTEGRITY          4   /* rfc2747 */
  #define        RSVP_OBJ_SESSION            1   /* rfc2205 */
  #define        RSVP_OBJ_RSVP_HOP           3   /* rfc2205, rfc3473 */
  #define        RSVP_OBJ_INTEGRITY          4   /* rfc2747 */
@@ -147,6 +154,7 @@ static const struct tok rsvp_header_flag_values[] = {
  #define        RSVP_OBJ_SUGGESTED_LABEL    129 /* rfc3473 */
  #define        RSVP_OBJ_ACCEPT_LABEL_SET   130 /* rfc3473 */
  #define        RSVP_OBJ_RESTART_CAPABILITY 131 /* rfc3473 */
  #define        RSVP_OBJ_SUGGESTED_LABEL    129 /* rfc3473 */
  #define        RSVP_OBJ_ACCEPT_LABEL_SET   130 /* rfc3473 */
  #define        RSVP_OBJ_RESTART_CAPABILITY 131 /* rfc3473 */
+#define RSVP_OBJ_CAPABILITY         134 /* rfc5063 */
  #define        RSVP_OBJ_NOTIFY_REQ         195 /* rfc3473 */
  #define        RSVP_OBJ_ADMIN_STATUS       196 /* rfc3473 */
  #define        RSVP_OBJ_PROPERTIES         204 /* juniper proprietary */
  #define        RSVP_OBJ_NOTIFY_REQ         195 /* rfc3473 */
  #define        RSVP_OBJ_ADMIN_STATUS       196 /* rfc3473 */
  #define        RSVP_OBJ_PROPERTIES         204 /* juniper proprietary */
@@ -194,6 +202,7 @@ static const struct tok rsvp_obj_values[] = {
      { RSVP_OBJ_CALL_ID,            "Call-ID" },
      { RSVP_OBJ_CALL_OPS,           "Call Capability" },
      { RSVP_OBJ_RESTART_CAPABILITY, "Restart Capability" },
      { RSVP_OBJ_CALL_ID,            "Call-ID" },
      { RSVP_OBJ_CALL_OPS,           "Call Capability" },
      { RSVP_OBJ_RESTART_CAPABILITY, "Restart Capability" },
+    { RSVP_OBJ_CAPABILITY,         "Capability" },
      { RSVP_OBJ_NOTIFY_REQ,         "Notify Request" },
      { RSVP_OBJ_PROTECTION,         "Protection" },
      { RSVP_OBJ_ADMIN_STATUS,       "Administrative Status" },
      { RSVP_OBJ_NOTIFY_REQ,         "Notify Request" },
      { RSVP_OBJ_PROTECTION,         "Protection" },
      { RSVP_OBJ_ADMIN_STATUS,       "Administrative Status" },
@@ -281,6 +290,7 @@ static const struct tok rsvp_ctype_values[] = {
      { 256*RSVP_OBJ_ERROR_SPEC+RSVP_CTYPE_3,                  "IPv4 plus opt. TLVs" },
      { 256*RSVP_OBJ_ERROR_SPEC+RSVP_CTYPE_4,                  "IPv6 plus opt. TLVs" },
      { 256*RSVP_OBJ_RESTART_CAPABILITY+RSVP_CTYPE_1,          "IPv4" },
      { 256*RSVP_OBJ_ERROR_SPEC+RSVP_CTYPE_3,                  "IPv4 plus opt. TLVs" },
      { 256*RSVP_OBJ_ERROR_SPEC+RSVP_CTYPE_4,                  "IPv6 plus opt. TLVs" },
      { 256*RSVP_OBJ_RESTART_CAPABILITY+RSVP_CTYPE_1,          "IPv4" },
+    { 256*RSVP_OBJ_CAPABILITY+RSVP_CTYPE_1,                  "1" },
      { 256*RSVP_OBJ_SESSION_ATTRIBUTE+RSVP_CTYPE_TUNNEL_IPV4, "Tunnel IPv4" },
      { 256*RSVP_OBJ_FASTREROUTE+RSVP_CTYPE_TUNNEL_IPV4,       "Tunnel IPv4" }, /* old style*/
      { 256*RSVP_OBJ_FASTREROUTE+RSVP_CTYPE_1,                 "1" }, /* new style */
      { 256*RSVP_OBJ_SESSION_ATTRIBUTE+RSVP_CTYPE_TUNNEL_IPV4, "Tunnel IPv4" },
      { 256*RSVP_OBJ_FASTREROUTE+RSVP_CTYPE_TUNNEL_IPV4,       "Tunnel IPv4" }, /* old style*/
      { 256*RSVP_OBJ_FASTREROUTE+RSVP_CTYPE_1,                 "1" }, /* new style */
@@ -296,6 +306,14 @@ static const struct tok rsvp_ctype_values[] = {
      { 0, NULL}
  };
  
      { 0, NULL}
  };
  
+/*
+ * XXX - this assumes a 16-byte digest, which is true for HMAC-MD5, but
+ * isn't necessarily the case for other hash algorithms.
+ *
+ * Unless I've missed something, there's nothing in RFC 2747 to indicate
+ * the hash algorithm being used, so it's presumably something set up
+ * out-of-band, or negotiated by other RSVP objects.
+ */
  struct rsvp_obj_integrity_t {
      uint8_t flags;
      uint8_t res;
  struct rsvp_obj_integrity_t {
      uint8_t flags;
      uint8_t res;
@@ -324,6 +342,8 @@ struct rsvp_obj_frr_t {
  #define RSVP_OBJ_XRO_MASK_SUBOBJ(x)   ((x)&0x7f)
  #define RSVP_OBJ_XRO_MASK_LOOSE(x)    ((x)&0x80)
  
  #define RSVP_OBJ_XRO_MASK_SUBOBJ(x)   ((x)&0x7f)
  #define RSVP_OBJ_XRO_MASK_LOOSE(x)    ((x)&0x80)
  
+#define RSVP_OBJ_CAPABILITY_FLAGS_MASK  0x7U
+
  #define        RSVP_OBJ_XRO_RES       0
  #define        RSVP_OBJ_XRO_IPV4      1
  #define        RSVP_OBJ_XRO_IPV6      2
  #define        RSVP_OBJ_XRO_RES       0
  #define        RSVP_OBJ_XRO_IPV4      1
  #define        RSVP_OBJ_XRO_IPV6      2
@@ -491,7 +511,7 @@ static const struct tok rsvp_obj_generalized_uni_values[] = {
   */
  static u_int
  rsvp_intserv_print(netdissect_options *ndo,
   */
  static u_int
  rsvp_intserv_print(netdissect_options *ndo,
-                   const u_char *tptr, u_short obj_tlen)
+                   const u_char *tptr, u_int obj_tlen)
  {
      u_int parameter_id,parameter_length;
      union {
  {
      u_int parameter_id,parameter_length;
      union {
@@ -499,21 +519,17 @@ rsvp_intserv_print(netdissect_options *ndo,
         uint32_t i;
      } bw;
  
         uint32_t i;
      } bw;
  
-    if (obj_tlen < 4)
-        return 0;
-    ND_TCHECK_1(tptr);
-    parameter_id = EXTRACT_U_1(tptr);
-    ND_TCHECK_2(tptr + 2);
-    parameter_length = EXTRACT_BE_U_2(tptr + 2)<<2; /* convert wordcount to bytecount */
+    ND_LCHECK_U(obj_tlen, 4);
+    parameter_id = GET_U_1(tptr);
+    parameter_length = GET_BE_U_2(tptr + 2)<<2; /* convert wordcount to bytecount */
  
  
-    ND_PRINT((ndo, "\n\t      Parameter ID: %s (%u), length: %u, Flags: [0x%02x]",
+    ND_PRINT("\n\t      Parameter ID: %s (%u), length: %u, Flags: [0x%02x]",
             tok2str(rsvp_intserv_parameter_id_values,"unknown",parameter_id),
             parameter_id,
             parameter_length,
             tok2str(rsvp_intserv_parameter_id_values,"unknown",parameter_id),
             parameter_id,
             parameter_length,
-           EXTRACT_U_1(tptr + 1)));
+           GET_U_1(tptr + 1));
  
  
-    if (obj_tlen < parameter_length+4)
-        return 0;
+    ND_LCHECK_U(obj_tlen, parameter_length + 4);
      switch(parameter_id) { /* parameter_id */
  
      case 4:
      switch(parameter_id) { /* parameter_id */
  
      case 4:
@@ -525,8 +541,7 @@ rsvp_intserv_print(netdissect_options *ndo,
          * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
          */
          if (parameter_length == 4) {
          * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
          */
          if (parameter_length == 4) {
-           ND_TCHECK_4(tptr + 4);
-            ND_PRINT((ndo, "\n\t\tIS hop count: %u", EXTRACT_BE_U_4(tptr + 4)));
+            ND_PRINT("\n\t\tIS hop count: %u", GET_BE_U_4(tptr + 4));
          }
          break;
  
          }
          break;
  
@@ -539,9 +554,8 @@ rsvp_intserv_print(netdissect_options *ndo,
          * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
          */
          if (parameter_length == 4) {
          * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
          */
          if (parameter_length == 4) {
-           ND_TCHECK_4(tptr + 4);
-            bw.i = EXTRACT_BE_U_4(tptr + 4);
-            ND_PRINT((ndo, "\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000));
+            bw.i = GET_BE_U_4(tptr + 4);
+            ND_PRINT("\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000);
          }
          break;
  
          }
          break;
  
@@ -554,12 +568,11 @@ rsvp_intserv_print(netdissect_options *ndo,
          * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
          */
          if (parameter_length == 4) {
          * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
          */
          if (parameter_length == 4) {
-           ND_TCHECK_4(tptr + 4);
-            ND_PRINT((ndo, "\n\t\tMinimum path latency: "));
-            if (EXTRACT_BE_U_4(tptr + 4) == 0xffffffff)
-                ND_PRINT((ndo, "don't care"));
+            ND_PRINT("\n\t\tMinimum path latency: ");
+            if (GET_BE_U_4(tptr + 4) == 0xffffffff)
+                ND_PRINT("don't care");
              else
              else
-                ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(tptr + 4)));
+                ND_PRINT("%u", GET_BE_U_4(tptr + 4));
          }
          break;
  
          }
          break;
  
@@ -573,8 +586,7 @@ rsvp_intserv_print(netdissect_options *ndo,
          * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
          */
          if (parameter_length == 4) {
          * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
          */
          if (parameter_length == 4) {
-           ND_TCHECK_4(tptr + 4);
-            ND_PRINT((ndo, "\n\t\tComposed MTU: %u bytes", EXTRACT_BE_U_4(tptr + 4)));
+            ND_PRINT("\n\t\tComposed MTU: %u bytes", GET_BE_U_4(tptr + 4));
          }
          break;
      case 127:
          }
          break;
      case 127:
@@ -595,15 +607,16 @@ rsvp_intserv_print(netdissect_options *ndo,
          */
  
          if (parameter_length == 20) {
          */
  
          if (parameter_length == 20) {
-           ND_TCHECK_LEN(tptr + 4, 20);
-            bw.i = EXTRACT_BE_U_4(tptr + 4);
-            ND_PRINT((ndo, "\n\t\tToken Bucket Rate: %.10g Mbps", bw.f / 125000));
-            bw.i = EXTRACT_BE_U_4(tptr + 8);
-            ND_PRINT((ndo, "\n\t\tToken Bucket Size: %.10g bytes", bw.f));
-            bw.i = EXTRACT_BE_U_4(tptr + 12);
-            ND_PRINT((ndo, "\n\t\tPeak Data Rate: %.10g Mbps", bw.f / 125000));
-            ND_PRINT((ndo, "\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_BE_U_4(tptr + 16)));
-            ND_PRINT((ndo, "\n\t\tMaximum Packet Size: %u bytes", EXTRACT_BE_U_4(tptr + 20)));
+            bw.i = GET_BE_U_4(tptr + 4);
+            ND_PRINT("\n\t\tToken Bucket Rate: %.10g Mbps", bw.f / 125000);
+            bw.i = GET_BE_U_4(tptr + 8);
+            ND_PRINT("\n\t\tToken Bucket Size: %.10g bytes", bw.f);
+            bw.i = GET_BE_U_4(tptr + 12);
+            ND_PRINT("\n\t\tPeak Data Rate: %.10g Mbps", bw.f / 125000);
+            ND_PRINT("\n\t\tMinimum Policed Unit: %u bytes",
+                     GET_BE_U_4(tptr + 16));
+            ND_PRINT("\n\t\tMaximum Packet Size: %u bytes",
+                     GET_BE_U_4(tptr + 20));
          }
          break;
  
          }
          break;
  
@@ -619,10 +632,9 @@ rsvp_intserv_print(netdissect_options *ndo,
          */
  
          if (parameter_length == 8) {
          */
  
          if (parameter_length == 8) {
-           ND_TCHECK_8(tptr + 4);
-            bw.i = EXTRACT_BE_U_4(tptr + 4);
-            ND_PRINT((ndo, "\n\t\tRate: %.10g Mbps", bw.f / 125000));
-            ND_PRINT((ndo, "\n\t\tSlack Term: %u", EXTRACT_BE_U_4(tptr + 8)));
+            bw.i = GET_BE_U_4(tptr + 4);
+            ND_PRINT("\n\t\tRate: %.10g Mbps", bw.f / 125000);
+            ND_PRINT("\n\t\tSlack Term: %u", GET_BE_U_4(tptr + 8));
          }
          break;
  
          }
          break;
  
@@ -631,8 +643,7 @@ rsvp_intserv_print(netdissect_options *ndo,
      case 135:
      case 136:
          if (parameter_length == 4) {
      case 135:
      case 136:
          if (parameter_length == 4) {
-           ND_TCHECK_4(tptr + 4);
-            ND_PRINT((ndo, "\n\t\tValue: %u", EXTRACT_BE_U_4(tptr + 4)));
+            ND_PRINT("\n\t\tValue: %u", GET_BE_U_4(tptr + 4));
          }
          break;
  
          }
          break;
  
@@ -642,8 +653,8 @@ rsvp_intserv_print(netdissect_options *ndo,
      }
      return (parameter_length+4); /* header length 4 bytes */
  
      }
      return (parameter_length+4); /* header length 4 bytes */
  
-trunc:
-    ND_PRINT((ndo, "%s", tstr));
+invalid:
+    nd_print_invalid(ndo);
      return 0;
  }
  
      return 0;
  }
  
@@ -672,38 +683,35 @@ rsvp_obj_print(netdissect_options *ndo,
          const struct rsvp_obj_frr_t *rsvp_obj_frr;
      } obj_ptr;
  
          const struct rsvp_obj_frr_t *rsvp_obj_frr;
      } obj_ptr;
  
-    u_short rsvp_obj_len,rsvp_obj_ctype,rsvp_obj_class_num,obj_tlen;
-    u_int intserv_serv_tlen;
+    u_short rsvp_obj_len,rsvp_obj_ctype,rsvp_obj_class_num;
+    u_int obj_tlen,intserv_serv_tlen;
      int hexdump;
      u_int processed,padbytes,error_code,error_value,i,sigcheck;
      union {
         float f;
         uint32_t i;
      } bw;
      int hexdump;
      u_int processed,padbytes,error_code,error_value,i,sigcheck;
      union {
         float f;
         uint32_t i;
      } bw;
-    uint8_t namelen;
+    u_int namelen;
  
      u_int action, subchannel;
  
      while(tlen>=sizeof(struct rsvp_object_header)) {
  
      u_int action, subchannel;
  
      while(tlen>=sizeof(struct rsvp_object_header)) {
-        /* did we capture enough for fully decoding the object header ? */
-        ND_TCHECK_LEN(tptr, sizeof(struct rsvp_object_header));
-
          rsvp_obj_header = (const struct rsvp_object_header *)tptr;
          rsvp_obj_header = (const struct rsvp_object_header *)tptr;
-        rsvp_obj_len=EXTRACT_BE_U_2(rsvp_obj_header->length);
-        rsvp_obj_ctype=EXTRACT_U_1(rsvp_obj_header->ctype);
+        rsvp_obj_len=GET_BE_U_2(rsvp_obj_header->length);
+        rsvp_obj_ctype=GET_U_1(rsvp_obj_header->ctype);
  
          if(rsvp_obj_len % 4) {
  
          if(rsvp_obj_len % 4) {
-            ND_PRINT((ndo, "%sERROR: object header size %u not a multiple of 4", indent, rsvp_obj_len));
+            ND_PRINT("%sERROR: object header size %u not a multiple of 4", indent, rsvp_obj_len);
              return -1;
          }
          if(rsvp_obj_len < sizeof(struct rsvp_object_header)) {
              return -1;
          }
          if(rsvp_obj_len < sizeof(struct rsvp_object_header)) {
-            ND_PRINT((ndo, "%sERROR: object header too short %u < %lu", indent, rsvp_obj_len,
-                   (unsigned long)sizeof(struct rsvp_object_header)));
+            ND_PRINT("%sERROR: object header too short %u < %zu", indent, rsvp_obj_len,
+                   sizeof(struct rsvp_object_header));
              return -1;
          }
  
              return -1;
          }
  
-        rsvp_obj_class_num = EXTRACT_U_1(rsvp_obj_header->class_num);
-        ND_PRINT((ndo, "%s%s Object (%u) Flags: [%s",
+        rsvp_obj_class_num = GET_U_1(rsvp_obj_header->class_num);
+        ND_PRINT("%s%s Object (%u) Flags: [%s",
                 indent,
                 tok2str(rsvp_obj_values,
                         "Unknown",
                 indent,
                 tok2str(rsvp_obj_values,
                         "Unknown",
@@ -712,17 +720,17 @@ rsvp_obj_print(netdissect_options *ndo,
                 (rsvp_obj_class_num & 0x80) ?
                     ((rsvp_obj_class_num & 0x40) ? "ignore and forward" :
                                           "ignore silently") :
                 (rsvp_obj_class_num & 0x80) ?
                     ((rsvp_obj_class_num & 0x40) ? "ignore and forward" :
                                           "ignore silently") :
-                   "reject"));
+                   "reject");
  
  
-        ND_PRINT((ndo, " if unknown], Class-Type: %s (%u), length: %u",
+        ND_PRINT(" if unknown], Class-Type: %s (%u), length: %u",
                 tok2str(rsvp_ctype_values,
                         "Unknown",
                         (rsvp_obj_class_num<<8)+rsvp_obj_ctype),
                 rsvp_obj_ctype,
                 tok2str(rsvp_ctype_values,
                         "Unknown",
                         (rsvp_obj_class_num<<8)+rsvp_obj_ctype),
                 rsvp_obj_ctype,
-               rsvp_obj_len));
+               rsvp_obj_len);
  
          if(tlen < rsvp_obj_len) {
  
          if(tlen < rsvp_obj_len) {
-            ND_PRINT((ndo, "%sERROR: object goes past end of objects TLV", indent));
+            ND_PRINT("%sERROR: object goes past end of objects TLV", indent);
              return -1;
          }
  
              return -1;
          }
  
@@ -730,8 +738,7 @@ rsvp_obj_print(netdissect_options *ndo,
          obj_tlen=rsvp_obj_len-sizeof(struct rsvp_object_header);
  
          /* did we capture enough for fully decoding the object ? */
          obj_tlen=rsvp_obj_len-sizeof(struct rsvp_object_header);
  
          /* did we capture enough for fully decoding the object ? */
-        if (!ND_TTEST_LEN(tptr, rsvp_obj_len))
-            return -1;
+        ND_TCHECK_LEN(tptr, rsvp_obj_len);
          hexdump=FALSE;
  
          switch(rsvp_obj_class_num) {
          hexdump=FALSE;
  
          switch(rsvp_obj_class_num) {
@@ -739,76 +746,76 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv4 DestAddress: %s, Protocol ID: 0x%02x",
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv4 DestAddress: %s, Protocol ID: 0x%02x",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_U_1(obj_tptr + sizeof(struct in_addr))));
-                ND_PRINT((ndo, "%s  Flags: [0x%02x], DestPort %u",
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_U_1(obj_tptr + sizeof(nd_ipv4)));
+                ND_PRINT("%s  Flags: [0x%02x], DestPort %u",
                         indent,
                         indent,
-                       EXTRACT_U_1((obj_tptr + 5)),
-                       EXTRACT_BE_U_2(obj_tptr + 6)));
+                       GET_U_1((obj_tptr + 5)),
+                       GET_BE_U_2(obj_tptr + 6));
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv6 DestAddress: %s, Protocol ID: 0x%02x",
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv6 DestAddress: %s, Protocol ID: 0x%02x",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_U_1(obj_tptr + sizeof(struct in6_addr))));
-                ND_PRINT((ndo, "%s  Flags: [0x%02x], DestPort %u",
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_U_1(obj_tptr + sizeof(nd_ipv6)));
+                ND_PRINT("%s  Flags: [0x%02x], DestPort %u",
                         indent,
                         indent,
-                       EXTRACT_U_1((obj_tptr + sizeof(struct in6_addr) + 1)),
-                       EXTRACT_BE_U_2(obj_tptr + sizeof(struct in6_addr) + 2)));
+                       GET_U_1((obj_tptr + sizeof(nd_ipv6) + 1)),
+                       GET_BE_U_2(obj_tptr + sizeof(nd_ipv6) + 2));
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
  
              case RSVP_CTYPE_TUNNEL_IPV6:
                  if (obj_tlen < 36)
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
  
              case RSVP_CTYPE_TUNNEL_IPV6:
                  if (obj_tlen < 36)
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18),
-                       ip6addr_string(ndo, obj_tptr + 20)));
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 18),
+                       GET_IP6ADDR_STRING(obj_tptr + 20));
                  obj_tlen-=36;
                  obj_tptr+=36;
                  break;
  
              case RSVP_CTYPE_14: /* IPv6 p2mp LSP Tunnel */
                  if (obj_tlen < 26)
                  obj_tlen-=36;
                  obj_tptr+=36;
                  break;
  
              case RSVP_CTYPE_14: /* IPv6 p2mp LSP Tunnel */
                  if (obj_tlen < 26)
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
-                       ip6addr_string(ndo, obj_tptr + 8)));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6),
+                       GET_IP6ADDR_STRING(obj_tptr + 8));
                  obj_tlen-=26;
                  obj_tptr+=26;
                  break;
              case RSVP_CTYPE_13: /* IPv4 p2mp LSP Tunnel */
                  if (obj_tlen < 12)
                  obj_tlen-=26;
                  obj_tptr+=26;
                  break;
              case RSVP_CTYPE_13: /* IPv4 p2mp LSP Tunnel */
                  if (obj_tlen < 12)
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
-                       ipaddr_string(ndo, obj_tptr + 8)));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6),
+                       GET_IPADDR_STRING(obj_tptr + 8));
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
              case RSVP_CTYPE_TUNNEL_IPV4:
              case RSVP_CTYPE_UNI_IPV4:
                  if (obj_tlen < 12)
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
              case RSVP_CTYPE_TUNNEL_IPV4:
              case RSVP_CTYPE_UNI_IPV4:
                  if (obj_tlen < 12)
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
-                       ipaddr_string(ndo, obj_tptr + 8)));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6),
+                       GET_IPADDR_STRING(obj_tptr + 8));
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
@@ -820,22 +827,22 @@ rsvp_obj_print(netdissect_options *ndo,
          case RSVP_OBJ_CONFIRM:
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
          case RSVP_OBJ_CONFIRM:
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
-                if (obj_tlen < sizeof(struct in_addr))
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv4 Receiver Address: %s",
+                if (obj_tlen < sizeof(nd_ipv4))
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv4 Receiver Address: %s",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr)));
-                obj_tlen-=sizeof(struct in_addr);
-                obj_tptr+=sizeof(struct in_addr);
+                       GET_IPADDR_STRING(obj_tptr));
+                obj_tlen-=sizeof(nd_ipv4);
+                obj_tptr+=sizeof(nd_ipv4);
                  break;
              case RSVP_CTYPE_IPV6:
                  break;
              case RSVP_CTYPE_IPV6:
-                if (obj_tlen < sizeof(struct in6_addr))
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv6 Receiver Address: %s",
+                if (obj_tlen < sizeof(nd_ipv6))
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv6 Receiver Address: %s",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr)));
-                obj_tlen-=sizeof(struct in6_addr);
-                obj_tptr+=sizeof(struct in6_addr);
+                       GET_IP6ADDR_STRING(obj_tptr));
+                obj_tlen-=sizeof(nd_ipv6);
+                obj_tptr+=sizeof(nd_ipv6);
                  break;
              default:
                  hexdump=TRUE;
                  break;
              default:
                  hexdump=TRUE;
@@ -845,22 +852,22 @@ rsvp_obj_print(netdissect_options *ndo,
          case RSVP_OBJ_NOTIFY_REQ:
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
          case RSVP_OBJ_NOTIFY_REQ:
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
-                if (obj_tlen < sizeof(struct in_addr))
-                    return -1;
-                ND_PRINT((ndo, "%s  IPv4 Notify Node Address: %s",
+                if (obj_tlen < sizeof(nd_ipv4))
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv4 Notify Node Address: %s",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr)));
-                obj_tlen-=sizeof(struct in_addr);
-                obj_tptr+=sizeof(struct in_addr);
+                       GET_IPADDR_STRING(obj_tptr));
+                obj_tlen-=sizeof(nd_ipv4);
+                obj_tptr+=sizeof(nd_ipv4);
                  break;
              case RSVP_CTYPE_IPV6:
                  break;
              case RSVP_CTYPE_IPV6:
-                if (obj_tlen < sizeof(struct in6_addr))
-                    return-1;
-                ND_PRINT((ndo, "%s  IPv6 Notify Node Address: %s",
+                if (obj_tlen < sizeof(nd_ipv6))
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv6 Notify Node Address: %s",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr)));
-                obj_tlen-=sizeof(struct in6_addr);
-                obj_tptr+=sizeof(struct in6_addr);
+                       GET_IP6ADDR_STRING(obj_tptr));
+                obj_tlen-=sizeof(nd_ipv6);
+                obj_tptr+=sizeof(nd_ipv6);
                  break;
              default:
                  hexdump=TRUE;
                  break;
              default:
                  hexdump=TRUE;
@@ -874,29 +881,29 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  while(obj_tlen >= 4 ) {
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  while(obj_tlen >= 4 ) {
-                    ND_PRINT((ndo, "%s  Label: %u", indent, EXTRACT_BE_U_4(obj_tptr)));
+                    ND_PRINT("%s  Label: %u", indent, GET_BE_U_4(obj_tptr));
                      obj_tlen-=4;
                      obj_tptr+=4;
                  }
                  break;
              case RSVP_CTYPE_2:
                  if (obj_tlen < 4)
                      obj_tlen-=4;
                      obj_tptr+=4;
                  }
                  break;
              case RSVP_CTYPE_2:
                  if (obj_tlen < 4)
-                    return-1;
-                ND_PRINT((ndo, "%s  Generalized Label: %u",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Generalized Label: %u",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_tptr)));
+                       GET_BE_U_4(obj_tptr));
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
              case RSVP_CTYPE_3:
                  if (obj_tlen < 12)
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
              case RSVP_CTYPE_3:
                  if (obj_tlen < 12)
-                    return-1;
-                ND_PRINT((ndo, "%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr),
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       EXTRACT_BE_U_4(obj_tptr + 8)));
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_BE_U_4(obj_tptr + 8));
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
@@ -909,13 +916,13 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
-                    return-1;
-                ND_PRINT((ndo, "%s  Reservation Style: %s, Flags: [0x%02x]",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Reservation Style: %s, Flags: [0x%02x]",
                         indent,
                         tok2str(rsvp_resstyle_values,
                                 "Unknown",
                         indent,
                         tok2str(rsvp_resstyle_values,
                                 "Unknown",
-                               EXTRACT_BE_U_3(obj_tptr + 1)),
-                       EXTRACT_U_1(obj_tptr)));
+                               GET_BE_U_3(obj_tptr + 1)),
+                       GET_U_1(obj_tptr));
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
@@ -928,59 +935,59 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
-                    return-1;
-                ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Source Address: %s, Source Port: %u",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6)));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6));
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
-                    return-1;
-                ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Source Address: %s, Source Port: %u",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18)));
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 18));
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
              case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */
                  if (obj_tlen < 40)
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
              case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */
                  if (obj_tlen < 40)
-                    return-1;
-                ND_PRINT((ndo, "%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                         "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                         indent,
                         "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18),
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 18),
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr+20),
-                       EXTRACT_BE_U_2(obj_tptr + 38)));
+                       GET_IP6ADDR_STRING(obj_tptr+20),
+                       GET_BE_U_2(obj_tptr + 38));
                  obj_tlen-=40;
                  obj_tptr+=40;
                  break;
              case RSVP_CTYPE_TUNNEL_IPV4:
                  if (obj_tlen < 8)
                  obj_tlen-=40;
                  obj_tptr+=40;
                  break;
              case RSVP_CTYPE_TUNNEL_IPV4:
                  if (obj_tlen < 8)
-                    return-1;
-                ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6)));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6));
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */
                  if (obj_tlen < 16)
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */
                  if (obj_tlen < 16)
-                    return-1;
-                ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                         "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                         indent,
                         "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6),
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr+8),
-                       EXTRACT_BE_U_2(obj_tptr + 12)));
+                       GET_IPADDR_STRING(obj_tptr+8),
+                       GET_BE_U_2(obj_tptr + 12));
                  obj_tlen-=16;
                  obj_tptr+=16;
                  break;
                  obj_tlen-=16;
                  obj_tptr+=16;
                  break;
@@ -993,71 +1000,72 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  while(obj_tlen >= 4 ) {
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  while(obj_tlen >= 4 ) {
-                    ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
+                    ND_PRINT("%s  L3 Protocol ID: %s",
                             indent,
                             tok2str(ethertype_values,
                                     "Unknown Protocol (0x%04x)",
                             indent,
                             tok2str(ethertype_values,
                                     "Unknown Protocol (0x%04x)",
-                                   EXTRACT_BE_U_2(obj_tptr + 2))));
+                                   GET_BE_U_2(obj_tptr + 2)));
                      obj_tlen-=4;
                      obj_tptr+=4;
                  }
                  break;
              case RSVP_CTYPE_2:
                  if (obj_tlen < 12)
                      obj_tlen-=4;
                      obj_tptr+=4;
                  }
                  break;
              case RSVP_CTYPE_2:
                  if (obj_tlen < 12)
-                    return-1;
-                ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
+                    goto obj_tooshort;
+                ND_PRINT("%s  L3 Protocol ID: %s",
                         indent,
                         tok2str(ethertype_values,
                                 "Unknown Protocol (0x%04x)",
                         indent,
                         tok2str(ethertype_values,
                                 "Unknown Protocol (0x%04x)",
-                               EXTRACT_BE_U_2(obj_tptr + 2))));
-                ND_PRINT((ndo, ",%s merge capability",((EXTRACT_U_1(obj_tptr + 4)) & 0x80) ? "no" : "" ));
-                ND_PRINT((ndo, "%s  Minimum VPI/VCI: %u/%u",
+                               GET_BE_U_2(obj_tptr + 2)));
+                ND_PRINT(",%s merge capability",
+                         ((GET_U_1(obj_tptr + 4)) & 0x80) ? "no" : "" );
+                ND_PRINT("%s  Minimum VPI/VCI: %u/%u",
                         indent,
                         indent,
-                       (EXTRACT_BE_U_2(obj_tptr + 4))&0xfff,
-                       (EXTRACT_BE_U_2(obj_tptr + 6)) & 0xfff));
-                ND_PRINT((ndo, "%s  Maximum VPI/VCI: %u/%u",
+                       (GET_BE_U_2(obj_tptr + 4))&0xfff,
+                       (GET_BE_U_2(obj_tptr + 6)) & 0xfff);
+                ND_PRINT("%s  Maximum VPI/VCI: %u/%u",
                         indent,
                         indent,
-                       (EXTRACT_BE_U_2(obj_tptr + 8))&0xfff,
-                       (EXTRACT_BE_U_2(obj_tptr + 10)) & 0xfff));
+                       (GET_BE_U_2(obj_tptr + 8))&0xfff,
+                       (GET_BE_U_2(obj_tptr + 10)) & 0xfff);
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
              case RSVP_CTYPE_3:
                  if (obj_tlen < 12)
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
              case RSVP_CTYPE_3:
                  if (obj_tlen < 12)
-                    return-1;
-                ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
+                    goto obj_tooshort;
+                ND_PRINT("%s  L3 Protocol ID: %s",
                         indent,
                         tok2str(ethertype_values,
                                 "Unknown Protocol (0x%04x)",
                         indent,
                         tok2str(ethertype_values,
                                 "Unknown Protocol (0x%04x)",
-                               EXTRACT_BE_U_2(obj_tptr + 2))));
-                ND_PRINT((ndo, "%s  Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI",
+                               GET_BE_U_2(obj_tptr + 2)));
+                ND_PRINT("%s  Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI",
                         indent,
                         indent,
-                       (EXTRACT_BE_U_4(obj_tptr + 4))&0x7fffff,
-                       (EXTRACT_BE_U_4(obj_tptr + 8))&0x7fffff,
-                       (((EXTRACT_BE_U_2(obj_tptr + 4)>>7)&3) == 0 ) ? "10" : "",
-                       (((EXTRACT_BE_U_2(obj_tptr + 4) >> 7) & 3) == 2 ) ? "23" : ""));
+                       (GET_BE_U_4(obj_tptr + 4))&0x7fffff,
+                       (GET_BE_U_4(obj_tptr + 8))&0x7fffff,
+                       (((GET_BE_U_2(obj_tptr + 4)>>7)&3) == 0 ) ? "10" : "",
+                       (((GET_BE_U_2(obj_tptr + 4) >> 7) & 3) == 2 ) ? "23" : "");
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
              case RSVP_CTYPE_4:
                  if (obj_tlen < 4)
                  obj_tlen-=12;
                  obj_tptr+=12;
                  break;
              case RSVP_CTYPE_4:
                  if (obj_tlen < 4)
-                    return-1;
-                ND_PRINT((ndo, "%s  LSP Encoding Type: %s (%u)",
+                    goto obj_tooshort;
+                ND_PRINT("%s  LSP Encoding Type: %s (%u)",
                         indent,
                         tok2str(gmpls_encoding_values,
                                 "Unknown",
                         indent,
                         tok2str(gmpls_encoding_values,
                                 "Unknown",
-                               EXTRACT_U_1(obj_tptr)),
-                       EXTRACT_U_1(obj_tptr)));
-                ND_PRINT((ndo, "%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
+                               GET_U_1(obj_tptr)),
+                       GET_U_1(obj_tptr));
+                ND_PRINT("%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
                         indent,
                         tok2str(gmpls_switch_cap_values,
                                 "Unknown",
                         indent,
                         tok2str(gmpls_switch_cap_values,
                                 "Unknown",
-                               EXTRACT_U_1((obj_tptr + 1))),
-                       EXTRACT_U_1(obj_tptr + 1),
+                               GET_U_1((obj_tptr + 1))),
+                       GET_U_1(obj_tptr + 1),
                         tok2str(gmpls_payload_values,
                                 "Unknown",
                         tok2str(gmpls_payload_values,
                                 "Unknown",
-                               EXTRACT_BE_U_2(obj_tptr + 2)),
-                       EXTRACT_BE_U_2(obj_tptr + 2)));
+                               GET_BE_U_2(obj_tptr + 2)),
+                       GET_BE_U_2(obj_tptr + 2));
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
@@ -1074,62 +1082,61 @@ rsvp_obj_print(netdissect_options *ndo,
                     u_char length;
  
                     ND_TCHECK_4(obj_tptr);
                     u_char length;
  
                     ND_TCHECK_4(obj_tptr);
-                   length = EXTRACT_U_1(obj_tptr + 1);
-                    ND_PRINT((ndo, "%s  Subobject Type: %s, length %u",
+                   length = GET_U_1(obj_tptr + 1);
+                    ND_PRINT("%s  Subobject Type: %s, length %u",
                             indent,
                             tok2str(rsvp_obj_xro_values,
                                     "Unknown %u",
                             indent,
                             tok2str(rsvp_obj_xro_values,
                                     "Unknown %u",
-                                   RSVP_OBJ_XRO_MASK_SUBOBJ(EXTRACT_U_1(obj_tptr))),
-                           length));
+                                   RSVP_OBJ_XRO_MASK_SUBOBJ(GET_U_1(obj_tptr))),
+                           length);
                      if (obj_tlen < length) {
                      if (obj_tlen < length) {
-                        ND_PRINT((ndo, "%s  ERROR: ERO subobject length > object length", indent));
+                        ND_PRINT("%s  ERROR: ERO subobject length > object length", indent);
                          break;
                          break;
-                    };
+                    }
  
                      if (length == 0) { /* prevent infinite loops */
  
                      if (length == 0) { /* prevent infinite loops */
-                        ND_PRINT((ndo, "%s  ERROR: zero length ERO subtype", indent));
+                        ND_PRINT("%s  ERROR: zero length ERO subtype", indent);
                          break;
                      }
  
                          break;
                      }
  
-                    switch(RSVP_OBJ_XRO_MASK_SUBOBJ(EXTRACT_U_1(obj_tptr))) {
+                    switch(RSVP_OBJ_XRO_MASK_SUBOBJ(GET_U_1(obj_tptr))) {
                     u_char prefix_length;
  
                      case RSVP_OBJ_XRO_IPV4:
                         if (length != 8) {
                     u_char prefix_length;
  
                      case RSVP_OBJ_XRO_IPV4:
                         if (length != 8) {
-                               ND_PRINT((ndo, " ERROR: length != 8"));
+                               ND_PRINT(" ERROR: length != 8");
                                 goto invalid;
                         }
                         ND_TCHECK_8(obj_tptr);
                                 goto invalid;
                         }
                         ND_TCHECK_8(obj_tptr);
-                       prefix_length = EXTRACT_U_1(obj_tptr + 6);
+                       prefix_length = GET_U_1(obj_tptr + 6);
                         if (prefix_length != 32) {
                         if (prefix_length != 32) {
-                               ND_PRINT((ndo, " ERROR: Prefix length %u != 32",
-                                         prefix_length));
+                               ND_PRINT(" ERROR: Prefix length %u != 32",
+                                         prefix_length);
                                 goto invalid;
                         }
                                 goto invalid;
                         }
-                        ND_PRINT((ndo, ", %s, %s/%u, Flags: [%s]",
-                               RSVP_OBJ_XRO_MASK_LOOSE(EXTRACT_U_1(obj_tptr)) ? "Loose" : "Strict",
-                               ipaddr_string(ndo, obj_tptr+2),
-                               EXTRACT_U_1((obj_tptr + 6)),
+                        ND_PRINT(", %s, %s/%u, Flags: [%s]",
+                               RSVP_OBJ_XRO_MASK_LOOSE(GET_U_1(obj_tptr)) ? "Loose" : "Strict",
+                               GET_IPADDR_STRING(obj_tptr+2),
+                               GET_U_1((obj_tptr + 6)),
                                 bittok2str(rsvp_obj_rro_flag_values,
                                     "none",
                                 bittok2str(rsvp_obj_rro_flag_values,
                                     "none",
-                                   EXTRACT_U_1((obj_tptr + 7))))); /* rfc3209 says that this field is rsvd. */
+                                   GET_U_1((obj_tptr + 7)))); /* rfc3209 says that this field is rsvd. */
                      break;
                      case RSVP_OBJ_XRO_LABEL:
                         if (length != 8) {
                      break;
                      case RSVP_OBJ_XRO_LABEL:
                         if (length != 8) {
-                               ND_PRINT((ndo, " ERROR: length != 8"));
+                               ND_PRINT(" ERROR: length != 8");
                                 goto invalid;
                         }
                                 goto invalid;
                         }
-                       ND_TCHECK_8(obj_tptr);
-                        ND_PRINT((ndo, ", Flags: [%s] (%#x), Class-Type: %s (%u), %u",
+                        ND_PRINT(", Flags: [%s] (%#x), Class-Type: %s (%u), %u",
                                 bittok2str(rsvp_obj_rro_label_flag_values,
                                     "none",
                                 bittok2str(rsvp_obj_rro_label_flag_values,
                                     "none",
-                                   EXTRACT_U_1((obj_tptr + 2))),
-                               EXTRACT_U_1(obj_tptr + 2),
+                                   GET_U_1((obj_tptr + 2))),
+                               GET_U_1(obj_tptr + 2),
                                 tok2str(rsvp_ctype_values,
                                         "Unknown",
                                 tok2str(rsvp_ctype_values,
                                         "Unknown",
-                                       EXTRACT_U_1((obj_tptr + 3)) + (256 * RSVP_OBJ_RRO)),
-                               EXTRACT_U_1((obj_tptr + 3)),
-                               EXTRACT_BE_U_4(obj_tptr + 4)));
+                                       GET_U_1((obj_tptr + 3)) + (256 * RSVP_OBJ_RRO)),
+                               GET_U_1((obj_tptr + 3)),
+                               GET_BE_U_4(obj_tptr + 4));
                      }
                      obj_tlen-=length;
                      obj_tptr+=length;
                      }
                      obj_tlen-=length;
                      obj_tptr+=length;
@@ -1145,11 +1152,11 @@ rsvp_obj_print(netdissect_options *ndo,
              case RSVP_CTYPE_1:
              case RSVP_CTYPE_2:
                  if (obj_tlen < 8)
              case RSVP_CTYPE_1:
              case RSVP_CTYPE_2:
                  if (obj_tlen < 8)
-                    return-1;
-                ND_PRINT((ndo, "%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 4)));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr + 4));
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
@@ -1162,11 +1169,11 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 8)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 8)
-                    return-1;
-                ND_PRINT((ndo, "%s  Restart  Time: %ums, Recovery Time: %ums",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Restart  Time: %ums, Recovery Time: %ums",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 4)));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr + 4));
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
@@ -1175,25 +1182,47 @@ rsvp_obj_print(netdissect_options *ndo,
              }
              break;
  
              }
              break;
  
+        case RSVP_OBJ_CAPABILITY:
+            switch(rsvp_obj_ctype) {
+            case RSVP_CTYPE_1:
+                if (obj_tlen < 4)
+                    goto obj_tooshort;
+                uint32_t unused_and_flags = GET_BE_U_4(obj_tptr);
+                if (unused_and_flags & ~RSVP_OBJ_CAPABILITY_FLAGS_MASK)
+                    ND_PRINT("%s  [reserved=0x%08x must be zero]", indent,
+                        unused_and_flags & ~RSVP_OBJ_CAPABILITY_FLAGS_MASK);
+                ND_PRINT("%s  Flags: [%s]",
+                       indent,
+                       bittok2str(rsvp_obj_capability_flag_values,
+                                  "none",
+                                  (unused_and_flags & RSVP_OBJ_CAPABILITY_FLAGS_MASK)));
+                obj_tlen-=4;
+                obj_tptr+=4;
+                break;
+            default:
+                hexdump=TRUE;
+            }
+            break;
+
          case RSVP_OBJ_SESSION_ATTRIBUTE:
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_TUNNEL_IPV4:
                  if (obj_tlen < 4)
          case RSVP_OBJ_SESSION_ATTRIBUTE:
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_TUNNEL_IPV4:
                  if (obj_tlen < 4)
-                    return-1;
-                namelen = EXTRACT_U_1(obj_tptr + 3);
+                    goto obj_tooshort;
+                namelen = GET_U_1(obj_tptr + 3);
                  if (obj_tlen < 4+namelen)
                  if (obj_tlen < 4+namelen)
-                    return-1;
-                ND_PRINT((ndo, "%s  Session Name: ", indent));
+                    goto obj_tooshort;
+                ND_PRINT("%s  Session Name: ", indent);
                  for (i = 0; i < namelen; i++)
                  for (i = 0; i < namelen; i++)
-                    safeputchar(ndo, EXTRACT_U_1(obj_tptr + 4 + i));
-                ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)",
+                    fn_print_char(ndo, GET_U_1(obj_tptr + 4 + i));
+                ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)",
                         indent,
                         indent,
-                       EXTRACT_U_1(obj_tptr),
-                       EXTRACT_U_1(obj_tptr + 1),
+                       GET_U_1(obj_tptr),
+                       GET_U_1(obj_tptr + 1),
                         bittok2str(rsvp_session_attribute_flag_values,
                                    "none",
                         bittok2str(rsvp_session_attribute_flag_values,
                                    "none",
-                                  EXTRACT_U_1((obj_tptr + 2))),
-                       EXTRACT_U_1(obj_tptr + 2)));
+                                  GET_U_1((obj_tptr + 2))),
+                       GET_U_1(obj_tptr + 2));
                  obj_tlen-=4+namelen;
                  obj_tptr+=4+namelen;
                  break;
                  obj_tlen-=4+namelen;
                  obj_tptr+=4+namelen;
                  break;
@@ -1209,7 +1238,7 @@ rsvp_obj_print(netdissect_options *ndo,
              case RSVP_CTYPE_1:
  
                  if (obj_tlen < 4)
              case RSVP_CTYPE_1:
  
                  if (obj_tlen < 4)
-                    return-1;
+                    goto obj_tooshort;
  
                 /* read variable length subobjects */
                 total_subobj_len = obj_tlen;
  
                 /* read variable length subobjects */
                 total_subobj_len = obj_tlen;
@@ -1223,18 +1252,17 @@ rsvp_obj_print(netdissect_options *ndo,
                       * each iteration subobj_len may happen to be a multiple of 1
                       * and test it and total_subobj_len respectively.
                       */
                       * each iteration subobj_len may happen to be a multiple of 1
                       * and test it and total_subobj_len respectively.
                       */
-                    if (total_subobj_len < 4)
-                        goto invalid;
-                    subobj_len  = EXTRACT_BE_U_2(obj_tptr);
-                    subobj_type = (EXTRACT_BE_U_2(obj_tptr + 2))>>8;
-                    af = (EXTRACT_BE_U_2(obj_tptr + 2))&0x00FF;
+                    ND_LCHECK_U(total_subobj_len, 4);
+                    subobj_len  = GET_BE_U_2(obj_tptr);
+                    subobj_type = (GET_BE_U_2(obj_tptr + 2))>>8;
+                    af = (GET_BE_U_2(obj_tptr + 2))&0x00FF;
  
  
-                    ND_PRINT((ndo, "%s  Subobject Type: %s (%u), AF: %s (%u), length: %u",
+                    ND_PRINT("%s  Subobject Type: %s (%u), AF: %s (%u), length: %u",
                             indent,
                             tok2str(rsvp_obj_generalized_uni_values, "Unknown", subobj_type),
                             subobj_type,
                             tok2str(af_values, "Unknown", af), af,
                             indent,
                             tok2str(rsvp_obj_generalized_uni_values, "Unknown", subobj_type),
                             subobj_type,
                             tok2str(af_values, "Unknown", af), af,
-                           subobj_len));
+                           subobj_len);
  
                      /* In addition to what is explained above, the same spec does not
                       * explicitly say that the same Length field includes the 4-octet
  
                      /* In addition to what is explained above, the same spec does not
                       * explicitly say that the same Length field includes the 4-octet
@@ -1252,7 +1280,7 @@ rsvp_obj_print(netdissect_options *ndo,
                       *
                       * but that doesn't work; the new URL appears to be
                       *
                       *
                       * but that doesn't work; the new URL appears to be
                       *
-                     *    http://www.oiforum.com/public/documents/OIF-UNI-01.0.pdf
+                     *    https://web.archive.org/web/20160401194747/http://www.oiforum.com/public/documents/OIF-UNI-01.0.pdf
                       *
                       * and *that* document, in section 12.5.2.3
                       * "GENERALIZED_UNI Object (Class-Num=11bbbbbb (TBA))",
                       *
                       * and *that* document, in section 12.5.2.3
                       * "GENERALIZED_UNI Object (Class-Num=11bbbbbb (TBA))",
@@ -1273,15 +1301,15 @@ rsvp_obj_print(netdissect_options *ndo,
                          switch(af) {
                          case AFNUM_INET:
                              if (subobj_len < 8)
                          switch(af) {
                          case AFNUM_INET:
                              if (subobj_len < 8)
-                                return -1;
-                            ND_PRINT((ndo, "%s    UNI IPv4 TNA address: %s",
-                                   indent, ipaddr_string(ndo, obj_tptr + 4)));
+                                goto subobj_tooshort;
+                            ND_PRINT("%s    UNI IPv4 TNA address: %s",
+                                   indent, GET_IPADDR_STRING(obj_tptr + 4));
                              break;
                          case AFNUM_INET6:
                              if (subobj_len < 20)
                              break;
                          case AFNUM_INET6:
                              if (subobj_len < 20)
-                                return -1;
-                            ND_PRINT((ndo, "%s    UNI IPv6 TNA address: %s",
-                                   indent, ip6addr_string(ndo, obj_tptr + 4)));
+                                goto subobj_tooshort;
+                            ND_PRINT("%s    UNI IPv6 TNA address: %s",
+                                   indent, GET_IP6ADDR_STRING(obj_tptr + 4));
                              break;
                          case AFNUM_NSAP:
                              if (subobj_len) {
                              break;
                          case AFNUM_NSAP:
                              if (subobj_len) {
@@ -1301,24 +1329,24 @@ rsvp_obj_print(netdissect_options *ndo,
  
                      case RSVP_GEN_UNI_SUBOBJ_EGRESS_LABEL:
                          if (subobj_len < 16) {
  
                      case RSVP_GEN_UNI_SUBOBJ_EGRESS_LABEL:
                          if (subobj_len < 16) {
-                            return -1;
+                            goto subobj_tooshort;
                          }
  
                          }
  
-                        ND_PRINT((ndo, "%s    U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
+                        ND_PRINT("%s    U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
                                 indent,
                                 indent,
-                               ((EXTRACT_BE_U_4(obj_tptr + 4))>>31),
-                               ((EXTRACT_BE_U_4(obj_tptr + 4))&0xFF),
-                               EXTRACT_BE_U_4(obj_tptr + 8),
-                               EXTRACT_BE_U_4(obj_tptr + 12)));
+                               ((GET_BE_U_4(obj_tptr + 4))>>31),
+                               ((GET_BE_U_4(obj_tptr + 4))&0xFF),
+                               GET_BE_U_4(obj_tptr + 8),
+                               GET_BE_U_4(obj_tptr + 12));
                          break;
  
                      case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
                          if (subobj_len < 8) {
                          break;
  
                      case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
                          if (subobj_len < 8) {
-                            return -1;
+                            goto subobj_tooshort;
                          }
  
                          }
  
-                        ND_PRINT((ndo, "%s    Service level: %u",
-                               indent, (EXTRACT_BE_U_4(obj_tptr + 4)) >> 24));
+                        ND_PRINT("%s    Service level: %u",
+                               indent, (GET_BE_U_4(obj_tptr + 4)) >> 24);
                          break;
  
                      default:
                          break;
  
                      default:
@@ -1329,11 +1357,6 @@ rsvp_obj_print(netdissect_options *ndo,
                      obj_tptr+=subobj_len;
                      obj_tlen+=subobj_len;
                 }
                      obj_tptr+=subobj_len;
                      obj_tlen+=subobj_len;
                 }
-
-                if (total_subobj_len) {
-                    /* unless we have a TLV parser lets just hexdump */
-                    hexdump=TRUE;
-                }
                  break;
  
              default:
                  break;
  
              default:
@@ -1346,11 +1369,11 @@ rsvp_obj_print(netdissect_options *ndo,
              case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
              case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
-                    return-1;
-                ND_PRINT((ndo, "%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 4)));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_4(obj_tptr + 4));
                  obj_tlen-=8;
                  obj_tptr+=8;
                  if (obj_tlen)
                  obj_tlen-=8;
                  obj_tptr+=8;
                  if (obj_tlen)
@@ -1359,11 +1382,11 @@ rsvp_obj_print(netdissect_options *ndo,
              case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
              case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
-                    return-1;
-                ND_PRINT((ndo, "%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 16)));
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_4(obj_tptr + 16));
                  obj_tlen-=20;
                  obj_tptr+=20;
                  hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                  obj_tlen-=20;
                  obj_tptr+=20;
                  hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
@@ -1377,10 +1400,10 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
-                    return-1;
-                ND_PRINT((ndo, "%s  Refresh Period: %ums",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Refresh Period: %ums",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_tptr)));
+                       GET_BE_U_4(obj_tptr));
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
@@ -1396,22 +1419,22 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_2:
                  if (obj_tlen < 4)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_2:
                  if (obj_tlen < 4)
-                    return-1;
-                ND_PRINT((ndo, "%s  Msg-Version: %u, length: %u",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Msg-Version: %u, length: %u",
                         indent,
                         indent,
-                       (EXTRACT_U_1(obj_tptr) & 0xf0) >> 4,
-                       EXTRACT_BE_U_2(obj_tptr + 2) << 2));
+                       (GET_U_1(obj_tptr) & 0xf0) >> 4,
+                       GET_BE_U_2(obj_tptr + 2) << 2);
                  obj_tptr+=4; /* get to the start of the service header */
                  obj_tlen-=4;
  
                  while (obj_tlen >= 4) {
                  obj_tptr+=4; /* get to the start of the service header */
                  obj_tlen-=4;
  
                  while (obj_tlen >= 4) {
-                    intserv_serv_tlen=EXTRACT_BE_U_2(obj_tptr + 2)<<2;
-                    ND_PRINT((ndo, "%s  Service Type: %s (%u), break bit %sset, Service length: %u",
+                    intserv_serv_tlen=GET_BE_U_2(obj_tptr + 2)<<2;
+                    ND_PRINT("%s  Service Type: %s (%u), break bit %sset, Service length: %u",
                             indent,
                             indent,
-                           tok2str(rsvp_intserv_service_type_values,"unknown",EXTRACT_U_1((obj_tptr))),
-                           EXTRACT_U_1(obj_tptr),
-                           (EXTRACT_U_1(obj_tptr + 1)&0x80) ? "" : "not ",
-                           intserv_serv_tlen));
+                           tok2str(rsvp_intserv_service_type_values,"unknown",GET_U_1((obj_tptr))),
+                           GET_U_1(obj_tptr),
+                           (GET_U_1(obj_tptr + 1)&0x80) ? "" : "not ",
+                           intserv_serv_tlen);
  
                      obj_tptr+=4; /* get to the start of the parameter list */
                      obj_tlen-=4;
  
                      obj_tptr+=4; /* get to the start of the parameter list */
                      obj_tlen-=4;
@@ -1435,79 +1458,79 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
-                    return-1;
-                ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Source Address: %s, Source Port: %u",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6)));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6));
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
-                    return-1;
-                ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Source Address: %s, Source Port: %u",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18)));
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 18));
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
              case RSVP_CTYPE_3:
                  if (obj_tlen < 20)
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
              case RSVP_CTYPE_3:
                  if (obj_tlen < 20)
-                    return-1;
-                ND_PRINT((ndo, "%s  Source Address: %s, Flow Label: %u",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Source Address: %s, Flow Label: %u",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_3(obj_tptr + 17)));
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_3(obj_tptr + 17));
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
              case RSVP_CTYPE_TUNNEL_IPV6:
                  if (obj_tlen < 20)
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
              case RSVP_CTYPE_TUNNEL_IPV6:
                  if (obj_tlen < 20)
-                    return-1;
-                ND_PRINT((ndo, "%s  Source Address: %s, LSP-ID: 0x%04x",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Source Address: %s, LSP-ID: 0x%04x",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18)));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 18));
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
              case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */
                  if (obj_tlen < 40)
                  obj_tlen-=20;
                  obj_tptr+=20;
                  break;
              case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */
                  if (obj_tlen < 40)
-                    return-1;
-                ND_PRINT((ndo, "%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                         "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                         indent,
                         "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18),
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 18),
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr+20),
-                       EXTRACT_BE_U_2(obj_tptr + 38)));
+                       GET_IP6ADDR_STRING(obj_tptr+20),
+                       GET_BE_U_2(obj_tptr + 38));
                  obj_tlen-=40;
                  obj_tptr+=40;
                  break;
              case RSVP_CTYPE_TUNNEL_IPV4:
                  if (obj_tlen < 8)
                  obj_tlen-=40;
                  obj_tptr+=40;
                  break;
              case RSVP_CTYPE_TUNNEL_IPV4:
                  if (obj_tlen < 8)
-                    return-1;
-                ND_PRINT((ndo, "%s  Source Address: %s, LSP-ID: 0x%04x",
+                    goto obj_tooshort;
+                ND_PRINT("%s  Source Address: %s, LSP-ID: 0x%04x",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6)));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6));
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */
                  if (obj_tlen < 16)
                  obj_tlen-=8;
                  obj_tptr+=8;
                  break;
              case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */
                  if (obj_tlen < 16)
-                    return-1;
-                ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
+                    goto obj_tooshort;
+                ND_PRINT("%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                         "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                         indent,
                         "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 6),
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr+8),
-                       EXTRACT_BE_U_2(obj_tptr + 12)));
+                       GET_IPADDR_STRING(obj_tptr+8),
+                       GET_BE_U_2(obj_tptr + 12));
                  obj_tlen-=16;
                  obj_tptr+=16;
                  break;
                  obj_tlen-=16;
                  obj_tptr+=16;
                  break;
@@ -1523,37 +1546,37 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1: /* new style */
                  if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1: /* new style */
                  if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
-                    return-1;
-                bw.i = EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
-                ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
+                    goto obj_tooshort;
+                bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
+                ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
                         indent,
                         obj_ptr.rsvp_obj_frr->setup_prio,
                         obj_ptr.rsvp_obj_frr->hold_prio,
                         obj_ptr.rsvp_obj_frr->hop_limit,
                         indent,
                         obj_ptr.rsvp_obj_frr->setup_prio,
                         obj_ptr.rsvp_obj_frr->hold_prio,
                         obj_ptr.rsvp_obj_frr->hop_limit,
-                       bw.f * 8 / 1000000));
-                ND_PRINT((ndo, "%s  Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x",
+                       bw.f * 8 / 1000000);
+                ND_PRINT("%s  Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_all)));
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->include_all));
                  obj_tlen-=sizeof(struct rsvp_obj_frr_t);
                  obj_tptr+=sizeof(struct rsvp_obj_frr_t);
                  break;
  
              case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
                  if (obj_tlen < 16)
                  obj_tlen-=sizeof(struct rsvp_obj_frr_t);
                  obj_tptr+=sizeof(struct rsvp_obj_frr_t);
                  break;
  
              case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
                  if (obj_tlen < 16)
-                    return-1;
-                bw.i = EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
-                ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
+                    goto obj_tooshort;
+                bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
+                ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
                         indent,
                         obj_ptr.rsvp_obj_frr->setup_prio,
                         obj_ptr.rsvp_obj_frr->hold_prio,
                         obj_ptr.rsvp_obj_frr->hop_limit,
                         indent,
                         obj_ptr.rsvp_obj_frr->setup_prio,
                         obj_ptr.rsvp_obj_frr->hold_prio,
                         obj_ptr.rsvp_obj_frr->hop_limit,
-                       bw.f * 8 / 1000000));
-                ND_PRINT((ndo, "%s  Include Colors: 0x%08x, Exclude Colors: 0x%08x",
+                       bw.f * 8 / 1000000);
+                ND_PRINT("%s  Include Colors: 0x%08x, Exclude Colors: 0x%08x",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any)));
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any));
                  obj_tlen-=16;
                  obj_tptr+=16;
                  break;
                  obj_tlen-=16;
                  obj_tptr+=16;
                  break;
@@ -1567,10 +1590,10 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_TUNNEL_IPV4:
                  while(obj_tlen >= 8) {
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_TUNNEL_IPV4:
                  while(obj_tlen >= 8) {
-                    ND_PRINT((ndo, "%s  PLR-ID: %s, Avoid-Node-ID: %s",
+                    ND_PRINT("%s  PLR-ID: %s, Avoid-Node-ID: %s",
                             indent,
                             indent,
-                           ipaddr_string(ndo, obj_tptr),
-                           ipaddr_string(ndo, obj_tptr + 4)));
+                           GET_IPADDR_STRING(obj_tptr),
+                           GET_IPADDR_STRING(obj_tptr + 4));
                      obj_tlen-=8;
                      obj_tptr+=8;
                  }
                      obj_tlen-=8;
                      obj_tptr+=8;
                  }
@@ -1584,9 +1607,11 @@ rsvp_obj_print(netdissect_options *ndo,
          case RSVP_OBJ_CLASSTYPE_OLD: /* fall through */
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
          case RSVP_OBJ_CLASSTYPE_OLD: /* fall through */
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
-                ND_PRINT((ndo, "%s  CT: %u",
+                if (obj_tlen < 4)
+                    goto obj_tooshort;
+                ND_PRINT("%s  CT: %u",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_tptr) & 0x7));
+                       GET_BE_U_4(obj_tptr) & 0x7);
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
@@ -1600,30 +1625,30 @@ rsvp_obj_print(netdissect_options *ndo,
              case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
              case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 8)
-                    return-1;
-                error_code=EXTRACT_U_1(obj_tptr + 5);
-                error_value=EXTRACT_BE_U_2(obj_tptr + 6);
-                ND_PRINT((ndo, "%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
+                    goto obj_tooshort;
+                error_code=GET_U_1(obj_tptr + 5);
+                error_value=GET_BE_U_2(obj_tptr + 6);
+                ND_PRINT("%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
                         indent,
                         indent,
-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_U_1(obj_tptr + 4),
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_U_1(obj_tptr + 4),
                         indent,
                         tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                         indent,
                         tok2str(rsvp_obj_error_code_values,"unknown",error_code),
-                       error_code));
+                       error_code);
                  switch (error_code) {
                  case RSVP_OBJ_ERROR_SPEC_CODE_ROUTING:
                  switch (error_code) {
                  case RSVP_OBJ_ERROR_SPEC_CODE_ROUTING:
-                    ND_PRINT((ndo, ", Error Value: %s (%u)",
+                    ND_PRINT(", Error Value: %s (%u)",
                             tok2str(rsvp_obj_error_code_routing_values,"unknown",error_value),
                             tok2str(rsvp_obj_error_code_routing_values,"unknown",error_value),
-                           error_value));
+                           error_value);
                      break;
                  case RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE: /* fall through */
                  case RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE_OLD:
                      break;
                  case RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE: /* fall through */
                  case RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE_OLD:
-                    ND_PRINT((ndo, ", Error Value: %s (%u)",
+                    ND_PRINT(", Error Value: %s (%u)",
                             tok2str(rsvp_obj_error_code_diffserv_te_values,"unknown",error_value),
                             tok2str(rsvp_obj_error_code_diffserv_te_values,"unknown",error_value),
-                           error_value));
+                           error_value);
                      break;
                  default:
                      break;
                  default:
-                    ND_PRINT((ndo, ", Unknown Error Value (%u)", error_value));
+                    ND_PRINT(", Unknown Error Value (%u)", error_value);
                      break;
                  }
                  obj_tlen-=8;
                      break;
                  }
                  obj_tlen-=8;
@@ -1632,22 +1657,22 @@ rsvp_obj_print(netdissect_options *ndo,
              case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
              case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 20)
-                    return-1;
-                error_code=EXTRACT_U_1(obj_tptr + 17);
-                error_value=EXTRACT_BE_U_2(obj_tptr + 18);
-                ND_PRINT((ndo, "%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
+                    goto obj_tooshort;
+                error_code=GET_U_1(obj_tptr + 17);
+                error_value=GET_BE_U_2(obj_tptr + 18);
+                ND_PRINT("%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
                         indent,
                         indent,
-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_U_1(obj_tptr + 16),
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_U_1(obj_tptr + 16),
                         indent,
                         tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                         indent,
                         tok2str(rsvp_obj_error_code_values,"unknown",error_code),
-                       error_code));
+                       error_code);
  
                  switch (error_code) {
                  case RSVP_OBJ_ERROR_SPEC_CODE_ROUTING:
  
                  switch (error_code) {
                  case RSVP_OBJ_ERROR_SPEC_CODE_ROUTING:
-                    ND_PRINT((ndo, ", Error Value: %s (%u)",
+                    ND_PRINT(", Error Value: %s (%u)",
                             tok2str(rsvp_obj_error_code_routing_values,"unknown",error_value),
                             tok2str(rsvp_obj_error_code_routing_values,"unknown",error_value),
-                          error_value));
+                          error_value);
                      break;
                  default:
                      break;
                      break;
                  default:
                      break;
@@ -1664,29 +1689,31 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
-                    return-1;
-                padbytes = EXTRACT_BE_U_2(obj_tptr + 2);
-                ND_PRINT((ndo, "%s  TLV count: %u, padding bytes: %u",
+                    goto obj_tooshort;
+                padbytes = GET_BE_U_2(obj_tptr + 2);
+                ND_PRINT("%s  TLV count: %u, padding bytes: %u",
                         indent,
                         indent,
-                       EXTRACT_BE_U_2(obj_tptr),
-                       padbytes));
+                       GET_BE_U_2(obj_tptr),
+                       padbytes);
                  obj_tlen-=4;
                  obj_tptr+=4;
                  /* loop through as long there is anything longer than the TLV header (2) */
                  while(obj_tlen >= 2 + padbytes) {
                  obj_tlen-=4;
                  obj_tptr+=4;
                  /* loop through as long there is anything longer than the TLV header (2) */
                  while(obj_tlen >= 2 + padbytes) {
-                    ND_PRINT((ndo, "%s    %s TLV (0x%02x), length: %u", /* length includes header */
+                    ND_PRINT("%s    %s TLV (0x%02x), length: %u", /* length includes header */
                             indent,
                             indent,
-                           tok2str(rsvp_obj_prop_tlv_values,"unknown",EXTRACT_U_1(obj_tptr)),
-                           EXTRACT_U_1(obj_tptr),
-                           EXTRACT_U_1(obj_tptr + 1)));
-                    if (obj_tlen < EXTRACT_U_1(obj_tptr + 1))
-                        return-1;
-                    if (EXTRACT_U_1(obj_tptr + 1) < 2)
+                           tok2str(rsvp_obj_prop_tlv_values,"unknown",GET_U_1(obj_tptr)),
+                           GET_U_1(obj_tptr),
+                           GET_U_1(obj_tptr + 1));
+                    if (obj_tlen < GET_U_1(obj_tptr + 1))
+                        goto obj_tooshort;
+                    if (GET_U_1(obj_tptr + 1) < 2) {
+                        ND_PRINT("%sERROR: property TLV is too short", indent);
                          return -1;
                          return -1;
+                    }
                      print_unknown_data(ndo, obj_tptr + 2, "\n\t\t",
                      print_unknown_data(ndo, obj_tptr + 2, "\n\t\t",
-                                       EXTRACT_U_1(obj_tptr + 1) - 2);
-                    obj_tlen-=EXTRACT_U_1(obj_tptr + 1);
-                    obj_tptr+=EXTRACT_U_1(obj_tptr + 1);
+                                       GET_U_1(obj_tptr + 1) - 2);
+                    obj_tlen-=GET_U_1(obj_tptr + 1);
+                    obj_tptr+=GET_U_1(obj_tptr + 1);
                  }
                  break;
              default:
                  }
                  break;
              default:
@@ -1700,20 +1727,20 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
              case RSVP_CTYPE_2:
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
              case RSVP_CTYPE_2:
-                if (obj_tlen < 8)
-                    return-1;
-                ND_PRINT((ndo, "%s  Flags [0x%02x], epoch: %u",
+                if (obj_tlen < 4)
+                    goto obj_tooshort;
+                ND_PRINT("%s  Flags [0x%02x], epoch: %u",
                         indent,
                         indent,
-                       EXTRACT_U_1(obj_tptr),
-                       EXTRACT_BE_U_3(obj_tptr + 1)));
+                       GET_U_1(obj_tptr),
+                       GET_BE_U_3(obj_tptr + 1));
                  obj_tlen-=4;
                  obj_tptr+=4;
                  /* loop through as long there are no messages left */
                  while(obj_tlen >= 4) {
                  obj_tlen-=4;
                  obj_tptr+=4;
                  /* loop through as long there are no messages left */
                  while(obj_tlen >= 4) {
-                    ND_PRINT((ndo, "%s    Message-ID 0x%08x (%u)",
+                    ND_PRINT("%s    Message-ID 0x%08x (%u)",
                             indent,
                             indent,
-                           EXTRACT_BE_U_4(obj_tptr),
-                           EXTRACT_BE_U_4(obj_tptr)));
+                           GET_BE_U_4(obj_tptr),
+                           GET_BE_U_4(obj_tptr));
                      obj_tlen-=4;
                      obj_tptr+=4;
                  }
                      obj_tlen-=4;
                      obj_tptr+=4;
                  }
@@ -1727,29 +1754,29 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < sizeof(struct rsvp_obj_integrity_t))
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < sizeof(struct rsvp_obj_integrity_t))
-                    return-1;
+                    goto obj_tooshort;
                  obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;
                  obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;
-                ND_PRINT((ndo, "%s  Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
+                ND_PRINT("%s  Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
                         indent,
                         indent,
-                       EXTRACT_BE_U_2(obj_ptr.rsvp_obj_integrity->key_id),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->key_id + 2),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence + 4),
+                       GET_BE_U_2(obj_ptr.rsvp_obj_integrity->key_id),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->key_id + 2),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence + 4),
                         bittok2str(rsvp_obj_integrity_flag_values,
                                    "none",
                         bittok2str(rsvp_obj_integrity_flag_values,
                                    "none",
-                                  obj_ptr.rsvp_obj_integrity->flags)));
-                ND_PRINT((ndo, "%s  MD5-sum 0x%08x%08x%08x%08x ",
+                                  obj_ptr.rsvp_obj_integrity->flags));
+                ND_PRINT("%s  MD5-sum 0x%08x%08x%08x%08x ",
                         indent,
                         indent,
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 4),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 8),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 12)));
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->digest),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 4),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 8),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 12));
  
                  sigcheck = signature_verify(ndo, pptr, plen,
                                              obj_ptr.rsvp_obj_integrity->digest,
                                              rsvp_clear_checksum,
                                              rsvp_com_header);
  
                  sigcheck = signature_verify(ndo, pptr, plen,
                                              obj_ptr.rsvp_obj_integrity->digest,
                                              rsvp_clear_checksum,
                                              rsvp_com_header);
-                ND_PRINT((ndo, " (%s)", tok2str(signature_check_values, "Unknown", sigcheck)));
+                ND_PRINT(" (%s)", tok2str(signature_check_values, "Unknown", sigcheck));
  
                  obj_tlen+=sizeof(struct rsvp_obj_integrity_t);
                  obj_tptr+=sizeof(struct rsvp_obj_integrity_t);
  
                  obj_tlen+=sizeof(struct rsvp_obj_integrity_t);
                  obj_tptr+=sizeof(struct rsvp_obj_integrity_t);
@@ -1763,10 +1790,10 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
-                    return-1;
-                ND_PRINT((ndo, "%s  Flags [%s]", indent,
+                    goto obj_tooshort;
+                ND_PRINT("%s  Flags [%s]", indent,
                         bittok2str(rsvp_obj_admin_status_flag_values, "none",
                         bittok2str(rsvp_obj_admin_status_flag_values, "none",
-                                  EXTRACT_BE_U_4(obj_tptr))));
+                                  GET_BE_U_4(obj_tptr)));
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
@@ -1779,12 +1806,12 @@ rsvp_obj_print(netdissect_options *ndo,
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
              switch(rsvp_obj_ctype) {
              case RSVP_CTYPE_1:
                  if (obj_tlen < 4)
-                    return-1;
-                action = (EXTRACT_BE_U_2(obj_tptr)>>8);
+                    goto obj_tooshort;
+                action = (GET_BE_U_2(obj_tptr)>>8);
  
  
-                ND_PRINT((ndo, "%s  Action: %s (%u), Label type: %u", indent,
+                ND_PRINT("%s  Action: %s (%u), Label type: %u", indent,
                         tok2str(rsvp_obj_label_set_action_values, "Unknown", action),
                         tok2str(rsvp_obj_label_set_action_values, "Unknown", action),
-                       action, ((EXTRACT_BE_U_4(obj_tptr) & 0x7F))));
+                       action, (GET_BE_U_4(obj_tptr) & 0x7F));
  
                  switch (action) {
                  case LABEL_SET_INCLUSIVE_RANGE:
  
                  switch (action) {
                  case LABEL_SET_INCLUSIVE_RANGE:
@@ -1792,10 +1819,10 @@ rsvp_obj_print(netdissect_options *ndo,
  
                     /* only a couple of subchannels are expected */
                     if (obj_tlen < 12)
  
                     /* only a couple of subchannels are expected */
                     if (obj_tlen < 12)
-                       return -1;
-                   ND_PRINT((ndo, "%s  Start range: %u, End range: %u", indent,
-                           EXTRACT_BE_U_4(obj_tptr + 4),
-                           EXTRACT_BE_U_4(obj_tptr + 8)));
+                       goto obj_tooshort;
+                   ND_PRINT("%s  Start range: %u, End range: %u", indent,
+                           GET_BE_U_4(obj_tptr + 4),
+                           GET_BE_U_4(obj_tptr + 8));
                     obj_tlen-=12;
                     obj_tptr+=12;
                      break;
                     obj_tlen-=12;
                     obj_tptr+=12;
                      break;
@@ -1805,8 +1832,8 @@ rsvp_obj_print(netdissect_options *ndo,
                      obj_tptr+=4;
                      subchannel = 1;
                      while(obj_tlen >= 4 ) {
                      obj_tptr+=4;
                      subchannel = 1;
                      while(obj_tlen >= 4 ) {
-                        ND_PRINT((ndo, "%s  Subchannel #%u: %u", indent, subchannel,
-                               EXTRACT_BE_U_4(obj_tptr)));
+                        ND_PRINT("%s  Subchannel #%u: %u", indent, subchannel,
+                               GET_BE_U_4(obj_tptr));
                          obj_tptr+=4;
                          obj_tlen-=4;
                          subchannel++;
                          obj_tptr+=4;
                          obj_tlen-=4;
                          subchannel++;
@@ -1823,18 +1850,18 @@ rsvp_obj_print(netdissect_options *ndo,
              switch (rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 4)
              switch (rsvp_obj_ctype) {
              case RSVP_CTYPE_IPV4:
                  if (obj_tlen < 4)
-                    return-1;
-                ND_PRINT((ndo, "%s  Sub-LSP destination address: %s",
-                       indent, ipaddr_string(ndo, obj_tptr)));
+                    goto obj_tooshort;
+                ND_PRINT("%s  Sub-LSP destination address: %s",
+                       indent, GET_IPADDR_STRING(obj_tptr));
  
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 16)
  
                  obj_tlen-=4;
                  obj_tptr+=4;
                  break;
              case RSVP_CTYPE_IPV6:
                  if (obj_tlen < 16)
-                    return-1;
-                ND_PRINT((ndo, "%s  Sub-LSP destination address: %s",
-                       indent, ip6addr_string(ndo, obj_tptr)));
+                    goto obj_tooshort;
+                ND_PRINT("%s  Sub-LSP destination address: %s",
+                       indent, GET_IP6ADDR_STRING(obj_tptr));
  
                  obj_tlen-=16;
                  obj_tptr+=16;
  
                  obj_tlen-=16;
                  obj_tptr+=16;
@@ -1867,12 +1894,14 @@ rsvp_obj_print(netdissect_options *ndo,
          tlen-=rsvp_obj_len;
      }
      return 0;
          tlen-=rsvp_obj_len;
      }
      return 0;
-invalid:
-    ND_PRINT((ndo, "%s", istr));
+subobj_tooshort:
+    ND_PRINT("%sERROR: sub-object is too short", indent);
+    return -1;
+obj_tooshort:
+    ND_PRINT("%sERROR: object is too short", indent);
      return -1;
      return -1;
-trunc:
-    ND_PRINT((ndo, "\n\t\t"));
-    ND_PRINT((ndo, "%s", tstr));
+invalid:
+    nd_print_invalid(ndo);
      return -1;
  }
  
      return -1;
  }
  
@@ -1885,48 +1914,49 @@ rsvp_print(netdissect_options *ndo,
      const u_char *tptr;
      u_short plen, tlen;
  
      const u_char *tptr;
      u_short plen, tlen;
  
+    ndo->ndo_protocol = "rsvp";
      tptr=pptr;
  
      rsvp_com_header = (const struct rsvp_common_header *)pptr;
      tptr=pptr;
  
      rsvp_com_header = (const struct rsvp_common_header *)pptr;
-    ND_TCHECK(*rsvp_com_header);
-    version_flags = EXTRACT_U_1(rsvp_com_header->version_flags);
+    ND_TCHECK_SIZE(rsvp_com_header);
+    version_flags = GET_U_1(rsvp_com_header->version_flags);
  
      /*
       * Sanity checking of the header.
       */
      if (RSVP_EXTRACT_VERSION(version_flags) != RSVP_VERSION) {
  
      /*
       * Sanity checking of the header.
       */
      if (RSVP_EXTRACT_VERSION(version_flags) != RSVP_VERSION) {
-       ND_PRINT((ndo, "ERROR: RSVP version %u packet not supported",
-               RSVP_EXTRACT_VERSION(version_flags)));
+       ND_PRINT("ERROR: RSVP version %u packet not supported",
+               RSVP_EXTRACT_VERSION(version_flags));
         return;
      }
  
         return;
      }
  
-    msg_type = EXTRACT_U_1(rsvp_com_header->msg_type);
+    msg_type = GET_U_1(rsvp_com_header->msg_type);
  
      /* in non-verbose mode just lets print the basic Message Type*/
      if (ndo->ndo_vflag < 1) {
  
      /* in non-verbose mode just lets print the basic Message Type*/
      if (ndo->ndo_vflag < 1) {
-        ND_PRINT((ndo, "RSVPv%u %s Message, length: %u",
+        ND_PRINT("RSVPv%u %s Message, length: %u",
                 RSVP_EXTRACT_VERSION(version_flags),
                 tok2str(rsvp_msg_type_values, "unknown (%u)",msg_type),
                 RSVP_EXTRACT_VERSION(version_flags),
                 tok2str(rsvp_msg_type_values, "unknown (%u)",msg_type),
-               len));
+               len);
          return;
      }
  
      /* ok they seem to want to know everything - lets fully decode it */
  
          return;
      }
  
      /* ok they seem to want to know everything - lets fully decode it */
  
-    plen = tlen = EXTRACT_BE_U_2(rsvp_com_header->length);
+    plen = tlen = GET_BE_U_2(rsvp_com_header->length);
  
  
-    ND_PRINT((ndo, "\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
+    ND_PRINT("\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
             RSVP_EXTRACT_VERSION(version_flags),
             tok2str(rsvp_msg_type_values, "unknown, type: %u",msg_type),
             msg_type,
             bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(version_flags)),
             tlen,
             RSVP_EXTRACT_VERSION(version_flags),
             tok2str(rsvp_msg_type_values, "unknown, type: %u",msg_type),
             msg_type,
             bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(version_flags)),
             tlen,
-           EXTRACT_U_1(rsvp_com_header->ttl),
-           EXTRACT_BE_U_2(rsvp_com_header->checksum)));
+           GET_U_1(rsvp_com_header->ttl),
+           GET_BE_U_2(rsvp_com_header->checksum));
  
      if (tlen < sizeof(struct rsvp_common_header)) {
  
      if (tlen < sizeof(struct rsvp_common_header)) {
-        ND_PRINT((ndo, "ERROR: common header too short %u < %lu", tlen,
-               (unsigned long)sizeof(struct rsvp_common_header)));
+        ND_PRINT("ERROR: common header too short %u < %zu", tlen,
+               sizeof(struct rsvp_common_header));
          return;
      }
  
          return;
      }
  
@@ -1948,39 +1978,39 @@ rsvp_print(netdissect_options *ndo,
              subtptr=subpptr;
  
              rsvp_com_header = (const struct rsvp_common_header *)subpptr;
              subtptr=subpptr;
  
              rsvp_com_header = (const struct rsvp_common_header *)subpptr;
-            ND_TCHECK(*rsvp_com_header);
-            version_flags = EXTRACT_U_1(rsvp_com_header->version_flags);
+            ND_TCHECK_SIZE(rsvp_com_header);
+            version_flags = GET_U_1(rsvp_com_header->version_flags);
  
              /*
               * Sanity checking of the header.
               */
              if (RSVP_EXTRACT_VERSION(version_flags) != RSVP_VERSION) {
  
              /*
               * Sanity checking of the header.
               */
              if (RSVP_EXTRACT_VERSION(version_flags) != RSVP_VERSION) {
-                ND_PRINT((ndo, "ERROR: RSVP version %u packet not supported",
-                       RSVP_EXTRACT_VERSION(version_flags)));
+                ND_PRINT("ERROR: RSVP version %u packet not supported",
+                       RSVP_EXTRACT_VERSION(version_flags));
                  return;
              }
  
                  return;
              }
  
-            subplen = subtlen = EXTRACT_BE_U_2(rsvp_com_header->length);
+            subplen = subtlen = GET_BE_U_2(rsvp_com_header->length);
  
  
-            msg_type = EXTRACT_U_1(rsvp_com_header->msg_type);
-            ND_PRINT((ndo, "\n\t  RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
+            msg_type = GET_U_1(rsvp_com_header->msg_type);
+            ND_PRINT("\n\t  RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
                     RSVP_EXTRACT_VERSION(version_flags),
                     tok2str(rsvp_msg_type_values, "unknown, type: %u",msg_type),
                     msg_type,
                     bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(version_flags)),
                     subtlen,
                     RSVP_EXTRACT_VERSION(version_flags),
                     tok2str(rsvp_msg_type_values, "unknown, type: %u",msg_type),
                     msg_type,
                     bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(version_flags)),
                     subtlen,
-                   EXTRACT_U_1(rsvp_com_header->ttl),
-                   EXTRACT_BE_U_2(rsvp_com_header->checksum)));
+                   GET_U_1(rsvp_com_header->ttl),
+                   GET_BE_U_2(rsvp_com_header->checksum));
  
              if (subtlen < sizeof(struct rsvp_common_header)) {
  
              if (subtlen < sizeof(struct rsvp_common_header)) {
-                ND_PRINT((ndo, "ERROR: common header too short %u < %lu", subtlen,
-                       (unsigned long)sizeof(struct rsvp_common_header)));
+                ND_PRINT("ERROR: common header too short %u < %zu", subtlen,
+                       sizeof(struct rsvp_common_header));
                  return;
              }
  
              if (tlen < subtlen) {
                  return;
              }
  
              if (tlen < subtlen) {
-                ND_PRINT((ndo, "ERROR: common header too large %u > %u", subtlen,
-                       tlen));
+                ND_PRINT("ERROR: common header too large %u > %u", subtlen,
+                       tlen);
                  return;
              }
  
                  return;
              }
  
@@ -2021,9 +2051,4 @@ rsvp_print(netdissect_options *ndo,
          print_unknown_data(ndo, tptr, "\n\t    ", tlen);
          break;
      }
          print_unknown_data(ndo, tptr, "\n\t    ", tlen);
          break;
      }
-
-    return;
-trunc:
-    ND_PRINT((ndo, "\n\t\t"));
-    ND_PRINT((ndo, "%s", tstr));
  }
  }