Use nd_ types, add EXTRACT_ calls, clean up signed vs. unsigned.

[tcpdump] / print-rsvp.c

diff --git a/print-rsvp.c b/print-rsvp.c
index 5ed731c3dec041d8f4ce305f39881954f9efe9c2..05e7639334c81f848f5fb56e3979cc31ea642564 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -12,30 +12,26 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *

- * Original code by Hannes Gredler (hannes@juniper.net)
+ * Original code by Hannes Gredler (hannes@gredler.at)

  */
 
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.48 2007-09-13 17:29:50 guy Exp $";
-#endif
+/* \summary: Resource ReSerVation Protocol (RSVP) printer */

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

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <netdissect-stdinc.h>

 
 

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

 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "gmpls.h"
 #include "af.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "gmpls.h"
 #include "af.h"

+#include "signature.h"
+
+static const char tstr[] = " [|rsvp]";

 
 /*
  * RFC 2205 common header
 
 /*
  * RFC 2205 common header


@@ -50,18 +46,18 @@ static const char rcsid[] _U_ =
  */
 
 struct rsvp_common_header {
  */
 
 struct rsvp_common_header {

-    u_int8_t version_flags;
-    u_int8_t msg_type;
-    u_int8_t checksum[2];
-    u_int8_t ttl;
-    u_int8_t reserved;
-    u_int8_t length[2];
+    uint8_t version_flags;
+    uint8_t msg_type;
+    uint8_t checksum[2];
+    uint8_t ttl;
+    uint8_t reserved;
+    uint8_t length[2];

 };
 
 };
 

-/* 
+/*

  * RFC2205 object header
  *
  * RFC2205 object header
  *

- * 
+ *

  *               0             1              2             3
  *        +-------------+-------------+-------------+-------------+
  *        |       Length (bytes)      |  Class-Num  |   C-Type    |
  *               0             1              2             3
  *        +-------------+-------------+-------------+-------------+
  *        |       Length (bytes)      |  Class-Num  |   C-Type    |


@@ -73,13 +69,13 @@ struct rsvp_common_header {
  */
 
 struct rsvp_object_header {
  */
 
 struct rsvp_object_header {

-    u_int8_t length[2];
-    u_int8_t class_num;
-    u_int8_t ctype;
+    uint8_t length[2];
+    uint8_t class_num;
+    uint8_t ctype;

 };
 
 #define RSVP_VERSION            1
 };
 
 #define RSVP_VERSION            1

-#define        RSVP_EXTRACT_VERSION(x) (((x)&0xf0)>>4) 
+#define        RSVP_EXTRACT_VERSION(x) (((x)&0xf0)>>4)

 #define        RSVP_EXTRACT_FLAGS(x)   ((x)&0x0f)
 
 #define        RSVP_MSGTYPE_PATH       1
 #define        RSVP_EXTRACT_FLAGS(x)   ((x)&0x0f)
 
 #define        RSVP_MSGTYPE_PATH       1


@@ -89,7 +85,7 @@ struct rsvp_object_header {
 #define        RSVP_MSGTYPE_PATHTEAR   5
 #define        RSVP_MSGTYPE_RESVTEAR   6
 #define        RSVP_MSGTYPE_RESVCONF   7
 #define        RSVP_MSGTYPE_PATHTEAR   5
 #define        RSVP_MSGTYPE_RESVTEAR   6
 #define        RSVP_MSGTYPE_RESVCONF   7

-#define RSVP_MSGTYPE_AGGREGATE  12
+#define RSVP_MSGTYPE_BUNDLE     12

 #define RSVP_MSGTYPE_ACK        13
 #define RSVP_MSGTYPE_HELLO_OLD  14      /* ancient Hellos */
 #define RSVP_MSGTYPE_SREFRESH   15
 #define RSVP_MSGTYPE_ACK        13
 #define RSVP_MSGTYPE_HELLO_OLD  14      /* ancient Hellos */
 #define RSVP_MSGTYPE_SREFRESH   15


@@ -103,7 +99,7 @@ static const struct tok rsvp_msg_type_values[] = {
     { RSVP_MSGTYPE_PATHTEAR,   "PathTear" },
     { RSVP_MSGTYPE_RESVTEAR,   "ResvTear" },
     { RSVP_MSGTYPE_RESVCONF,   "ResvConf" },
     { RSVP_MSGTYPE_PATHTEAR,   "PathTear" },
     { RSVP_MSGTYPE_RESVTEAR,   "ResvTear" },
     { RSVP_MSGTYPE_RESVCONF,   "ResvConf" },

-    { RSVP_MSGTYPE_AGGREGATE,  "Aggregate" },
+    { RSVP_MSGTYPE_BUNDLE,     "Bundle" },

     { RSVP_MSGTYPE_ACK,                "Acknowledgement" },
     { RSVP_MSGTYPE_HELLO_OLD,  "Hello (Old)" },
     { RSVP_MSGTYPE_SREFRESH,   "Refresh" },
     { RSVP_MSGTYPE_ACK,                "Acknowledgement" },
     { RSVP_MSGTYPE_HELLO_OLD,  "Hello (Old)" },
     { RSVP_MSGTYPE_SREFRESH,   "Refresh" },


@@ -120,7 +116,7 @@ static const struct tok rsvp_header_flag_values[] = {
 #define        RSVP_OBJ_RSVP_HOP           3   /* rfc2205, rfc3473 */
 #define        RSVP_OBJ_INTEGRITY          4   /* rfc2747 */
 #define        RSVP_OBJ_TIME_VALUES        5   /* rfc2205 */
 #define        RSVP_OBJ_RSVP_HOP           3   /* rfc2205, rfc3473 */
 #define        RSVP_OBJ_INTEGRITY          4   /* rfc2747 */
 #define        RSVP_OBJ_TIME_VALUES        5   /* rfc2205 */

-#define        RSVP_OBJ_ERROR_SPEC         6 
+#define        RSVP_OBJ_ERROR_SPEC         6

 #define        RSVP_OBJ_SCOPE              7
 #define        RSVP_OBJ_STYLE              8   /* rfc2205 */
 #define        RSVP_OBJ_FLOWSPEC           9   /* rfc2215 */
 #define        RSVP_OBJ_SCOPE              7
 #define        RSVP_OBJ_STYLE              8   /* rfc2205 */
 #define        RSVP_OBJ_FLOWSPEC           9   /* rfc2215 */


@@ -142,7 +138,8 @@ static const struct tok rsvp_header_flag_values[] = {
 #define        RSVP_OBJ_UPSTREAM_LABEL     35  /* rfc3473 */
 #define        RSVP_OBJ_LABEL_SET          36  /* rfc3473 */
 #define        RSVP_OBJ_PROTECTION         37  /* rfc3473 */
 #define        RSVP_OBJ_UPSTREAM_LABEL     35  /* rfc3473 */
 #define        RSVP_OBJ_LABEL_SET          36  /* rfc3473 */
 #define        RSVP_OBJ_PROTECTION         37  /* rfc3473 */

-#define        RSVP_OBJ_DETOUR             63  /* draft-ietf-mpls-rsvp-lsp-fastreroute-07 */
+#define RSVP_OBJ_S2L                50  /* rfc4875 */
+#define        RSVP_OBJ_DETOUR             63  /* rfc4090 */

 #define        RSVP_OBJ_CLASSTYPE          66  /* rfc4124 */
 #define RSVP_OBJ_CLASSTYPE_OLD      125 /* draft-ietf-tewg-diff-te-proto-07 */
 #define        RSVP_OBJ_SUGGESTED_LABEL    129 /* rfc3473 */
 #define        RSVP_OBJ_CLASSTYPE          66  /* rfc4124 */
 #define RSVP_OBJ_CLASSTYPE_OLD      125 /* draft-ietf-tewg-diff-te-proto-07 */
 #define        RSVP_OBJ_SUGGESTED_LABEL    129 /* rfc3473 */


@@ -151,7 +148,7 @@ static const struct tok rsvp_header_flag_values[] = {
 #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 */

-#define        RSVP_OBJ_FASTREROUTE        205 /* draft-ietf-mpls-rsvp-lsp-fastreroute-07 */
+#define        RSVP_OBJ_FASTREROUTE        205 /* rfc4090 */

 #define        RSVP_OBJ_SESSION_ATTRIBUTE  207 /* rfc3209 */
 #define RSVP_OBJ_GENERALIZED_UNI    229 /* OIF RSVP extensions UNI 1.0 Signaling, Rel. 2 */
 #define RSVP_OBJ_CALL_ID            230 /* rfc3474 */
 #define        RSVP_OBJ_SESSION_ATTRIBUTE  207 /* rfc3209 */
 #define RSVP_OBJ_GENERALIZED_UNI    229 /* OIF RSVP extensions UNI 1.0 Signaling, Rel. 2 */
 #define RSVP_OBJ_CALL_ID            230 /* rfc3474 */


@@ -198,6 +195,7 @@ static const struct tok rsvp_obj_values[] = {
     { 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" },

+    { RSVP_OBJ_S2L,                "Sub-LSP to LSP" },

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


@@ -210,6 +208,9 @@ static const struct tok rsvp_obj_values[] = {
 #define RSVP_CTYPE_2           2
 #define RSVP_CTYPE_3           3
 #define RSVP_CTYPE_4           4
 #define RSVP_CTYPE_2           2
 #define RSVP_CTYPE_3           3
 #define RSVP_CTYPE_4           4

+#define RSVP_CTYPE_12         12
+#define RSVP_CTYPE_13         13
+#define RSVP_CTYPE_14         14

 
 /*
  * the ctypes are not globally unique so for
 
 /*
  * the ctypes are not globally unique so for


@@ -235,13 +236,19 @@ static const struct tok rsvp_ctype_values[] = {
     { 256*RSVP_OBJ_FILTERSPEC+RSVP_CTYPE_IPV6,              "IPv6" },
     { 256*RSVP_OBJ_FILTERSPEC+RSVP_CTYPE_3,                 "IPv6 Flow-label" },
     { 256*RSVP_OBJ_FILTERSPEC+RSVP_CTYPE_TUNNEL_IPV4,       "Tunnel IPv4" },
     { 256*RSVP_OBJ_FILTERSPEC+RSVP_CTYPE_IPV6,              "IPv6" },
     { 256*RSVP_OBJ_FILTERSPEC+RSVP_CTYPE_3,                 "IPv6 Flow-label" },
     { 256*RSVP_OBJ_FILTERSPEC+RSVP_CTYPE_TUNNEL_IPV4,       "Tunnel IPv4" },

+    { 256*RSVP_OBJ_FILTERSPEC+RSVP_CTYPE_12,                 "IPv4 P2MP LSP Tunnel" },
+    { 256*RSVP_OBJ_FILTERSPEC+RSVP_CTYPE_13,                 "IPv6 P2MP LSP Tunnel" },

     { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_IPV4,                 "IPv4" },
     { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_IPV6,                 "IPv6" },
     { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_TUNNEL_IPV4,           "Tunnel IPv4" },
     { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_UNI_IPV4,              "UNI IPv4" },
     { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_IPV4,                 "IPv4" },
     { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_IPV6,                 "IPv6" },
     { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_TUNNEL_IPV4,           "Tunnel IPv4" },
     { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_UNI_IPV4,              "UNI IPv4" },

+    { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_13,                    "IPv4 P2MP LSP Tunnel" },
+    { 256*RSVP_OBJ_SESSION+RSVP_CTYPE_14,                    "IPv6 P2MP LSP Tunnel" },

     { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_IPV4,          "IPv4" },
     { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_IPV6,          "IPv6" },
     { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_TUNNEL_IPV4,   "Tunnel IPv4" },
     { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_IPV4,          "IPv4" },
     { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_IPV6,          "IPv6" },
     { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_TUNNEL_IPV4,   "Tunnel IPv4" },

+    { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_12,            "IPv4 P2MP LSP Tunnel" },
+    { 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_13,            "IPv6 P2MP LSP Tunnel" },

     { 256*RSVP_OBJ_MESSAGE_ID+RSVP_CTYPE_1,                  "1" },
     { 256*RSVP_OBJ_MESSAGE_ID_ACK+RSVP_CTYPE_1,              "Message id ack" },
     { 256*RSVP_OBJ_MESSAGE_ID_ACK+RSVP_CTYPE_2,              "Message id nack" },
     { 256*RSVP_OBJ_MESSAGE_ID+RSVP_CTYPE_1,                  "1" },
     { 256*RSVP_OBJ_MESSAGE_ID_ACK+RSVP_CTYPE_1,              "Message id ack" },
     { 256*RSVP_OBJ_MESSAGE_ID_ACK+RSVP_CTYPE_2,              "Message id nack" },


@@ -282,15 +289,17 @@ static const struct tok rsvp_ctype_values[] = {
     { 256*RSVP_OBJ_CLASSTYPE_OLD+RSVP_CTYPE_1,               "1" },
     { 256*RSVP_OBJ_LABEL_SET+RSVP_CTYPE_1,                   "1" },
     { 256*RSVP_OBJ_GENERALIZED_UNI+RSVP_CTYPE_1,             "1" },
     { 256*RSVP_OBJ_CLASSTYPE_OLD+RSVP_CTYPE_1,               "1" },
     { 256*RSVP_OBJ_LABEL_SET+RSVP_CTYPE_1,                   "1" },
     { 256*RSVP_OBJ_GENERALIZED_UNI+RSVP_CTYPE_1,             "1" },

+    { 256*RSVP_OBJ_S2L+RSVP_CTYPE_IPV4,                      "IPv4 sub-LSP" },
+    { 256*RSVP_OBJ_S2L+RSVP_CTYPE_IPV6,                      "IPv6 sub-LSP" },

     { 0, NULL}
 };
 
 struct rsvp_obj_integrity_t {
     { 0, NULL}
 };
 
 struct rsvp_obj_integrity_t {

-    u_int8_t flags;
-    u_int8_t res;
-    u_int8_t key_id[6];
-    u_int8_t sequence[8];
-    u_int8_t digest[16];
+    uint8_t flags;
+    uint8_t res;
+    uint8_t key_id[6];
+    uint8_t sequence[8];
+    uint8_t digest[16];

 };
 
 static const struct tok rsvp_obj_integrity_flag_values[] = {
 };
 
 static const struct tok rsvp_obj_integrity_flag_values[] = {


@@ -299,14 +308,14 @@ static const struct tok rsvp_obj_integrity_flag_values[] = {
 };
 
 struct rsvp_obj_frr_t {
 };
 
 struct rsvp_obj_frr_t {

-    u_int8_t setup_prio;
-    u_int8_t hold_prio;
-    u_int8_t hop_limit;
-    u_int8_t flags;
-    u_int8_t bandwidth[4];
-    u_int8_t include_any[4];
-    u_int8_t exclude_any[4];
-    u_int8_t include_all[4];
+    uint8_t setup_prio;
+    uint8_t hold_prio;
+    uint8_t hop_limit;
+    uint8_t flags;
+    uint8_t bandwidth[4];
+    uint8_t include_any[4];
+    uint8_t exclude_any[4];
+    uint8_t include_all[4];

 };
 
 
 };
 
 


@@ -316,6 +325,7 @@ struct rsvp_obj_frr_t {
 #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

+#define        RSVP_OBJ_XRO_LABEL     3

 #define        RSVP_OBJ_XRO_ASN       32
 #define        RSVP_OBJ_XRO_MPLS      64
 
 #define        RSVP_OBJ_XRO_ASN       32
 #define        RSVP_OBJ_XRO_MPLS      64
 


@@ -323,12 +333,13 @@ static const struct tok rsvp_obj_xro_values[] = {
     { RSVP_OBJ_XRO_RES,              "Reserved" },
     { RSVP_OBJ_XRO_IPV4,      "IPv4 prefix" },
     { RSVP_OBJ_XRO_IPV6,      "IPv6 prefix" },
     { RSVP_OBJ_XRO_RES,              "Reserved" },
     { RSVP_OBJ_XRO_IPV4,      "IPv4 prefix" },
     { RSVP_OBJ_XRO_IPV6,      "IPv6 prefix" },

+    { RSVP_OBJ_XRO_LABEL,     "Label" },

     { RSVP_OBJ_XRO_ASN,       "Autonomous system number" },
     { RSVP_OBJ_XRO_MPLS,      "MPLS label switched path termination" },
     { 0, NULL}
 };
 
     { RSVP_OBJ_XRO_ASN,       "Autonomous system number" },
     { RSVP_OBJ_XRO_MPLS,      "MPLS label switched path termination" },
     { 0, NULL}
 };
 

-/* draft-ietf-mpls-rsvp-lsp-fastreroute-07.txt */
+/* RFC4090 */

 static const struct tok rsvp_obj_rro_flag_values[] = {
     { 0x01,                  "Local protection available" },
     { 0x02,                   "Local protection in use" },
 static const struct tok rsvp_obj_rro_flag_values[] = {
     { 0x01,                  "Local protection available" },
     { 0x02,                   "Local protection in use" },


@@ -337,6 +348,12 @@ static const struct tok rsvp_obj_rro_flag_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

+/* RFC3209 */
+static const struct tok rsvp_obj_rro_label_flag_values[] = {
+    { 0x01,                   "Global" },
+    { 0, NULL}
+};
+

 static const struct tok rsvp_resstyle_values[] = {
     { 17,                    "Wildcard Filter" },
     { 10,                     "Fixed Filter" },
 static const struct tok rsvp_resstyle_values[] = {
     { 17,                    "Wildcard Filter" },
     { 10,                     "Fixed Filter" },


@@ -368,16 +385,16 @@ static const struct tok rsvp_intserv_parameter_id_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static struct tok rsvp_session_attribute_flag_values[] = {
-    { 0x01,                  "Local Protection desired" },
-    { 0x02,                   "Label Recording desired" },
-    { 0x04,                   "SE Style desired" },
-    { 0x08,                   "Bandwidth protection desired" }, /* draft-ietf-mpls-rsvp-lsp-fastreroute-02.txt */
-    { 0x10,                   "Node protection desired" },      /* draft-ietf-mpls-rsvp-lsp-fastreroute-02.txt */
+static const struct tok rsvp_session_attribute_flag_values[] = {
+    { 0x01,                  "Local Protection" },
+    { 0x02,                   "Label Recording" },
+    { 0x04,                   "SE Style" },
+    { 0x08,                   "Bandwidth protection" }, /* RFC4090 */
+    { 0x10,                   "Node protection" },      /* RFC4090 */

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

-static struct tok rsvp_obj_prop_tlv_values[] = {
+static const struct tok rsvp_obj_prop_tlv_values[] = {

     { 0x01,                   "Cos" },
     { 0x02,                   "Metric 1" },
     { 0x04,                   "Metric 2" },
     { 0x01,                   "Cos" },
     { 0x02,                   "Metric 1" },
     { 0x04,                   "Metric 2" },


@@ -391,7 +408,7 @@ static struct tok rsvp_obj_prop_tlv_values[] = {
 #define RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE 28
 #define RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE_OLD 125
 
 #define RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE 28
 #define RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE_OLD 125
 

-static struct tok rsvp_obj_error_code_values[] = {
+static const struct tok rsvp_obj_error_code_values[] = {

     { RSVP_OBJ_ERROR_SPEC_CODE_ROUTING, "Routing Problem" },
     { RSVP_OBJ_ERROR_SPEC_CODE_NOTIFY,  "Notify Error" },
     { RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE, "Diffserv TE Error" },
     { RSVP_OBJ_ERROR_SPEC_CODE_ROUTING, "Routing Problem" },
     { RSVP_OBJ_ERROR_SPEC_CODE_NOTIFY,  "Notify Error" },
     { RSVP_OBJ_ERROR_SPEC_CODE_DIFFSERV_TE, "Diffserv TE Error" },


@@ -399,7 +416,7 @@ static struct tok rsvp_obj_error_code_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static struct tok rsvp_obj_error_code_routing_values[] = {
+static const struct tok rsvp_obj_error_code_routing_values[] = {

     { 1,                      "Bad EXPLICIT_ROUTE object" },
     { 2,                      "Bad strict node" },
     { 3,                      "Bad loose node" },
     { 1,                      "Bad EXPLICIT_ROUTE object" },
     { 2,                      "Bad strict node" },
     { 3,                      "Bad loose node" },


@@ -413,14 +430,14 @@ static struct tok rsvp_obj_error_code_routing_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static struct tok rsvp_obj_error_code_diffserv_te_values[] = {
+static const struct tok rsvp_obj_error_code_diffserv_te_values[] = {

     { 1,                      "Unexpected CT object" },
     { 2,                      "Unsupported CT" },
     { 3,                      "Invalid CT value" },
     { 4,                      "CT/setup priority do not form a configured TE-Class" },
     { 5,                      "CT/holding priority do not form a configured TE-Class" },
     { 6,                      "CT/setup priority and CT/holding priority do not form a configured TE-Class" },
     { 1,                      "Unexpected CT object" },
     { 2,                      "Unsupported CT" },
     { 3,                      "Invalid CT value" },
     { 4,                      "CT/setup priority do not form a configured TE-Class" },
     { 5,                      "CT/holding priority do not form a configured TE-Class" },
     { 6,                      "CT/setup priority and CT/holding priority do not form a configured TE-Class" },

-    { 7,                      "Inconsistency between signaled PSC and signaled CT" }, 
+    { 7,                      "Inconsistency between signaled PSC and signaled CT" },

     { 8,                      "Inconsistency between signaled PHBs and signaled CT" },
    { 0, NULL}
 };
     { 8,                      "Inconsistency between signaled PHBs and signaled CT" },
    { 0, NULL}
 };


@@ -464,33 +481,34 @@ static const struct tok rsvp_obj_generalized_uni_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static int rsvp_intserv_print(const u_char *, u_short);
-
-/* 
+/*

  * this is a dissector for all the intserv defined
  * specs as defined per rfc2215
  * it is called from various rsvp objects;
  * returns the amount of bytes being processed
  */
  * this is a dissector for all the intserv defined
  * specs as defined per rfc2215
  * it is called from various rsvp objects;
  * returns the amount of bytes being processed
  */

-static int
-rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) {
-
-    int parameter_id,parameter_length;
+static u_int
+rsvp_intserv_print(netdissect_options *ndo,
+                   const u_char *tptr, u_short obj_tlen)
+{
+    u_int parameter_id,parameter_length;

     union {
        float f;
     union {
        float f;

-       u_int32_t i;
+       uint32_t i;

     } bw;
 
     if (obj_tlen < 4)
         return 0;
     } bw;
 
     if (obj_tlen < 4)
         return 0;

-    parameter_id = *(tptr);
-    parameter_length = EXTRACT_16BITS(tptr+2)<<2; /* convert wordcount to bytecount */
+    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 */

 
 

-    printf("\n\t      Parameter ID: %s (%u), length: %u, Flags: [0x%02x]",
+    ND_PRINT((ndo, "\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,

-           *(tptr+1));
+           EXTRACT_U_1(tptr + 1)));

 
     if (obj_tlen < parameter_length+4)
         return 0;
 
     if (obj_tlen < parameter_length+4)
         return 0;


@@ -504,8 +522,10 @@ rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) {
         * |        IS hop cnt (32-bit unsigned integer)                   |
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         */
         * |        IS hop cnt (32-bit unsigned integer)                   |
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         */

-        if (parameter_length == 4)
-            printf("\n\t\tIS hop count: %u", EXTRACT_32BITS(tptr+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)));
+        }

         break;
 
     case 6:
         break;
 
     case 6:


@@ -517,8 +537,9 @@ rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) {
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         */
         if (parameter_length == 4) {
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         */
         if (parameter_length == 4) {

-            bw.i = EXTRACT_32BITS(tptr+4);
-            printf("\n\t\tPath b/w estimate: %.10g Mbps", bw.f/125000);
+           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));

         }
         break;
 
         }
         break;
 


@@ -531,11 +552,12 @@ rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) {
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         */
         if (parameter_length == 4) {
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         */
         if (parameter_length == 4) {

-            printf("\n\t\tMinimum path latency: ");
-            if (EXTRACT_32BITS(tptr+4) == 0xffffffff)
-                printf("don't care");
+           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"));

             else
             else

-                printf("%u", EXTRACT_32BITS(tptr+4));
+                ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(tptr + 4)));

         }
         break;
 
         }
         break;
 


@@ -548,11 +570,13 @@ rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) {
         * |      Composed MTU (32-bit unsigned integer)                   |
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         */
         * |      Composed MTU (32-bit unsigned integer)                   |
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         */

-        if (parameter_length == 4)
-            printf("\n\t\tComposed MTU: %u bytes", EXTRACT_32BITS(tptr+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)));
+        }

         break;
     case 127:
         break;
     case 127:

-       /* 
+       /*

         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         * |   127 (e)     |    0 (f)      |             5 (g)             |
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         * |   127 (e)     |    0 (f)      |             5 (g)             |
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+


@@ -569,19 +593,20 @@ rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) {
         */
 
         if (parameter_length == 20) {
         */
 
         if (parameter_length == 20) {

-            bw.i = EXTRACT_32BITS(tptr+4);
-            printf("\n\t\tToken Bucket Rate: %.10g Mbps", bw.f/125000);
-            bw.i = EXTRACT_32BITS(tptr+8);
-            printf("\n\t\tToken Bucket Size: %.10g bytes", bw.f);
-            bw.i = EXTRACT_32BITS(tptr+12);
-            printf("\n\t\tPeak Data Rate: %.10g Mbps", bw.f/125000);
-            printf("\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_32BITS(tptr+16));
-            printf("\n\t\tMaximum Packet Size: %u bytes", EXTRACT_32BITS(tptr+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)));

         }
         break;
 
     case 130:
         }
         break;
 
     case 130:

-       /* 
+       /*

         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         * |     130 (h)   |    0 (i)      |            2 (j)              |
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         * |     130 (h)   |    0 (i)      |            2 (j)              |
         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+


@@ -592,9 +617,10 @@ rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) {
         */
 
         if (parameter_length == 8) {
         */
 
         if (parameter_length == 8) {

-            bw.i = EXTRACT_32BITS(tptr+4);
-            printf("\n\t\tRate: %.10g Mbps", bw.f/125000);
-            printf("\n\t\tSlack Term: %u", EXTRACT_32BITS(tptr+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)));

         }
         break;
 
         }
         break;
 


@@ -602,20 +628,41 @@ rsvp_intserv_print(const u_char *tptr, u_short obj_tlen) {
     case 134:
     case 135:
     case 136:
     case 134:
     case 135:
     case 136:

-        if (parameter_length == 4)
-            printf("\n\t\tValue: %u", EXTRACT_32BITS(tptr+4));
+        if (parameter_length == 4) {
+           ND_TCHECK_4(tptr + 4);
+            ND_PRINT((ndo, "\n\t\tValue: %u", EXTRACT_BE_U_4(tptr + 4)));
+        }

         break;
 
     default:
         break;
 
     default:

-        if (vflag <= 1)
-            print_unknown_data(tptr+4,"\n\t\t",parameter_length);
+        if (ndo->ndo_vflag <= 1)
+            print_unknown_data(ndo, tptr + 4, "\n\t\t", parameter_length);

     }
     return (parameter_length+4); /* header length 4 bytes */
     }
     return (parameter_length+4); /* header length 4 bytes */

+
+trunc:
+    ND_PRINT((ndo, "%s", tstr));
+    return 0;

 }
 
 }
 

-static int
-rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
+/*
+ * Clear checksum prior to signature verification.
+ */
+static void
+rsvp_clear_checksum(void *header)
+{
+    struct rsvp_common_header *rsvp_com_header = (struct rsvp_common_header *) header;
+
+    rsvp_com_header->checksum[0] = 0;
+    rsvp_com_header->checksum[1] = 0;
+}

 
 

+static int
+rsvp_obj_print(netdissect_options *ndo,
+               const u_char *pptr, u_int plen, const u_char *tptr,
+               const char *indent, u_int tlen,
+               const struct rsvp_common_header *rsvp_com_header)
+{

     const struct rsvp_object_header *rsvp_obj_header;
     const u_char *obj_tptr;
     union {
     const struct rsvp_object_header *rsvp_obj_header;
     const u_char *obj_tptr;
     union {


@@ -623,56 +670,56 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
         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,obj_tlen,intserv_serv_tlen;
-    int hexdump,processed,padbytes,error_code,error_value,i;
+    u_short rsvp_obj_len,rsvp_obj_ctype,obj_tlen;
+    u_int intserv_serv_tlen;
+    int hexdump,processed,padbytes,error_code,error_value,i,sigcheck;

     union {
        float f;
     union {
        float f;

-       u_int32_t i;
+       uint32_t i;

     } bw;
     } bw;

-    u_int8_t namelen;
+    uint8_t namelen;

 
     u_int action, subchannel;
 
     while(tlen>=sizeof(struct rsvp_object_header)) {
         /* did we capture enough for fully decoding the object header ? */
 
     u_int action, subchannel;
 
     while(tlen>=sizeof(struct rsvp_object_header)) {
         /* did we capture enough for fully decoding the object header ? */

-        if (!TTEST2(*tptr, sizeof(struct rsvp_object_header)))
-            goto trunc;
+        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_16BITS(rsvp_obj_header->length);
+        rsvp_obj_len=EXTRACT_BE_U_2(rsvp_obj_header->length);

         rsvp_obj_ctype=rsvp_obj_header->ctype;
 
         if(rsvp_obj_len % 4) {
         rsvp_obj_ctype=rsvp_obj_header->ctype;
 
         if(rsvp_obj_len % 4) {

-            printf("%sERROR: object header size %u not a multiple of 4", ident, rsvp_obj_len);
+            ND_PRINT((ndo, "%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)) {

-            printf("%sERROR: object header too short %u < %lu", ident, rsvp_obj_len,
-                   (unsigned long)sizeof(const 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)));

             return -1;
         }
 
             return -1;
         }
 

-        printf("%s%s Object (%u) Flags: [%s",
-               ident,
+        ND_PRINT((ndo, "%s%s Object (%u) Flags: [%s",
+               indent,

                tok2str(rsvp_obj_values,
                        "Unknown",
                        rsvp_obj_header->class_num),
                rsvp_obj_header->class_num,
                tok2str(rsvp_obj_values,
                        "Unknown",
                        rsvp_obj_header->class_num),
                rsvp_obj_header->class_num,

-               ((rsvp_obj_header->class_num)&0x80) ? "ignore" : "reject");
+               ((rsvp_obj_header->class_num) & 0x80) ? "ignore" : "reject"));

 
         if (rsvp_obj_header->class_num > 128)
 
         if (rsvp_obj_header->class_num > 128)

-            printf(" %s",
-                   ((rsvp_obj_header->class_num)&0x40) ? "and forward" : "silently");
+            ND_PRINT((ndo, " %s",
+                   ((rsvp_obj_header->class_num) & 0x40) ? "and forward" : "silently"));

 
 

-        printf(" if unknown], Class-Type: %s (%u), length: %u",
+        ND_PRINT((ndo, " if unknown], Class-Type: %s (%u), length: %u",

                tok2str(rsvp_ctype_values,
                        "Unknown",
                        ((rsvp_obj_header->class_num)<<8)+rsvp_obj_ctype),
                rsvp_obj_ctype,
                tok2str(rsvp_ctype_values,
                        "Unknown",
                        ((rsvp_obj_header->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) {

-            printf("%sERROR: object goes past end of objects TLV", ident);
+            ND_PRINT((ndo, "%sERROR: object goes past end of objects TLV", indent));

             return -1;
         }
 
             return -1;
         }
 


@@ -680,7 +727,7 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
         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 (!TTEST2(*tptr, rsvp_obj_len))
+        if (!ND_TTEST_LEN(tptr, rsvp_obj_len))

             return -1;
         hexdump=FALSE;
 
             return -1;
         hexdump=FALSE;
 


@@ -690,56 +737,77 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return -1;
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return -1;

-                printf("%s  IPv4 DestAddress: %s, Protocol ID: 0x%02x",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       *(obj_tptr+sizeof(struct in_addr)));
-                printf("%s  Flags: [0x%02x], DestPort %u",
-                       ident,
-                       *(obj_tptr+5),
-                       EXTRACT_16BITS(obj_tptr+6));
+                ND_PRINT((ndo, "%s  IPv4 DestAddress: %s, Protocol ID: 0x%02x",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_U_1(obj_tptr + sizeof(struct in_addr))));
+                ND_PRINT((ndo, "%s  Flags: [0x%02x], DestPort %u",
+                       indent,
+                       EXTRACT_U_1((obj_tptr + 5)),
+                       EXTRACT_BE_U_2(obj_tptr + 6)));

                 obj_tlen-=8;
                 obj_tlen-=8;

-                obj_tptr+=8;                
+                obj_tptr+=8;

                 break;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return -1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return -1;

-                printf("%s  IPv6 DestAddress: %s, Protocol ID: 0x%02x",
-                       ident,
-                       ip6addr_string(obj_tptr),
-                       *(obj_tptr+sizeof(struct in6_addr)));
-                printf("%s  Flags: [0x%02x], DestPort %u",
-                       ident,
-                       *(obj_tptr+sizeof(struct in6_addr)+1),
-                       EXTRACT_16BITS(obj_tptr+sizeof(struct in6_addr)+2));
+                ND_PRINT((ndo, "%s  IPv6 DestAddress: %s, Protocol ID: 0x%02x",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_U_1(obj_tptr + sizeof(struct in6_addr))));
+                ND_PRINT((ndo, "%s  Flags: [0x%02x], DestPort %u",
+                       indent,
+                       EXTRACT_U_1((obj_tptr + sizeof(struct in6_addr) + 1)),
+                       EXTRACT_BE_U_2(obj_tptr + sizeof(struct in6_addr) + 2)));

                 obj_tlen-=20;
                 obj_tlen-=20;

-                obj_tptr+=20;                
+                obj_tptr+=20;

                 break;
 
             case RSVP_CTYPE_TUNNEL_IPV6:
                 if (obj_tlen < 36)
                     return -1;
                 break;
 
             case RSVP_CTYPE_TUNNEL_IPV6:
                 if (obj_tlen < 36)
                     return -1;

-                printf("%s  IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
-                       ident,
-                       ip6addr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+18),
-                       ip6addr_string(obj_tptr+20));
+                ND_PRINT((ndo, "%s  IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 18),
+                       ip6addr_string(ndo, obj_tptr + 20)));

                 obj_tlen-=36;
                 obj_tlen-=36;

-                obj_tptr+=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",
+                       indent,
+                       EXTRACT_BE_U_4(obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       ip6addr_string(ndo, obj_tptr + 8)));
+                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",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       ipaddr_string(ndo, obj_tptr + 8)));
+                obj_tlen-=12;
+                obj_tptr+=12;

                 break;
                 break;

-#endif

             case RSVP_CTYPE_TUNNEL_IPV4:
             case RSVP_CTYPE_UNI_IPV4:
                 if (obj_tlen < 12)
                     return -1;
             case RSVP_CTYPE_TUNNEL_IPV4:
             case RSVP_CTYPE_UNI_IPV4:
                 if (obj_tlen < 12)
                     return -1;

-                printf("%s  IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6),
-                       ipaddr_string(obj_tptr+8));
+                ND_PRINT((ndo, "%s  IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       ipaddr_string(ndo, obj_tptr + 8)));

                 obj_tlen-=12;
                 obj_tlen-=12;

-                obj_tptr+=12;                
+                obj_tptr+=12;

                 break;
             default:
                 hexdump=TRUE;
                 break;
             default:
                 hexdump=TRUE;


@@ -751,23 +819,21 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < sizeof(struct in_addr))
                     return -1;
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < sizeof(struct in_addr))
                     return -1;

-                printf("%s  IPv4 Receiver Address: %s",
-                       ident,
-                       ipaddr_string(obj_tptr));
+                ND_PRINT((ndo, "%s  IPv4 Receiver Address: %s",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr)));

                 obj_tlen-=sizeof(struct in_addr);
                 obj_tlen-=sizeof(struct in_addr);

-                obj_tptr+=sizeof(struct in_addr);                
+                obj_tptr+=sizeof(struct in_addr);

                 break;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(struct in6_addr))
                     return -1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(struct in6_addr))
                     return -1;

-                printf("%s  IPv6 Receiver Address: %s",
-                       ident,
-                       ip6addr_string(obj_tptr));
+                ND_PRINT((ndo, "%s  IPv6 Receiver Address: %s",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr)));

                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tlen-=sizeof(struct in6_addr);

-                obj_tptr+=sizeof(struct in6_addr);                
+                obj_tptr+=sizeof(struct in6_addr);

                 break;
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -778,23 +844,21 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < sizeof(struct in_addr))
                     return -1;
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < sizeof(struct in_addr))
                     return -1;

-                printf("%s  IPv4 Notify Node Address: %s",
-                       ident,
-                       ipaddr_string(obj_tptr));
+                ND_PRINT((ndo, "%s  IPv4 Notify Node Address: %s",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr)));

                 obj_tlen-=sizeof(struct in_addr);
                 obj_tlen-=sizeof(struct in_addr);

-                obj_tptr+=sizeof(struct in_addr);                
+                obj_tptr+=sizeof(struct in_addr);

                 break;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(struct in6_addr))
                     return-1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(struct in6_addr))
                     return-1;

-                printf("%s  IPv6 Notify Node Address: %s",
-                       ident,
-                       ip6addr_string(obj_tptr));
+                ND_PRINT((ndo, "%s  IPv6 Notify Node Address: %s",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr)));

                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tlen-=sizeof(struct in6_addr);

-                obj_tptr+=sizeof(struct in6_addr);                
+                obj_tptr+=sizeof(struct in6_addr);

                 break;
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -807,7 +871,7 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 while(obj_tlen >= 4 ) {
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 while(obj_tlen >= 4 ) {

-                    printf("%s  Label: %u", ident, EXTRACT_32BITS(obj_tptr));
+                    ND_PRINT((ndo, "%s  Label: %u", indent, EXTRACT_BE_U_4(obj_tptr)));

                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }


@@ -815,21 +879,21 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_2:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_2:
                 if (obj_tlen < 4)
                     return-1;

-                printf("%s  Generalized Label: %u",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr));
+                ND_PRINT((ndo, "%s  Generalized Label: %u",
+                       indent,
+                       EXTRACT_BE_U_4(obj_tptr)));

                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 12)
                     return-1;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 12)
                     return-1;

-                printf("%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr),
-                       ident,
-                       EXTRACT_32BITS(obj_tptr+4),
-                       EXTRACT_32BITS(obj_tptr+8));
+                ND_PRINT((ndo, "%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
+                       indent,
+                       EXTRACT_BE_U_4(obj_tptr),
+                       indent,
+                       EXTRACT_BE_U_4(obj_tptr + 4),
+                       EXTRACT_BE_U_4(obj_tptr + 8)));

                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;


@@ -843,12 +907,12 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;

-                printf("%s  Reservation Style: %s, Flags: [0x%02x]",
-                       ident,
+                ND_PRINT((ndo, "%s  Reservation Style: %s, Flags: [0x%02x]",
+                       indent,

                        tok2str(rsvp_resstyle_values,
                                "Unknown",
                        tok2str(rsvp_resstyle_values,
                                "Unknown",

-                               EXTRACT_24BITS(obj_tptr+1)),
-                       *(obj_tptr));
+                               EXTRACT_BE_U_3(obj_tptr + 1)),
+                       EXTRACT_U_1(obj_tptr)));

                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;


@@ -862,35 +926,61 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;

-                printf("%s  Source Address: %s, Source Port: %u",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6));
+                ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6)));

                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;

-                printf("%s  Source Address: %s, Source Port: %u",
-                       ident,
-                       ip6addr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+18));
+                ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 18)));

                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;

-#endif
+            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"
+                       "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 18),
+                       indent,
+                       ip6addr_string(ndo, obj_tptr+20),
+                       EXTRACT_BE_U_2(obj_tptr + 38)));
+                obj_tlen-=40;
+                obj_tptr+=40;
+                break;

             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
                     return-1;

-                printf("%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6));
+                ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6)));

                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 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"
+                       "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       indent,
+                       ipaddr_string(ndo, obj_tptr+8),
+                       EXTRACT_BE_U_2(obj_tptr + 12)));
+                obj_tlen-=16;
+                obj_tptr+=16;
+                break;

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -900,11 +990,11 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 while(obj_tlen >= 4 ) {
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 while(obj_tlen >= 4 ) {

-                    printf("%s  L3 Protocol ID: %s",
-                           ident,
+                    ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
+                           indent,

                            tok2str(ethertype_values,
                                    "Unknown Protocol (0x%04x)",
                            tok2str(ethertype_values,
                                    "Unknown Protocol (0x%04x)",

-                                   EXTRACT_16BITS(obj_tptr+2)));
+                                   EXTRACT_BE_U_2(obj_tptr + 2))));

                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }


@@ -912,59 +1002,59 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_2:
                 if (obj_tlen < 12)
                     return-1;
             case RSVP_CTYPE_2:
                 if (obj_tlen < 12)
                     return-1;

-                printf("%s  L3 Protocol ID: %s",
-                       ident,
+                ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
+                       indent,

                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",

-                               EXTRACT_16BITS(obj_tptr+2)));
-                printf(",%s merge capability",((*(obj_tptr+4))&0x80) ? "no" : "" );
-                printf("%s  Minimum VPI/VCI: %u/%u",
-                       ident,
-                       (EXTRACT_16BITS(obj_tptr+4))&0xfff,
-                       (EXTRACT_16BITS(obj_tptr+6))&0xfff);
-                printf("%s  Maximum VPI/VCI: %u/%u",
-                       ident,
-                       (EXTRACT_16BITS(obj_tptr+8))&0xfff,
-                       (EXTRACT_16BITS(obj_tptr+10))&0xfff);
+                               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",
+                       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",
+                       indent,
+                       (EXTRACT_BE_U_2(obj_tptr + 8))&0xfff,
+                       (EXTRACT_BE_U_2(obj_tptr + 10)) & 0xfff));

                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 12)
                     return-1;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 12)
                     return-1;

-                printf("%s  L3 Protocol ID: %s",
-                       ident,
+                ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
+                       indent,

                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",

-                               EXTRACT_16BITS(obj_tptr+2)));
-                printf("%s  Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI",
-                       ident,
-                       (EXTRACT_32BITS(obj_tptr+4))&0x7fffff,
-                       (EXTRACT_32BITS(obj_tptr+8))&0x7fffff,
-                       (((EXTRACT_16BITS(obj_tptr+4)>>7)&3) == 0 ) ? "10" : "",
-                       (((EXTRACT_16BITS(obj_tptr+4)>>7)&3) == 2 ) ? "23" : "");
+                               EXTRACT_BE_U_2(obj_tptr + 2))));
+                ND_PRINT((ndo, "%s  Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI",
+                       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" : ""));

                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
             case RSVP_CTYPE_4:
                 if (obj_tlen < 4)
                     return-1;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
             case RSVP_CTYPE_4:
                 if (obj_tlen < 4)
                     return-1;

-                printf("%s  LSP Encoding Type: %s (%u)",
-                       ident,
+                ND_PRINT((ndo, "%s  LSP Encoding Type: %s (%u)",
+                       indent,

                        tok2str(gmpls_encoding_values,
                                "Unknown",
                        tok2str(gmpls_encoding_values,
                                "Unknown",

-                               *obj_tptr),
-                      *obj_tptr);
-                printf("%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
-                       ident,
+                               EXTRACT_U_1(obj_tptr)),
+                       EXTRACT_U_1(obj_tptr)));
+                ND_PRINT((ndo, "%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
+                       indent,

                        tok2str(gmpls_switch_cap_values,
                                "Unknown",
                        tok2str(gmpls_switch_cap_values,
                                "Unknown",

-                               *(obj_tptr+1)),
-                      *(obj_tptr+1),
+                               EXTRACT_U_1((obj_tptr + 1))),
+                       EXTRACT_U_1(obj_tptr + 1),

                        tok2str(gmpls_payload_values,
                                "Unknown",
                        tok2str(gmpls_payload_values,
                                "Unknown",

-                               EXTRACT_16BITS(obj_tptr+2)),
-                      EXTRACT_16BITS(obj_tptr+2));
+                               EXTRACT_BE_U_2(obj_tptr + 2)),
+                       EXTRACT_BE_U_2(obj_tptr + 2)));

                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;


@@ -978,30 +1068,64 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_IPV4:
                 while(obj_tlen >= 4 ) {
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_IPV4:
                 while(obj_tlen >= 4 ) {

-                    printf("%s  Subobject Type: %s, length %u",
-                           ident,
+                   u_char length;
+
+                   ND_TCHECK_4(obj_tptr);
+                   length = EXTRACT_U_1(obj_tptr + 1);
+                    ND_PRINT((ndo, "%s  Subobject Type: %s, length %u",
+                           indent,

                            tok2str(rsvp_obj_xro_values,
                                    "Unknown %u",
                            tok2str(rsvp_obj_xro_values,
                                    "Unknown %u",

-                                   RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)),
-                           *(obj_tptr+1));                
+                                   RSVP_OBJ_XRO_MASK_SUBOBJ(EXTRACT_U_1(obj_tptr))),
+                           length));

 
 

-                    if (*(obj_tptr+1) == 0) { /* prevent infinite loops */
-                        printf("%s  ERROR: zero length ERO subtype",ident);
+                    if (length == 0) { /* prevent infinite loops */
+                        ND_PRINT((ndo, "%s  ERROR: zero length ERO subtype", indent));

                         break;
                     }
 
                         break;
                     }
 

-                    switch(RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)) {
+                    switch(RSVP_OBJ_XRO_MASK_SUBOBJ(EXTRACT_U_1(obj_tptr))) {
+                   u_char prefix_length;
+

                     case RSVP_OBJ_XRO_IPV4:
                     case RSVP_OBJ_XRO_IPV4:

-                        printf(", %s, %s/%u, Flags: [%s]",
-                               RSVP_OBJ_XRO_MASK_LOOSE(*obj_tptr) ? "Loose" : "Strict",
-                               ipaddr_string(obj_tptr+2),
-                               *(obj_tptr+6),
+                       if (length != 8) {
+                               ND_PRINT((ndo, " ERROR: length != 8"));
+                               goto invalid;
+                       }
+                       ND_TCHECK_8(obj_tptr);
+                       prefix_length = EXTRACT_U_1(obj_tptr + 6);
+                       if (prefix_length != 32) {
+                               ND_PRINT((ndo, " ERROR: Prefix length %u != 32",
+                                         prefix_length));
+                               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)),

                                bittok2str(rsvp_obj_rro_flag_values,
                                    "none",
                                bittok2str(rsvp_obj_rro_flag_values,
                                    "none",

-                                   *(obj_tptr+7))); /* rfc3209 says that this field is rsvd. */
+                                   EXTRACT_U_1((obj_tptr + 7))))); /* rfc3209 says that this field is rsvd. */
+                    break;
+                    case RSVP_OBJ_XRO_LABEL:
+                       if (length != 8) {
+                               ND_PRINT((ndo, " ERROR: length != 8"));
+                               goto invalid;
+                       }
+                       ND_TCHECK_8(obj_tptr);
+                        ND_PRINT((ndo, ", Flags: [%s] (%#x), Class-Type: %s (%u), %u",
+                               bittok2str(rsvp_obj_rro_label_flag_values,
+                                   "none",
+                                   EXTRACT_U_1((obj_tptr + 2))),
+                               EXTRACT_U_1(obj_tptr + 2),
+                               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)));

                     }
                     }

-                    obj_tlen-=*(obj_tptr+1);
-                    obj_tptr+=*(obj_tptr+1);
+                    obj_tlen-=EXTRACT_U_1(obj_tptr + 1);
+                    obj_tptr+=EXTRACT_U_1(obj_tptr + 1);

                 }
                 break;
             default:
                 }
                 break;
             default:


@@ -1015,10 +1139,10 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_2:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_2:
                 if (obj_tlen < 8)
                     return-1;

-                printf("%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr+4));
+                ND_PRINT((ndo, "%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
+                       indent,
+                       EXTRACT_BE_U_4(obj_tptr),
+                       EXTRACT_BE_U_4(obj_tptr + 4)));

                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;


@@ -1032,10 +1156,10 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_1:
                 if (obj_tlen < 8)
                     return-1;

-                printf("%s  Restart  Time: %ums, Recovery Time: %ums",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr+4));
+                ND_PRINT((ndo, "%s  Restart  Time: %ums, Recovery Time: %ums",
+                       indent,
+                       EXTRACT_BE_U_4(obj_tptr),
+                       EXTRACT_BE_U_4(obj_tptr + 4)));

                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;


@@ -1049,22 +1173,22 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 4)
                     return-1;

-                namelen = *(obj_tptr+3);
+                namelen = EXTRACT_U_1(obj_tptr + 3);

                 if (obj_tlen < 4+namelen)
                     return-1;
                 if (obj_tlen < 4+namelen)
                     return-1;

-                printf("%s  Session Name: ", ident);
+                ND_PRINT((ndo, "%s  Session Name: ", indent));

                 for (i = 0; i < namelen; i++)
                 for (i = 0; i < namelen; i++)

-                    safeputchar(*(obj_tptr+4+i));
-                printf("%s  Setup Priority: %u, Holding Priority: %u, Flags: [%s]",
-                       ident,
-                       (int)*obj_tptr,
-                       (int)*(obj_tptr+1),
-                       tok2str(rsvp_session_attribute_flag_values,
+                    safeputchar(ndo, EXTRACT_U_1(obj_tptr + 4 + i));
+                ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)",
+                       indent,
+                       EXTRACT_U_1(obj_tptr),
+                       EXTRACT_U_1(obj_tptr + 1),
+                       bittok2str(rsvp_session_attribute_flag_values,

                                   "none",
                                   "none",

-                                  *(obj_tptr+2)));
-
-                obj_tlen-=4+*(obj_tptr+3);
-                obj_tptr+=4+*(obj_tptr+3);
+                                  EXTRACT_U_1((obj_tptr + 2))),
+                       EXTRACT_U_1(obj_tptr + 2)));
+                obj_tlen-=4+EXTRACT_U_1((obj_tptr + 3));
+                obj_tptr+=4+EXTRACT_U_1((obj_tptr + 3));

                 break;
             default:
                 hexdump=TRUE;
                 break;
             default:
                 hexdump=TRUE;


@@ -1075,7 +1199,7 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             switch(rsvp_obj_ctype) {
                int subobj_type,af,subobj_len,total_subobj_len;
 
             switch(rsvp_obj_ctype) {
                int subobj_type,af,subobj_len,total_subobj_len;
 

-            case RSVP_CTYPE_1: 
+            case RSVP_CTYPE_1:

 
                 if (obj_tlen < 4)
                     return-1;
 
                 if (obj_tlen < 4)
                     return-1;


@@ -1083,16 +1207,36 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                /* read variable length subobjects */
                total_subobj_len = obj_tlen;
                 while(total_subobj_len > 0) {
                /* read variable length subobjects */
                total_subobj_len = obj_tlen;
                 while(total_subobj_len > 0) {

-                    subobj_len  = EXTRACT_16BITS(obj_tptr);
-                    subobj_type = (EXTRACT_16BITS(obj_tptr+2))>>8;
-                    af = (EXTRACT_16BITS(obj_tptr+2))&0x00FF;
-
-                    printf("%s  Subobject Type: %s (%u), AF: %s (%u), length: %u",
-                           ident,
+                    /* If RFC 3476 Section 3.1 defined that a sub-object of the
+                     * GENERALIZED_UNI RSVP object must have the Length field as
+                     * a multiple of 4, instead of the check below it would be
+                     * better to test total_subobj_len only once before the loop.
+                     * So long as it does not define it and this while loop does
+                     * not implement such a requirement, let's accept that within
+                     * 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_PRINT((ndo, "%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,
                            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
+                     * sub-object header, but as long as this while loop implements it
+                     * as it does include, let's keep the check below consistent with
+                     * the rest of the code.
+                     */
+                    if(subobj_len < 4 || subobj_len > total_subobj_len)
+                        goto invalid;

 
                     switch(subobj_type) {
                     case RSVP_GEN_UNI_SUBOBJ_SOURCE_TNA_ADDRESS:
 
                     switch(subobj_type) {
                     case RSVP_GEN_UNI_SUBOBJ_SOURCE_TNA_ADDRESS:


@@ -1102,17 +1246,15 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                         case AFNUM_INET:
                             if (subobj_len < 8)
                                 return -1;
                         case AFNUM_INET:
                             if (subobj_len < 8)
                                 return -1;

-                            printf("%s    UNI IPv4 TNA address: %s",
-                                   ident, ipaddr_string(obj_tptr+4));
+                            ND_PRINT((ndo, "%s    UNI IPv4 TNA address: %s",
+                                   indent, ipaddr_string(ndo, obj_tptr + 4)));

                             break;
                             break;

-#ifdef INET6

                         case AFNUM_INET6:
                             if (subobj_len < 20)
                                 return -1;
                         case AFNUM_INET6:
                             if (subobj_len < 20)
                                 return -1;

-                            printf("%s    UNI IPv6 TNA address: %s",
-                                   ident, ip6addr_string(obj_tptr+4));
+                            ND_PRINT((ndo, "%s    UNI IPv6 TNA address: %s",
+                                   indent, ip6addr_string(ndo, obj_tptr + 4)));

                             break;
                             break;

-#endif

                         case AFNUM_NSAP:
                             if (subobj_len) {
                                 /* unless we have a TLV parser lets just hexdump */
                         case AFNUM_NSAP:
                             if (subobj_len) {
                                 /* unless we have a TLV parser lets just hexdump */


@@ -1134,12 +1276,12 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                             return -1;
                         }
 
                             return -1;
                         }
 

-                        printf("%s    U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
-                               ident,
-                               ((EXTRACT_32BITS(obj_tptr+4))>>31),
-                               ((EXTRACT_32BITS(obj_tptr+4))&0xFF),
-                               EXTRACT_32BITS(obj_tptr+8),
-                               EXTRACT_32BITS(obj_tptr+12));
+                        ND_PRINT((ndo, "%s    U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
+                               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)));

                         break;
 
                     case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
                         break;
 
                     case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:


@@ -1147,8 +1289,8 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                             return -1;
                         }
 
                             return -1;
                         }
 

-                        printf("%s    Service level: %u",
-                               ident, (EXTRACT_32BITS(obj_tptr+4))>>24);
+                        ND_PRINT((ndo, "%s    Service level: %u",
+                               indent, (EXTRACT_BE_U_4(obj_tptr + 4)) >> 24));

                         break;
 
                     default:
                         break;
 
                     default:


@@ -1177,29 +1319,27 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;

-                printf("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr+4));
+                ND_PRINT((ndo, "%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_4(obj_tptr + 4)));

                 obj_tlen-=8;
                 obj_tptr+=8;
                 if (obj_tlen)
                     hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 if (obj_tlen)
                     hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 break;

-#ifdef INET6

             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;
             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;

-                printf("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
-                       ident,
-                       ip6addr_string(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr+16));
+                ND_PRINT((ndo, "%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_4(obj_tptr + 16)));

                 obj_tlen-=20;
                 obj_tptr+=20;
                 hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -1210,9 +1350,9 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;

-                printf("%s  Refresh Period: %ums",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr));
+                ND_PRINT((ndo, "%s  Refresh Period: %ums",
+                       indent,
+                       EXTRACT_BE_U_4(obj_tptr)));

                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;


@@ -1229,27 +1369,27 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_2:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_2:
                 if (obj_tlen < 4)
                     return-1;

-                printf("%s  Msg-Version: %u, length: %u",
-                       ident,
-                       (*obj_tptr & 0xf0) >> 4,
-                       EXTRACT_16BITS(obj_tptr+2)<<2);
+                ND_PRINT((ndo, "%s  Msg-Version: %u, length: %u",
+                       indent,
+                       (EXTRACT_U_1(obj_tptr) & 0xf0) >> 4,
+                       EXTRACT_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_16BITS(obj_tptr+2)<<2;
-                    printf("%s  Service Type: %s (%u), break bit %s set, Service length: %u",
-                           ident,
-                           tok2str(rsvp_intserv_service_type_values,"unknown",*(obj_tptr)),
-                           *(obj_tptr),
-                           (*(obj_tptr+1)&0x80) ? "" : "not",
-                           intserv_serv_tlen);
-                    
+                    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",
+                           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));
+

                     obj_tptr+=4; /* get to the start of the parameter list */
                     obj_tlen-=4;
 
                     while (intserv_serv_tlen>=4) {
                     obj_tptr+=4; /* get to the start of the parameter list */
                     obj_tlen-=4;
 
                     while (intserv_serv_tlen>=4) {

-                        processed = rsvp_intserv_print(obj_tptr, obj_tlen);
+                        processed = rsvp_intserv_print(ndo, obj_tptr, obj_tlen);

                         if (processed == 0)
                             break;
                         obj_tlen-=processed;
                         if (processed == 0)
                             break;
                         obj_tlen-=processed;


@@ -1268,55 +1408,81 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;

-                printf("%s  Source Address: %s, Source Port: %u",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6));
+                ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6)));

                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;

-                printf("%s  Source Address: %s, Source Port: %u",
-                       ident,
-                       ip6addr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+18));
+                ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 18)));

                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 20)
                     return-1;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 20)
                     return-1;

-                printf("%s  Source Address: %s, Flow Label: %u",
-                       ident,
-                       ip6addr_string(obj_tptr),
-                       EXTRACT_24BITS(obj_tptr+17));
+                ND_PRINT((ndo, "%s  Source Address: %s, Flow Label: %u",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_3(obj_tptr + 17)));

                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
             case RSVP_CTYPE_TUNNEL_IPV6:
                 if (obj_tlen < 20)
                     return-1;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
             case RSVP_CTYPE_TUNNEL_IPV6:
                 if (obj_tlen < 20)
                     return-1;

-                printf("%s  Source Address: %s, LSP-ID: 0x%04x",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+18));
+                ND_PRINT((ndo, "%s  Source Address: %s, LSP-ID: 0x%04x",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 18)));

                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;

-#endif
+            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"
+                       "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 18),
+                       indent,
+                       ip6addr_string(ndo, obj_tptr+20),
+                       EXTRACT_BE_U_2(obj_tptr + 38)));
+                obj_tlen-=40;
+                obj_tptr+=40;
+                break;

             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
                     return-1;

-                printf("%s  Source Address: %s, LSP-ID: 0x%04x",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6));
+                ND_PRINT((ndo, "%s  Source Address: %s, LSP-ID: 0x%04x",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6)));

                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 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"
+                       "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       indent,
+                       ipaddr_string(ndo, obj_tptr+8),
+                       EXTRACT_BE_U_2(obj_tptr + 12)));
+                obj_tlen-=16;
+                obj_tptr+=16;
+                break;

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -1325,23 +1491,23 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
         case RSVP_OBJ_FASTREROUTE:
             /* the differences between c-type 1 and 7 are minor */
             obj_ptr.rsvp_obj_frr = (const struct rsvp_obj_frr_t *)obj_tptr;
         case RSVP_OBJ_FASTREROUTE:
             /* the differences between c-type 1 and 7 are minor */
             obj_ptr.rsvp_obj_frr = (const struct rsvp_obj_frr_t *)obj_tptr;

-            bw.i = EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->bandwidth);

 
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1: /* new style */
                 if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
                     return-1;
 
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1: /* new style */
                 if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
                     return-1;

-                printf("%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
-                       ident,
-                       (int)obj_ptr.rsvp_obj_frr->setup_prio,
-                       (int)obj_ptr.rsvp_obj_frr->hold_prio,
-                       (int)obj_ptr.rsvp_obj_frr->hop_limit,
-                        bw.f*8/1000000);              
-                printf("%s  Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x",
-                       ident,
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_any),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->exclude_any),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_all));
+                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",
+                       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",
+                       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)));

                 obj_tlen-=sizeof(struct rsvp_obj_frr_t);
                 obj_tptr+=sizeof(struct rsvp_obj_frr_t);
                 break;
                 obj_tlen-=sizeof(struct rsvp_obj_frr_t);
                 obj_tptr+=sizeof(struct rsvp_obj_frr_t);
                 break;


@@ -1349,16 +1515,17 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
                 if (obj_tlen < 16)
                     return-1;
             case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
                 if (obj_tlen < 16)
                     return-1;

-                printf("%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
-                       ident,
-                       (int)obj_ptr.rsvp_obj_frr->setup_prio,
-                       (int)obj_ptr.rsvp_obj_frr->hold_prio,
-                       (int)obj_ptr.rsvp_obj_frr->hop_limit,
-                        bw.f*8/1000000);              
-                printf("%s  Include Colors: 0x%08x, Exclude Colors: 0x%08x",
-                       ident,
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_any),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->exclude_any));
+                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",
+                       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",
+                       indent,
+                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
+                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any)));

                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;


@@ -1372,10 +1539,10 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             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) {

-                    printf("%s  PLR-ID: %s, Avoid-Node-ID: %s",
-                           ident,
-                           ipaddr_string(obj_tptr),
-                           ipaddr_string(obj_tptr+4));              
+                    ND_PRINT((ndo, "%s  PLR-ID: %s, Avoid-Node-ID: %s",
+                           indent,
+                           ipaddr_string(ndo, obj_tptr),
+                           ipaddr_string(ndo, obj_tptr + 4)));

                     obj_tlen-=8;
                     obj_tptr+=8;
                 }
                     obj_tlen-=8;
                     obj_tptr+=8;
                 }


@@ -1389,9 +1556,9 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
         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:

-                printf("%s  CT: %u",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr)&0x7);              
+                ND_PRINT((ndo, "%s  CT: %u",
+                       indent,
+                       EXTRACT_BE_U_4(obj_tptr) & 0x7));

                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;


@@ -1406,54 +1573,53 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;

-                error_code=*(obj_tptr+5);
-                error_value=EXTRACT_16BITS(obj_tptr+6);
-                printf("%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
-                       ident,
-                       ipaddr_string(obj_tptr),
-                       *(obj_tptr+4),
-                       ident,
+                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)",
+                       indent,
+                       ipaddr_string(ndo, obj_tptr),
+                       EXTRACT_U_1(obj_tptr + 4),
+                       indent,

                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        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:

-                    printf(", Error Value: %s (%u)",
+                    ND_PRINT((ndo, ", 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:

-                    printf(", Error Value: %s (%u)",
+                    ND_PRINT((ndo, ", 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:

-                    printf(", Unknown Error Value (%u)", error_value);
+                    ND_PRINT((ndo, ", Unknown Error Value (%u)", error_value));

                     break;
                 }
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                     break;
                 }
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;
             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;

-                error_code=*(obj_tptr+17);
-                error_value=EXTRACT_16BITS(obj_tptr+18);
-                printf("%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
-                       ident,
-                       ip6addr_string(obj_tptr),
-                       *(obj_tptr+16),
-                       ident,
+                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)",
+                       indent,
+                       ip6addr_string(ndo, obj_tptr),
+                       EXTRACT_U_1(obj_tptr + 16),
+                       indent,

                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        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:

-                    printf(", Error Value: %s (%u)",
+                    ND_PRINT((ndo, ", 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;


@@ -1461,7 +1627,6 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -1472,27 +1637,28 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;

-                padbytes = EXTRACT_16BITS(obj_tptr+2);
-                printf("%s  TLV count: %u, padding bytes: %u",
-                       ident,
-                       EXTRACT_16BITS(obj_tptr),
-                       padbytes);
+                padbytes = EXTRACT_BE_U_2(obj_tptr + 2);
+                ND_PRINT((ndo, "%s  TLV count: %u, padding bytes: %u",
+                       indent,
+                       EXTRACT_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) {

-                    printf("%s    %s TLV (0x%02x), length: %u", /* length includes header */
-                           ident,
-                           tok2str(rsvp_obj_prop_tlv_values,"unknown",*obj_tptr),
-                           *obj_tptr,
-                           *(obj_tptr+1));
-                    if (obj_tlen < *(obj_tptr+1))
+                    ND_PRINT((ndo, "%s    %s TLV (0x%02x), length: %u", /* length includes header */
+                           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;
                         return-1;

-                    if (*(obj_tptr+1) < 2)
+                    if (EXTRACT_U_1(obj_tptr + 1) < 2)

                         return -1;
                         return -1;

-                    print_unknown_data(obj_tptr+2,"\n\t\t",*(obj_tptr+1)-2);
-                    obj_tlen-=*(obj_tptr+1);
-                    obj_tptr+=*(obj_tptr+1);
+                    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);

                 }
                 break;
             default:
                 }
                 break;
             default:


@@ -1508,18 +1674,18 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
             case RSVP_CTYPE_2:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_2:
                 if (obj_tlen < 8)
                     return-1;

-                printf("%s  Flags [0x%02x], epoch: %u",
-                       ident,
-                       *obj_tptr,
-                       EXTRACT_24BITS(obj_tptr+1));
+                ND_PRINT((ndo, "%s  Flags [0x%02x], epoch: %u",
+                       indent,
+                       EXTRACT_U_1(obj_tptr),
+                       EXTRACT_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) {

-                    printf("%s    Message-ID 0x%08x (%u)",
-                           ident,
-                           EXTRACT_32BITS(obj_tptr),
-                           EXTRACT_32BITS(obj_tptr));
+                    ND_PRINT((ndo, "%s    Message-ID 0x%08x (%u)",
+                           indent,
+                           EXTRACT_BE_U_4(obj_tptr),
+                           EXTRACT_BE_U_4(obj_tptr)));

                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }


@@ -1535,37 +1701,44 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                 if (obj_tlen < sizeof(struct rsvp_obj_integrity_t))
                     return-1;
                 obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;
                 if (obj_tlen < sizeof(struct rsvp_obj_integrity_t))
                     return-1;
                 obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;

-                printf("%s  Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
-                       ident,
-                       EXTRACT_16BITS(obj_ptr.rsvp_obj_integrity->key_id),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->key_id+2),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->sequence),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->sequence+4),
+                ND_PRINT((ndo, "%s  Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
+                       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),

                        bittok2str(rsvp_obj_integrity_flag_values,
                                   "none",
                        bittok2str(rsvp_obj_integrity_flag_values,
                                   "none",

-                                  obj_ptr.rsvp_obj_integrity->flags));
-                printf("%s  MD5-sum 0x%08x%08x%08x%08x (unverified)",
-                       ident,
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest+4),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest+8),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest+12));
+                                  obj_ptr.rsvp_obj_integrity->flags)));
+                ND_PRINT((ndo, "%s  MD5-sum 0x%08x%08x%08x%08x ",
+                       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)));
+
+                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)));
+

                 obj_tlen+=sizeof(struct rsvp_obj_integrity_t);
                 obj_tptr+=sizeof(struct rsvp_obj_integrity_t);
                 break;
             default:
                 hexdump=TRUE;
             }
                 obj_tlen+=sizeof(struct rsvp_obj_integrity_t);
                 obj_tptr+=sizeof(struct rsvp_obj_integrity_t);
                 break;
             default:
                 hexdump=TRUE;
             }

-            break;           
+            break;

 
         case RSVP_OBJ_ADMIN_STATUS:
             switch(rsvp_obj_ctype) {
 
         case RSVP_OBJ_ADMIN_STATUS:
             switch(rsvp_obj_ctype) {

-            case RSVP_CTYPE_1: 
+            case RSVP_CTYPE_1:

                 if (obj_tlen < 4)
                     return-1;
                 if (obj_tlen < 4)
                     return-1;

-                printf("%s  Flags [%s]", ident,
+                ND_PRINT((ndo, "%s  Flags [%s]", indent,

                        bittok2str(rsvp_obj_admin_status_flag_values, "none",
                        bittok2str(rsvp_obj_admin_status_flag_values, "none",

-                                  EXTRACT_32BITS(obj_tptr)));
+                                  EXTRACT_BE_U_4(obj_tptr))));

                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;


@@ -1576,14 +1749,14 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
 
         case RSVP_OBJ_LABEL_SET:
             switch(rsvp_obj_ctype) {
 
         case RSVP_OBJ_LABEL_SET:
             switch(rsvp_obj_ctype) {

-            case RSVP_CTYPE_1: 
+            case RSVP_CTYPE_1:

                 if (obj_tlen < 4)
                     return-1;
                 if (obj_tlen < 4)
                     return-1;

-                action = (EXTRACT_16BITS(obj_tptr)>>8);
+                action = (EXTRACT_BE_U_2(obj_tptr)>>8);

 
 

-                printf("%s  Action: %s (%u), Label type: %u", ident,
+                ND_PRINT((ndo, "%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_32BITS(obj_tptr) & 0x7F)));
+                       action, ((EXTRACT_BE_U_4(obj_tptr) & 0x7F))));

 
                 switch (action) {
                 case LABEL_SET_INCLUSIVE_RANGE:
 
                 switch (action) {
                 case LABEL_SET_INCLUSIVE_RANGE:


@@ -1592,9 +1765,9 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                    /* only a couple of subchannels are expected */
                    if (obj_tlen < 12)
                        return -1;
                    /* only a couple of subchannels are expected */
                    if (obj_tlen < 12)
                        return -1;

-                   printf("%s  Start range: %u, End range: %u", ident,
-                           EXTRACT_32BITS(obj_tptr+4),
-                           EXTRACT_32BITS(obj_tptr+8));
+                   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)));

                    obj_tlen-=12;
                    obj_tptr+=12;
                     break;
                    obj_tlen-=12;
                    obj_tptr+=12;
                     break;


@@ -1604,8 +1777,8 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                     obj_tptr+=4;
                     subchannel = 1;
                     while(obj_tlen >= 4 ) {
                     obj_tptr+=4;
                     subchannel = 1;
                     while(obj_tlen >= 4 ) {

-                        printf("%s  Subchannel #%u: %u", ident, subchannel,
-                               EXTRACT_32BITS(obj_tptr));
+                        ND_PRINT((ndo, "%s  Subchannel #%u: %u", indent, subchannel,
+                               EXTRACT_BE_U_4(obj_tptr)));

                         obj_tptr+=4;
                         obj_tlen-=4;
                         subchannel++;
                         obj_tptr+=4;
                         obj_tlen-=4;
                         subchannel++;


@@ -1613,10 +1786,35 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
                     break;
                 }
                 break;
                     break;
                 }
                 break;

+            default:
+                hexdump=TRUE;
+            }
+            break;

 
 

+        case RSVP_OBJ_S2L:
+            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)));
+
+                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)));
+
+                obj_tlen-=16;
+                obj_tptr+=16;
+                break;

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }

+            break;

 
         /*
          *  FIXME those are the defined objects that lack a decoder
 
         /*
          *  FIXME those are the defined objects that lack a decoder


@@ -1628,124 +1826,141 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
         case RSVP_OBJ_ACCEPT_LABEL_SET:
         case RSVP_OBJ_PROTECTION:
         default:
         case RSVP_OBJ_ACCEPT_LABEL_SET:
         case RSVP_OBJ_PROTECTION:
         default:

-            if (vflag <= 1)
-                print_unknown_data(obj_tptr,"\n\t    ",obj_tlen); /* FIXME indentation */
+            if (ndo->ndo_vflag <= 1)
+                print_unknown_data(ndo, obj_tptr, "\n\t    ", obj_tlen); /* FIXME indentation */

             break;
         }
         /* do we also want to see a hex dump ? */
             break;
         }
         /* do we also want to see a hex dump ? */

-        if (vflag > 1 || hexdump==TRUE)
-            print_unknown_data(tptr+sizeof(sizeof(struct rsvp_object_header)),"\n\t    ", /* FIXME indentation */
-                               rsvp_obj_len-sizeof(struct rsvp_object_header));
+        if (ndo->ndo_vflag > 1 || hexdump == TRUE)
+            print_unknown_data(ndo, tptr + sizeof(struct rsvp_object_header), "\n\t    ", /* FIXME indentation */
+                               rsvp_obj_len - sizeof(struct rsvp_object_header));

 
         tptr+=rsvp_obj_len;
         tlen-=rsvp_obj_len;
     }
     return 0;
 
         tptr+=rsvp_obj_len;
         tlen-=rsvp_obj_len;
     }
     return 0;

+invalid:
+    ND_PRINT((ndo, "%s", istr));
+    return -1;

 trunc:
 trunc:

-    printf("\n\t\t packet exceeded snapshot");
+    ND_PRINT((ndo, "\n\t\t"));
+    ND_PRINT((ndo, "%s", tstr));

     return -1;
 }
 
     return -1;
 }
 

-

 void
 void

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

     const struct rsvp_common_header *rsvp_com_header;
     const struct rsvp_common_header *rsvp_com_header;

-    const u_char *tptr,*subtptr;
-    u_short tlen,subtlen;
+    const u_char *tptr;
+    u_short plen, tlen;

 
     tptr=pptr;
 
     rsvp_com_header = (const struct rsvp_common_header *)pptr;
 
     tptr=pptr;
 
     rsvp_com_header = (const struct rsvp_common_header *)pptr;

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

 
     /*
      * Sanity checking of the header.
      */
     if (RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags) != RSVP_VERSION) {
 
     /*
      * Sanity checking of the header.
      */
     if (RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags) != RSVP_VERSION) {

-       printf("ERROR: RSVP version %u packet not supported",
-               RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags));
+       ND_PRINT((ndo, "ERROR: RSVP version %u packet not supported",
+               RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags)));

        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/
        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/

-    if (vflag < 1) {
-        printf("RSVPv%u %s Message, length: %u",
+    if (ndo->ndo_vflag < 1) {
+        ND_PRINT((ndo, "RSVPv%u %s Message, length: %u",

                RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
                tok2str(rsvp_msg_type_values, "unknown (%u)",rsvp_com_header->msg_type),
                RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
                tok2str(rsvp_msg_type_values, "unknown (%u)",rsvp_com_header->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 */
 

-    tlen=EXTRACT_16BITS(rsvp_com_header->length);
+    plen = tlen = EXTRACT_BE_U_2(rsvp_com_header->length);

 
 

-    printf("\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
+    ND_PRINT((ndo, "\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",

            RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
            tok2str(rsvp_msg_type_values, "unknown, type: %u",rsvp_com_header->msg_type),
            rsvp_com_header->msg_type,
            bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)),
            tlen,
            rsvp_com_header->ttl,
            RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
            tok2str(rsvp_msg_type_values, "unknown, type: %u",rsvp_com_header->msg_type),
            rsvp_com_header->msg_type,
            bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)),
            tlen,
            rsvp_com_header->ttl,

-           EXTRACT_16BITS(rsvp_com_header->checksum));
+           EXTRACT_BE_U_2(rsvp_com_header->checksum)));

 
 

-    if (tlen < sizeof(const struct rsvp_common_header)) {
-        printf("ERROR: common header too short %u < %lu", tlen,
-               (unsigned long)sizeof(const 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)));

         return;
     }
 
         return;
     }
 

-    tptr+=sizeof(const struct rsvp_common_header);
-    tlen-=sizeof(const struct rsvp_common_header);
+    tptr+=sizeof(struct rsvp_common_header);
+    tlen-=sizeof(struct rsvp_common_header);

 
     switch(rsvp_com_header->msg_type) {
 
 
     switch(rsvp_com_header->msg_type) {
 

-    case RSVP_MSGTYPE_AGGREGATE:
+    case RSVP_MSGTYPE_BUNDLE:
+        /*
+         * Process each submessage in the bundle message.
+         * Bundle messages may not contain bundle submessages, so we don't
+         * need to handle bundle submessages specially.
+         */

         while(tlen > 0) {
         while(tlen > 0) {

-            subtptr=tptr;
-            rsvp_com_header = (const struct rsvp_common_header *)subtptr;
-            TCHECK(*rsvp_com_header);
+            const u_char *subpptr=tptr, *subtptr;
+            u_short subplen, subtlen;
+
+            subtptr=subpptr;
+
+            rsvp_com_header = (const struct rsvp_common_header *)subpptr;
+            ND_TCHECK(*rsvp_com_header);

 
             /*
              * Sanity checking of the header.
              */
             if (RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags) != RSVP_VERSION) {
 
             /*
              * Sanity checking of the header.
              */
             if (RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags) != RSVP_VERSION) {

-                printf("ERROR: RSVP version %u packet not supported",
-                       RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags));
+                ND_PRINT((ndo, "ERROR: RSVP version %u packet not supported",
+                       RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags)));

                 return;
             }
                 return;
             }

-            subtlen=EXTRACT_16BITS(rsvp_com_header->length);
-            
-            printf("\n\t  RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
+
+            subplen = subtlen = EXTRACT_BE_U_2(rsvp_com_header->length);
+
+            ND_PRINT((ndo, "\n\t  RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",

                    RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
                    tok2str(rsvp_msg_type_values, "unknown, type: %u",rsvp_com_header->msg_type),
                    rsvp_com_header->msg_type,
                    bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)),
                    subtlen,
                    rsvp_com_header->ttl,
                    RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
                    tok2str(rsvp_msg_type_values, "unknown, type: %u",rsvp_com_header->msg_type),
                    rsvp_com_header->msg_type,
                    bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)),
                    subtlen,
                    rsvp_com_header->ttl,

-                   EXTRACT_16BITS(rsvp_com_header->checksum));
-            
-            if (subtlen < sizeof(const struct rsvp_common_header)) {
-                printf("ERROR: common header too short %u < %lu", subtlen,
-                       (unsigned long)sizeof(const struct rsvp_common_header));
+                   EXTRACT_BE_U_2(rsvp_com_header->checksum)));
+
+            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)));

                 return;
             }
 
             if (tlen < subtlen) {
                 return;
             }
 
             if (tlen < subtlen) {

-                printf("ERROR: common header too large %u > %u", subtlen,
-                       tlen);
+                ND_PRINT((ndo, "ERROR: common header too large %u > %u", subtlen,
+                       tlen));

                 return;
             }
 
                 return;
             }
 

-            subtptr+=sizeof(const struct rsvp_common_header);
-            subtlen-=sizeof(const struct rsvp_common_header);
+            subtptr+=sizeof(struct rsvp_common_header);
+            subtlen-=sizeof(struct rsvp_common_header);

 
 

-            if (rsvp_obj_print(subtptr,"\n\t    ", subtlen) == -1)
+            /*
+             * Print all objects in the submessage.
+             */
+            if (rsvp_obj_print(ndo, subpptr, subplen, subtptr, "\n\t    ", subtlen, rsvp_com_header) == -1)

                 return;
 
                 return;
 

-            tptr+=subtlen+sizeof(const struct rsvp_common_header);
-            tlen-=subtlen+sizeof(const struct rsvp_common_header);
+            tptr+=subtlen+sizeof(struct rsvp_common_header);
+            tlen-=subtlen+sizeof(struct rsvp_common_header);

         }
 
         break;
         }
 
         break;


@@ -1761,16 +1976,20 @@ rsvp_print(register const u_char *pptr, register u_int len) {
     case RSVP_MSGTYPE_HELLO:
     case RSVP_MSGTYPE_ACK:
     case RSVP_MSGTYPE_SREFRESH:
     case RSVP_MSGTYPE_HELLO:
     case RSVP_MSGTYPE_ACK:
     case RSVP_MSGTYPE_SREFRESH:

-        if (rsvp_obj_print(tptr,"\n\t  ", tlen) == -1)
+        /*
+         * Print all objects in the message.
+         */
+        if (rsvp_obj_print(ndo, pptr, plen, tptr, "\n\t  ", tlen, rsvp_com_header) == -1)

             return;
         break;
 
             return;
         break;
 

-    default: 
-        print_unknown_data(tptr,"\n\t    ",tlen);  
+    default:
+        print_unknown_data(ndo, tptr, "\n\t    ", tlen);

         break;
     }
 
     return;
 trunc:
         break;
     }
 
     return;
 trunc:

-    printf("\n\t\t packet exceeded snapshot");
+    ND_PRINT((ndo, "\n\t\t"));
+    ND_PRINT((ndo, "%s", tstr));

 }
 }