]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-bgp.c
Fix the pointer tests in the non-ndoified TTEST2() macro as well.
[tcpdump] / print-bgp.c
index 7e098438fa7d870ddf93e5aeef9a1a1416efc87f..f5c02a1be985ae3c4d20e5ed5571db92a30a589a 100644 (file)
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * Extensively modified by Hannes Gredler ([email protected]) for more
+ * complete BGP support.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.46 2002-08-06 04:42:04 guy Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
@@ -44,11 +43,13 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
+#include "af.h"
+#include "l2vpn.h"
 
 struct bgp {
-       u_int8_t bgp_marker[16];
-       u_int16_t bgp_len;
-       u_int8_t bgp_type;
+       uint8_t bgp_marker[16];
+       uint16_t bgp_len;
+       uint8_t bgp_type;
 };
 #define BGP_SIZE               19      /* unaligned */
 
@@ -58,7 +59,7 @@ struct bgp {
 #define BGP_KEEPALIVE          4
 #define BGP_ROUTE_REFRESH       5
 
-static struct tok bgp_msg_values[] = {
+static const struct tok bgp_msg_values[] = {
     { BGP_OPEN,                 "Open"},
     { BGP_UPDATE,               "Update"},
     { BGP_NOTIFICATION,         "Notification"},
@@ -68,58 +69,49 @@ static struct tok bgp_msg_values[] = {
 };
 
 struct bgp_open {
-       u_int8_t bgpo_marker[16];
-       u_int16_t bgpo_len;
-       u_int8_t bgpo_type;
-       u_int8_t bgpo_version;
-       u_int16_t bgpo_myas;
-       u_int16_t bgpo_holdtime;
-       u_int32_t bgpo_id;
-       u_int8_t bgpo_optlen;
+       uint8_t bgpo_marker[16];
+       uint16_t bgpo_len;
+       uint8_t bgpo_type;
+       uint8_t bgpo_version;
+       uint16_t bgpo_myas;
+       uint16_t bgpo_holdtime;
+       uint32_t bgpo_id;
+       uint8_t bgpo_optlen;
        /* options should follow */
 };
 #define BGP_OPEN_SIZE          29      /* unaligned */
 
 struct bgp_opt {
-       u_int8_t bgpopt_type;
-       u_int8_t bgpopt_len;
+       uint8_t bgpopt_type;
+       uint8_t bgpopt_len;
        /* variable length */
 };
 #define BGP_OPT_SIZE           2       /* some compilers may pad to 4 bytes */
+#define BGP_CAP_HEADER_SIZE    2       /* some compilers may pad to 4 bytes */
 
 struct bgp_notification {
-       u_int8_t bgpn_marker[16];
-       u_int16_t bgpn_len;
-       u_int8_t bgpn_type;
-       u_int8_t bgpn_major;
-       u_int8_t bgpn_minor;
-       /* data should follow */
+       uint8_t bgpn_marker[16];
+       uint16_t bgpn_len;
+       uint8_t bgpn_type;
+       uint8_t bgpn_major;
+       uint8_t bgpn_minor;
 };
 #define BGP_NOTIFICATION_SIZE          21      /* unaligned */
 
 struct bgp_route_refresh {
-    u_int8_t  bgp_marker[16];
-    u_int16_t len;
-    u_int8_t  type;
-    u_int8_t  afi[2]; /* the compiler messes this structure up               */
-    u_int8_t  res;    /* when doing misaligned sequences of int8 and int16   */
-    u_int8_t  safi;   /* afi should be int16 - so we have to access it using */
-};                    /* EXTRACT_16BITS(&bgp_route_refresh->afi) (sigh)      */ 
+    uint8_t  bgp_marker[16];
+    uint16_t len;
+    uint8_t  type;
+    uint8_t  afi[2]; /* the compiler messes this structure up               */
+    uint8_t  res;    /* when doing misaligned sequences of int8 and int16   */
+    uint8_t  safi;   /* afi should be int16 - so we have to access it using */
+};                    /* EXTRACT_16BITS(&bgp_route_refresh->afi) (sigh)      */
 #define BGP_ROUTE_REFRESH_SIZE          23
 
-struct bgp_attr {
-       u_int8_t bgpa_flags;
-       u_int8_t bgpa_type;
-       union {
-               u_int8_t len;
-               u_int16_t elen;
-       } bgpa_len;
-#define bgp_attr_len(p) \
-       (((p)->bgpa_flags & 0x10) ? \
-               ntohs((p)->bgpa_len.elen) : (p)->bgpa_len.len)
-#define bgp_attr_off(p) \
-       (((p)->bgpa_flags & 0x10) ? 4 : 3)
-};
+#define bgp_attr_lenlen(flags, p) \
+       (((flags) & 0x10) ? 2 : 1)
+#define bgp_attr_len(flags, p) \
+       (((flags) & 0x10) ? EXTRACT_16BITS(p) : *(p))
 
 #define BGPTYPE_ORIGIN                 1
 #define BGPTYPE_AS_PATH                        2
@@ -137,15 +129,23 @@ struct bgp_attr {
 #define BGPTYPE_MP_REACH_NLRI          14      /* RFC2283 */
 #define BGPTYPE_MP_UNREACH_NLRI                15      /* RFC2283 */
 #define BGPTYPE_EXTD_COMMUNITIES        16      /* draft-ietf-idr-bgp-ext-communities */
+#define BGPTYPE_AS4_PATH               17      /* RFC4893 */
+#define BGPTYPE_AGGREGATOR4            18      /* RFC4893 */
+#define BGPTYPE_PMSI_TUNNEL             22      /* draft-ietf-l3vpn-2547bis-mcast-bgp-02.txt */
+#define BGPTYPE_ATTR_SET               128      /* draft-marques-ppvpn-ibgp */
 
-static struct tok bgp_attr_values[] = {
+#define BGP_MP_NLRI_MINSIZE              3       /* End of RIB Marker detection */
+
+static const struct tok bgp_attr_values[] = {
     { BGPTYPE_ORIGIN,           "Origin"},
     { BGPTYPE_AS_PATH,          "AS Path"},
+    { BGPTYPE_AS4_PATH,         "AS4 Path"},
     { BGPTYPE_NEXT_HOP,         "Next Hop"},
     { BGPTYPE_MULTI_EXIT_DISC,  "Multi Exit Discriminator"},
     { BGPTYPE_LOCAL_PREF,       "Local Preference"},
     { BGPTYPE_ATOMIC_AGGREGATE, "Atomic Aggregate"},
     { BGPTYPE_AGGREGATOR,       "Aggregator"},
+    { BGPTYPE_AGGREGATOR4,      "Aggregator4"},
     { BGPTYPE_COMMUNITIES,      "Community"},
     { BGPTYPE_ORIGINATOR_ID,    "Originator ID"},
     { BGPTYPE_CLUSTER_LIST,     "Cluster List"},
@@ -155,15 +155,41 @@ static struct tok bgp_attr_values[] = {
     { BGPTYPE_MP_REACH_NLRI,    "Multi-Protocol Reach NLRI"},
     { BGPTYPE_MP_UNREACH_NLRI,  "Multi-Protocol Unreach NLRI"},
     { BGPTYPE_EXTD_COMMUNITIES, "Extended Community"},
+    { BGPTYPE_PMSI_TUNNEL,      "PMSI Tunnel"},
+    { BGPTYPE_ATTR_SET,         "Attribute Set"},
     { 255,                      "Reserved for development"},
     { 0, NULL}
 };
 
+#define BGP_AS_SET             1
+#define BGP_AS_SEQUENCE        2
+#define BGP_CONFED_AS_SEQUENCE 3 /* draft-ietf-idr-rfc3065bis-01 */
+#define BGP_CONFED_AS_SET      4 /* draft-ietf-idr-rfc3065bis-01  */
+
+#define BGP_AS_SEG_TYPE_MIN    BGP_AS_SET
+#define BGP_AS_SEG_TYPE_MAX    BGP_CONFED_AS_SET
+
+static const struct tok bgp_as_path_segment_open_values[] = {
+    { BGP_AS_SEQUENCE,         ""},
+    { BGP_AS_SET,              "{ "},
+    { BGP_CONFED_AS_SEQUENCE,  "( "},
+    { BGP_CONFED_AS_SET,       "({ "},
+    { 0, NULL}
+};
+
+static const struct tok bgp_as_path_segment_close_values[] = {
+    { BGP_AS_SEQUENCE,         ""},
+    { BGP_AS_SET,              "}"},
+    { BGP_CONFED_AS_SEQUENCE,  ")"},
+    { BGP_CONFED_AS_SET,       "})"},
+    { 0, NULL}
+};
+
 #define BGP_OPT_AUTH                    1
 #define BGP_OPT_CAP                     2
 
 
-static struct tok bgp_opt_values[] = {
+static const struct tok bgp_opt_values[] = {
     { BGP_OPT_AUTH,             "Authentication Information"},
     { BGP_OPT_CAP,              "Capabilities Advertisement"},
     { 0, NULL}
@@ -171,11 +197,19 @@ static struct tok bgp_opt_values[] = {
 
 #define BGP_CAPCODE_MP                  1
 #define BGP_CAPCODE_RR                  2
+#define BGP_CAPCODE_ORF                 3 /* XXX */
+#define BGP_CAPCODE_RESTART            64 /* draft-ietf-idr-restart-05  */
+#define BGP_CAPCODE_AS_NEW             65 /* XXX */
+#define BGP_CAPCODE_DYN_CAP            67 /* XXX */
 #define BGP_CAPCODE_RR_CISCO          128
 
-static struct tok bgp_capcode_values[] = {
+static const struct tok bgp_capcode_values[] = {
     { BGP_CAPCODE_MP,           "Multiprotocol Extensions"},
     { BGP_CAPCODE_RR,           "Route Refresh"},
+    { BGP_CAPCODE_ORF,          "Cooperative Route Filtering"},
+    { BGP_CAPCODE_RESTART,      "Graceful Restart"},
+    { BGP_CAPCODE_AS_NEW,       "32-Bit AS Number"},
+    { BGP_CAPCODE_DYN_CAP,      "Dynamic Capability"},
     { BGP_CAPCODE_RR_CISCO,     "Route Refresh (Cisco)"},
     { 0, NULL}
 };
@@ -186,35 +220,51 @@ static struct tok bgp_capcode_values[] = {
 #define BGP_NOTIFY_MAJOR_HOLDTIME       4
 #define BGP_NOTIFY_MAJOR_FSM            5
 #define BGP_NOTIFY_MAJOR_CEASE          6
+#define BGP_NOTIFY_MAJOR_CAP            7
 
-static struct tok bgp_notify_major_values[] = {
+static const struct tok bgp_notify_major_values[] = {
     { BGP_NOTIFY_MAJOR_MSG,     "Message Header Error"},
     { BGP_NOTIFY_MAJOR_OPEN,    "OPEN Message Error"},
     { BGP_NOTIFY_MAJOR_UPDATE,  "UPDATE Message Error"},
     { BGP_NOTIFY_MAJOR_HOLDTIME,"Hold Timer Expired"},
     { BGP_NOTIFY_MAJOR_FSM,     "Finite State Machine Error"},
     { BGP_NOTIFY_MAJOR_CEASE,   "Cease"},
+    { BGP_NOTIFY_MAJOR_CAP,     "Capability Message Error"},
+    { 0, NULL}
+};
+
+/* draft-ietf-idr-cease-subcode-02 */
+#define BGP_NOTIFY_MINOR_CEASE_MAXPRFX  1
+static const struct tok bgp_notify_minor_cease_values[] = {
+    { BGP_NOTIFY_MINOR_CEASE_MAXPRFX, "Maximum Number of Prefixes Reached"},
+    { 2,                        "Administratively Shutdown"},
+    { 3,                        "Peer Unconfigured"},
+    { 4,                        "Administratively Reset"},
+    { 5,                        "Connection Rejected"},
+    { 6,                        "Other Configuration Change"},
+    { 7,                        "Connection Collision Resolution"},
     { 0, NULL}
 };
 
-static struct tok bgp_notify_minor_msg_values[] = {
+static const struct tok bgp_notify_minor_msg_values[] = {
     { 1,                        "Connection Not Synchronized"},
     { 2,                        "Bad Message Length"},
     { 3,                        "Bad Message Type"},
     { 0, NULL}
 };
 
-static struct tok bgp_notify_minor_open_values[] = {
+static const struct tok bgp_notify_minor_open_values[] = {
     { 1,                        "Unsupported Version Number"},
     { 2,                        "Bad Peer AS"},
     { 3,                        "Bad BGP Identifier"},
     { 4,                        "Unsupported Optional Parameter"},
     { 5,                        "Authentication Failure"},
     { 6,                        "Unacceptable Hold Time"},
+    { 7,                        "Capability Message Error"},
     { 0, NULL}
 };
 
-static struct tok bgp_notify_minor_update_values[] = {
+static const struct tok bgp_notify_minor_update_values[] = {
     { 1,                        "Malformed Attribute List"},
     { 2,                        "Unrecognized Well-known Attribute"},
     { 3,                        "Missing Well-known Attribute"},
@@ -229,13 +279,46 @@ static struct tok bgp_notify_minor_update_values[] = {
     { 0, NULL}
 };
 
-static struct tok bgp_origin_values[] = {
+static const struct tok bgp_notify_minor_cap_values[] = {
+    { 1,                        "Invalid Action Value" },
+    { 2,                        "Invalid Capability Length" },
+    { 3,                        "Malformed Capability Value" },
+    { 4,                        "Unsupported Capability Code" },
+    { 0, NULL }
+};
+
+static const struct tok bgp_origin_values[] = {
     { 0,                        "IGP"},
     { 1,                        "EGP"},
     { 2,                        "Incomplete"},
     { 0, NULL}
 };
 
+#define BGP_PMSI_TUNNEL_RSVP_P2MP 1
+#define BGP_PMSI_TUNNEL_LDP_P2MP  2
+#define BGP_PMSI_TUNNEL_PIM_SSM   3
+#define BGP_PMSI_TUNNEL_PIM_SM    4
+#define BGP_PMSI_TUNNEL_PIM_BIDIR 5
+#define BGP_PMSI_TUNNEL_INGRESS   6
+#define BGP_PMSI_TUNNEL_LDP_MP2MP 7
+
+static const struct tok bgp_pmsi_tunnel_values[] = {
+    { BGP_PMSI_TUNNEL_RSVP_P2MP, "RSVP-TE P2MP LSP"},
+    { BGP_PMSI_TUNNEL_LDP_P2MP, "LDP P2MP LSP"},
+    { BGP_PMSI_TUNNEL_PIM_SSM, "PIM-SSM Tree"},
+    { BGP_PMSI_TUNNEL_PIM_SM, "PIM-SM Tree"},
+    { BGP_PMSI_TUNNEL_PIM_BIDIR, "PIM-Bidir Tree"},
+    { BGP_PMSI_TUNNEL_INGRESS, "Ingress Replication"},
+    { BGP_PMSI_TUNNEL_LDP_MP2MP, "LDP MP2MP LSP"},
+    { 0, NULL}
+};
+
+static const struct tok bgp_pmsi_flag_values[] = {
+    { 0x01, "Leaf Information required"},
+    { 0, NULL}
+};
+
+
 /* Subsequent address family identifier, RFC2283 section 7 */
 #define SAFNUM_RES                      0
 #define SAFNUM_UNICAST                  1
@@ -243,22 +326,35 @@ static struct tok bgp_origin_values[] = {
 #define SAFNUM_UNIMULTICAST             3
 /* labeled BGP RFC3107 */
 #define SAFNUM_LABUNICAST               4
+/* draft-ietf-l3vpn-2547bis-mcast-bgp-02.txt */
+#define SAFNUM_MULTICAST_VPN            5
+#define SAFNUM_TUNNEL                   64 /* XXX */
+#define SAFNUM_VPLS                     65 /* XXX */
+/* draft-nalawade-idr-mdt-safi-03 */
+#define SAFNUM_MDT                      66
 /* Section 4.3.4 of draft-rosen-rfc2547bis-03.txt  */
 #define SAFNUM_VPNUNICAST               128
 #define SAFNUM_VPNMULTICAST             129
 #define SAFNUM_VPNUNIMULTICAST          130
+/* draft-marques-ppvpn-rt-constrain-01.txt */
+#define SAFNUM_RT_ROUTING_INFO          132
 
 #define BGP_VPN_RD_LEN                  8
 
-static struct tok bgp_safi_values[] = {
+static const struct tok bgp_safi_values[] = {
     { SAFNUM_RES,               "Reserved"},
     { SAFNUM_UNICAST,           "Unicast"},
     { SAFNUM_MULTICAST,         "Multicast"},
     { SAFNUM_UNIMULTICAST,      "Unicast+Multicast"},
     { SAFNUM_LABUNICAST,        "labeled Unicast"},
+    { SAFNUM_TUNNEL,            "Tunnel"},
+    { SAFNUM_VPLS,              "VPLS"},
+    { SAFNUM_MDT,               "MDT"},
     { SAFNUM_VPNUNICAST,        "labeled VPN Unicast"},
     { SAFNUM_VPNMULTICAST,      "labeled VPN Multicast"},
     { SAFNUM_VPNUNIMULTICAST,   "labeled VPN Unicast+Multicast"},
+    { SAFNUM_RT_ROUTING_INFO,   "Route Target Routing Information"},
+    { SAFNUM_MULTICAST_VPN,     "Multicast VPN"},
     { 0, NULL }
 };
 
@@ -267,98 +363,166 @@ static struct tok bgp_safi_values[] = {
 #define BGP_COMMUNITY_NO_ADVERT                        0xffffff02
 #define BGP_COMMUNITY_NO_EXPORT_SUBCONFED      0xffffff03
 
-/* RFC1700 address family numbers */
-#define AFNUM_INET     1
-#define AFNUM_INET6    2
-#define AFNUM_NSAP     3
-#define AFNUM_HDLC     4
-#define AFNUM_BBN1822  5
-#define AFNUM_802      6
-#define AFNUM_E163     7
-#define AFNUM_E164     8
-#define AFNUM_F69      9
-#define AFNUM_X121     10
-#define AFNUM_IPX      11
-#define AFNUM_ATALK    12
-#define AFNUM_DECNET   13
-#define AFNUM_BANYAN   14
-#define AFNUM_E164NSAP 15
-/* draft-kompella-ppvpn-l2vpn */
-#define AFNUM_L2VPN     196 /* still to be approved by IANA */
-
-static struct tok bgp_afi_values[] = {
-    { 0,                      "Reserved"},
-    { AFNUM_INET,             "IPv4"},
-    { AFNUM_INET6,            "IPv6"},
-    { AFNUM_NSAP,             "NSAP"},
-    { AFNUM_HDLC,             "HDLC"},
-    { AFNUM_BBN1822,          "BBN 1822"},
-    { AFNUM_802,              "802"},
-    { AFNUM_E163,             "E.163"},
-    { AFNUM_E164,             "E.164"},
-    { AFNUM_F69,              "F.69"},
-    { AFNUM_X121,             "X.121"},
-    { AFNUM_IPX,              "Novell IPX"},
-    { AFNUM_ATALK,            "Appletalk"},
-    { AFNUM_DECNET,           "Decnet IV"},
-    { AFNUM_BANYAN,           "Banyan Vines"},
-    { AFNUM_E164NSAP,         "E.164 with NSAP subaddress"},
-    { AFNUM_L2VPN,            "Layer-2 VPN"},
+/* Extended community type - draft-ietf-idr-bgp-ext-communities-05 */
+#define BGP_EXT_COM_RT_0        0x0002  /* Route Target,Format AS(2bytes):AN(4bytes) */
+#define BGP_EXT_COM_RT_1        0x0102  /* Route Target,Format IP address:AN(2bytes) */
+#define BGP_EXT_COM_RT_2        0x0202  /* Route Target,Format AN(4bytes):local(2bytes) */
+#define BGP_EXT_COM_RO_0        0x0003  /* Route Origin,Format AS(2bytes):AN(4bytes) */
+#define BGP_EXT_COM_RO_1        0x0103  /* Route Origin,Format IP address:AN(2bytes) */
+#define BGP_EXT_COM_RO_2        0x0203  /* Route Origin,Format AN(4bytes):local(2bytes) */
+#define BGP_EXT_COM_LINKBAND    0x4004  /* Link Bandwidth,Format AS(2B):Bandwidth(4B) */
+                                        /* rfc2547 bgp-mpls-vpns */
+#define BGP_EXT_COM_VPN_ORIGIN  0x0005  /* OSPF Domain ID / VPN of Origin  - draft-rosen-vpns-ospf-bgp-mpls */
+#define BGP_EXT_COM_VPN_ORIGIN2 0x0105  /* duplicate - keep for backwards compatability */
+#define BGP_EXT_COM_VPN_ORIGIN3 0x0205  /* duplicate - keep for backwards compatability */
+#define BGP_EXT_COM_VPN_ORIGIN4 0x8005  /* duplicate - keep for backwards compatability */
+
+#define BGP_EXT_COM_OSPF_RTYPE  0x0306  /* OSPF Route Type,Format Area(4B):RouteType(1B):Options(1B) */
+#define BGP_EXT_COM_OSPF_RTYPE2 0x8000  /* duplicate - keep for backwards compatability */
+
+#define BGP_EXT_COM_OSPF_RID    0x0107  /* OSPF Router ID,Format RouterID(4B):Unused(2B) */
+#define BGP_EXT_COM_OSPF_RID2   0x8001  /* duplicate - keep for backwards compatability */
+
+#define BGP_EXT_COM_L2INFO      0x800a  /* draft-kompella-ppvpn-l2vpn */
+
+#define BGP_EXT_COM_SOURCE_AS   0x0009  /* RFC-ietf-l3vpn-2547bis-mcast-bgp-08.txt */
+#define BGP_EXT_COM_VRF_RT_IMP  0x010b  /* RFC-ietf-l3vpn-2547bis-mcast-bgp-08.txt */
+#define BGP_EXT_COM_L2VPN_RT_0  0x000a  /* L2VPN Identifier,Format AS(2bytes):AN(4bytes) */
+#define BGP_EXT_COM_L2VPN_RT_1  0xF10a  /* L2VPN Identifier,Format IP address:AN(2bytes) */
+
+
+/* http://www.cisco.com/en/US/tech/tk436/tk428/technologies_tech_note09186a00801eb09a.shtml  */
+#define BGP_EXT_COM_EIGRP_GEN   0x8800
+#define BGP_EXT_COM_EIGRP_METRIC_AS_DELAY  0x8801
+#define BGP_EXT_COM_EIGRP_METRIC_REL_NH_BW 0x8802
+#define BGP_EXT_COM_EIGRP_METRIC_LOAD_MTU  0x8803
+#define BGP_EXT_COM_EIGRP_EXT_REMAS_REMID  0x8804
+#define BGP_EXT_COM_EIGRP_EXT_REMPROTO_REMMETRIC 0x8805
+
+static const struct tok bgp_extd_comm_flag_values[] = {
+    { 0x8000,                  "vendor-specific"},
+    { 0x4000,                  "non-transitive"},
     { 0, NULL},
 };
 
-static struct tok bgp_extd_comm_subtype_values[] = {
-    { 2,                      "target"},
-    { 3,                      "origin"},
-    { 4,                      "link-BW"},
-    { 10,                     "layer2-info"}, 
+static const struct tok bgp_extd_comm_subtype_values[] = {
+    { BGP_EXT_COM_RT_0,        "target"},
+    { BGP_EXT_COM_RT_1,        "target"},
+    { BGP_EXT_COM_RT_2,        "target"},
+    { BGP_EXT_COM_RO_0,        "origin"},
+    { BGP_EXT_COM_RO_1,        "origin"},
+    { BGP_EXT_COM_RO_2,        "origin"},
+    { BGP_EXT_COM_LINKBAND,    "link-BW"},
+    { BGP_EXT_COM_VPN_ORIGIN,  "ospf-domain"},
+    { BGP_EXT_COM_VPN_ORIGIN2, "ospf-domain"},
+    { BGP_EXT_COM_VPN_ORIGIN3, "ospf-domain"},
+    { BGP_EXT_COM_VPN_ORIGIN4, "ospf-domain"},
+    { BGP_EXT_COM_OSPF_RTYPE,  "ospf-route-type"},
+    { BGP_EXT_COM_OSPF_RTYPE2, "ospf-route-type"},
+    { BGP_EXT_COM_OSPF_RID,    "ospf-router-id"},
+    { BGP_EXT_COM_OSPF_RID2,   "ospf-router-id"},
+    { BGP_EXT_COM_L2INFO,      "layer2-info"},
+    { BGP_EXT_COM_EIGRP_GEN , "eigrp-general-route (flag, tag)" },
+    { BGP_EXT_COM_EIGRP_METRIC_AS_DELAY , "eigrp-route-metric (AS, delay)" },
+    { BGP_EXT_COM_EIGRP_METRIC_REL_NH_BW , "eigrp-route-metric (reliability, nexthop, bandwidth)" },
+    { BGP_EXT_COM_EIGRP_METRIC_LOAD_MTU , "eigrp-route-metric (load, MTU)" },
+    { BGP_EXT_COM_EIGRP_EXT_REMAS_REMID , "eigrp-external-route (remote-AS, remote-ID)" },
+    { BGP_EXT_COM_EIGRP_EXT_REMPROTO_REMMETRIC , "eigrp-external-route (remote-proto, remote-metric)" },
+    { BGP_EXT_COM_SOURCE_AS, "source-AS" },
+    { BGP_EXT_COM_VRF_RT_IMP, "vrf-route-import"},
+    { BGP_EXT_COM_L2VPN_RT_0, "l2vpn-id"},
+    { BGP_EXT_COM_L2VPN_RT_1, "l2vpn-id"},
     { 0, NULL},
 };
 
-static struct tok bgp_l2vpn_encaps_values[] = {
-    { 0,                      "Reserved"},
-    { 1,                      "Frame Relay"},
-    { 2,                      "ATM AAL5 VCC transport"},
-    { 3,                      "ATM transparent cell transport"}, 
-    { 4,                      "Ethernet VLAN"}, 
-    { 5,                      "Ethernet"}, 
-    { 6,                      "Cisco-HDLC"}, 
-    { 7,                      "PPP"}, 
-    { 8,                      "CEM"}, 
-    { 9,                      "ATM VCC cell transport"}, 
-    { 10,                     "ATM VPC cell transport"}, 
-    { 11,                     "MPLS"}, 
-    { 12,                     "VPLS"}, 
-    { 64,                     "IP-interworking"}, 
-    { 0, NULL},
+/* OSPF codes for  BGP_EXT_COM_OSPF_RTYPE draft-rosen-vpns-ospf-bgp-mpls  */
+#define BGP_OSPF_RTYPE_RTR      1 /* OSPF Router LSA */
+#define BGP_OSPF_RTYPE_NET      2 /* OSPF Network LSA */
+#define BGP_OSPF_RTYPE_SUM      3 /* OSPF Summary LSA */
+#define BGP_OSPF_RTYPE_EXT      5 /* OSPF External LSA, note that ASBR doesn't apply to MPLS-VPN */
+#define BGP_OSPF_RTYPE_NSSA     7 /* OSPF NSSA External*/
+#define BGP_OSPF_RTYPE_SHAM     129 /* OSPF-MPLS-VPN Sham link */
+#define BGP_OSPF_RTYPE_METRIC_TYPE 0x1 /* LSB of RTYPE Options Field */
+
+static const struct tok bgp_extd_comm_ospf_rtype_values[] = {
+  { BGP_OSPF_RTYPE_RTR, "Router" },
+  { BGP_OSPF_RTYPE_NET, "Network" },
+  { BGP_OSPF_RTYPE_SUM, "Summary" },
+  { BGP_OSPF_RTYPE_EXT, "External" },
+  { BGP_OSPF_RTYPE_NSSA,"NSSA External" },
+  { BGP_OSPF_RTYPE_SHAM,"MPLS-VPN Sham" },
+  { 0, NULL },
 };
 
-static int
-decode_prefix4(const u_char *pptr, char *buf, u_int buflen)
+#define TOKBUFSIZE 128
+static char astostr[20];
+
+/*
+ * as_printf
+ *
+ * Convert an AS number into a string and return string pointer.
+ *
+ * Depending on bflag is set or not, AS number is converted into ASDOT notation
+ * or plain number notation.
+ *
+ */
+static char *
+as_printf(netdissect_options *ndo,
+          char *str, int size, u_int asnum)
+{
+       if (!ndo->ndo_bflag || asnum <= 0xFFFF) {
+               snprintf(str, size, "%u", asnum);
+       } else {
+               snprintf(str, size, "%u.%u", asnum >> 16, asnum & 0xFFFF);
+       }
+       return str;
+}
+
+#define ITEMCHECK(minlen) if (itemlen < minlen) goto badtlv;
+
+int
+decode_prefix4(netdissect_options *ndo,
+               const u_char *pptr, u_int itemlen, char *buf, u_int buflen)
 {
        struct in_addr addr;
-       u_int plen;
+       u_int plen, plenbytes;
 
+       ND_TCHECK(pptr[0]);
+       ITEMCHECK(1);
        plen = pptr[0];
-       if (plen < 0 || 32 < plen)
+       if (32 < plen)
                return -1;
+       itemlen -= 1;
 
        memset(&addr, 0, sizeof(addr));
-       memcpy(&addr, &pptr[1], (plen + 7) / 8);
+       plenbytes = (plen + 7) / 8;
+       ND_TCHECK2(pptr[1], plenbytes);
+       ITEMCHECK(plenbytes);
+       memcpy(&addr, &pptr[1], plenbytes);
        if (plen % 8) {
-               ((u_char *)&addr)[(plen + 7) / 8 - 1] &=
+               ((u_char *)&addr)[plenbytes - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
        }
-       snprintf(buf, buflen, "%s/%d", getname((u_char *)&addr), plen);
-       return 1 + (plen + 7) / 8;
+       snprintf(buf, buflen, "%s/%d", getname(ndo, (u_char *)&addr), plen);
+       return 1 + plenbytes;
+
+trunc:
+       return -2;
+
+badtlv:
+       return -3;
 }
 
 static int
-decode_labeled_prefix4(const u_char *pptr, char *buf, u_int buflen)
+decode_labeled_prefix4(netdissect_options *ndo,
+                       const u_char *pptr, u_int itemlen, char *buf, u_int buflen)
 {
        struct in_addr addr;
-       u_int plen;
+       u_int plen, plenbytes;
 
+       /* prefix length and label = 4 bytes */
+       ND_TCHECK2(pptr[0], 4);
+       ITEMCHECK(4);
        plen = pptr[0];   /* get prefix length */
 
         /* this is one of the weirdnesses of rfc3107
@@ -369,79 +533,237 @@ decode_labeled_prefix4(const u_char *pptr, char *buf, u_int buflen)
            stacked labels in a a single BGP message
         */
 
+       if (24 > plen)
+               return -1;
+
         plen-=24; /* adjust prefixlen - labellength */
 
-       if (plen < 0 || 32 < plen)
+       if (32 < plen)
                return -1;
+       itemlen -= 4;
 
        memset(&addr, 0, sizeof(addr));
-       memcpy(&addr, &pptr[4], (plen + 7) / 8);
+       plenbytes = (plen + 7) / 8;
+       ND_TCHECK2(pptr[4], plenbytes);
+       ITEMCHECK(plenbytes);
+       memcpy(&addr, &pptr[4], plenbytes);
        if (plen % 8) {
-               ((u_char *)&addr)[(plen + 7) / 8 - 1] &=
+               ((u_char *)&addr)[plenbytes - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
        }
         /* the label may get offsetted by 4 bits so lets shift it right */
        snprintf(buf, buflen, "%s/%d, label:%u %s",
-                 getname((u_char *)&addr),
+                 getname(ndo, (u_char *)&addr),
                  plen,
                  EXTRACT_24BITS(pptr+1)>>4,
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
-       return 4 + (plen + 7) / 8;
-}
+       return 4 + plenbytes;
 
+trunc:
+       return -2;
+
+badtlv:
+       return -3;
+}
 
+/*
+ * bgp_vpn_ip_print
+ *
+ * print an ipv4 or ipv6 address into a buffer dependend on address length.
+ */
 static char *
-bgp_vpn_rd_print (const u_char *pptr) {
+bgp_vpn_ip_print(netdissect_options *ndo,
+                 const u_char *pptr, u_int addr_length) {
 
-   /* allocate space for the following string
-    * xxx.xxx.xxx.xxx:xxxxx
-    * 21 bytes plus one termination byte */
-    static char rd[22];
+    /* worst case string is s fully formatted v6 address */
+    static char addr[sizeof("1234:5678:89ab:cdef:1234:5678:89ab:cdef")];
+    char *pos = addr;
+
+    switch(addr_length) {
+    case (sizeof(struct in_addr) << 3): /* 32 */
+        ND_TCHECK2(pptr[0], sizeof(struct in_addr));
+        snprintf(pos, sizeof(addr), "%s", ipaddr_string(ndo, pptr));
+        break;
+#ifdef INET6
+    case (sizeof(struct in6_addr) << 3): /* 128 */
+        ND_TCHECK2(pptr[0], sizeof(struct in6_addr));
+        snprintf(pos, sizeof(addr), "%s", ip6addr_string(ndo, pptr));
+        break;
+#endif
+    default:
+        snprintf(pos, sizeof(addr), "bogus address length %u", addr_length);
+        break;
+    }
+    pos += strlen(pos);
+
+trunc:
+    *(pos) = '\0';
+    return (addr);
+}
+
+/*
+ * bgp_vpn_sg_print
+ *
+ * print an multicast s,g entry into a buffer.
+ * the s,g entry is encoded like this.
+ *
+ * +-----------------------------------+
+ * | Multicast Source Length (1 octet) |
+ * +-----------------------------------+
+ * |   Multicast Source (Variable)     |
+ * +-----------------------------------+
+ * |  Multicast Group Length (1 octet) |
+ * +-----------------------------------+
+ * |  Multicast Group   (Variable)     |
+ * +-----------------------------------+
+ *
+ * return the number of bytes read from the wire.
+ */
+static int
+bgp_vpn_sg_print(netdissect_options *ndo,
+                 const u_char *pptr, char *buf, u_int buflen) {
+
+    uint8_t addr_length;
+    u_int total_length, offset;
+
+    total_length = 0;
+
+    /* Source address length, encoded in bits */
+    ND_TCHECK2(pptr[0], 1);
+    addr_length =  *pptr++;
+
+    /* Source address */
+    ND_TCHECK2(pptr[0], (addr_length >> 3));
+    total_length += (addr_length >> 3) + 1;
+    offset = strlen(buf);
+    if (addr_length) {
+        snprintf(buf + offset, buflen - offset, ", Source %s",
+                 bgp_vpn_ip_print(ndo, pptr, addr_length));
+        pptr += (addr_length >> 3);
+    }
+
+    /* Group address length, encoded in bits */
+    ND_TCHECK2(pptr[0], 1);
+    addr_length =  *pptr++;
+
+    /* Group address */
+    ND_TCHECK2(pptr[0], (addr_length >> 3));
+    total_length += (addr_length >> 3) + 1;
+    offset = strlen(buf);
+    if (addr_length) {
+        snprintf(buf + offset, buflen - offset, ", Group %s",
+                 bgp_vpn_ip_print(ndo, pptr, addr_length));
+        pptr += (addr_length >> 3);
+    }
+
+trunc:
+    return (total_length);
+}
+
+
+/* RDs and RTs share the same semantics
+ * we use bgp_vpn_rd_print for
+ * printing route targets inside a NLRI */
+char *
+bgp_vpn_rd_print(netdissect_options *ndo,
+                 const u_char *pptr) {
+
+   /* allocate space for the largest possible string */
+    static char rd[sizeof("xxxxxxxxxx:xxxxx (xxx.xxx.xxx.xxx:xxxxx)")];
     char *pos = rd;
 
     /* ok lets load the RD format */
     switch (EXTRACT_16BITS(pptr)) {
-        /* AS:IP-address fmt*/
+
+        /* 2-byte-AS:number fmt*/
     case 0:
-        pos+=sprintf(pos, "%u:%u.%u.%u.%u",
-                     EXTRACT_16BITS(pptr+2),
-                     *(pptr+4),
-                     *(pptr+5),
-                     *(pptr+6),
-                     *(pptr+7));
+        snprintf(pos, sizeof(rd) - (pos - rd), "%u:%u (= %u.%u.%u.%u)",
+                 EXTRACT_16BITS(pptr+2),
+                 EXTRACT_32BITS(pptr+4),
+                 *(pptr+4), *(pptr+5), *(pptr+6), *(pptr+7));
         break;
         /* IP-address:AS fmt*/
+
     case 1:
-        pos+=sprintf(pos, "%u.%u.%u.%u:%u",
-                     *(pptr+2),
-                     *(pptr+3),
-                     *(pptr+4),
-                     *(pptr+5),
-                     EXTRACT_16BITS(pptr+6));
+        snprintf(pos, sizeof(rd) - (pos - rd), "%u.%u.%u.%u:%u",
+            *(pptr+2), *(pptr+3), *(pptr+4), *(pptr+5), EXTRACT_16BITS(pptr+6));
+        break;
+
+        /* 4-byte-AS:number fmt*/
+    case 2:
+       snprintf(pos, sizeof(rd) - (pos - rd), "%s:%u (%u.%u.%u.%u:%u)",
+           as_printf(ndo, astostr, sizeof(astostr), EXTRACT_32BITS(pptr+2)),
+           EXTRACT_16BITS(pptr+6), *(pptr+2), *(pptr+3), *(pptr+4),
+           *(pptr+5), EXTRACT_16BITS(pptr+6));
         break;
     default:
-        pos+=sprintf(pos, "unknown RD format");
+        snprintf(pos, sizeof(rd) - (pos - rd), "unknown RD format");
         break;
     }
+    pos += strlen(pos);
     *(pos) = '\0';
     return (rd);
 }
 
 static int
-decode_labeled_vpn_prefix4(const u_char *pptr, char *buf, u_int buflen)
+decode_rt_routing_info(netdissect_options *ndo,
+                       const u_char *pptr, char *buf, u_int buflen)
+{
+       uint8_t route_target[8];
+       u_int plen;
+
+       ND_TCHECK(pptr[0]);
+       plen = pptr[0];   /* get prefix length */
+
+       if (0 == plen)
+               return 1; /* default route target */
+
+       if (32 > plen)
+               return -1;
+
+        plen-=32; /* adjust prefix length */
+
+       if (64 < plen)
+               return -1;
+
+       memset(&route_target, 0, sizeof(route_target));
+       ND_TCHECK2(pptr[1], (plen + 7) / 8);
+       memcpy(&route_target, &pptr[1], (plen + 7) / 8);
+       if (plen % 8) {
+               ((u_char *)&route_target)[(plen + 7) / 8 - 1] &=
+                       ((0xff00 >> (plen % 8)) & 0xff);
+       }
+       snprintf(buf, buflen, "origin AS: %s, route target %s",
+           as_printf(ndo, astostr, sizeof(astostr), EXTRACT_32BITS(pptr+1)),
+           bgp_vpn_rd_print(ndo, (u_char *)&route_target));
+
+       return 5 + (plen + 7) / 8;
+
+trunc:
+       return -2;
+}
+
+static int
+decode_labeled_vpn_prefix4(netdissect_options *ndo,
+                           const u_char *pptr, char *buf, u_int buflen)
 {
        struct in_addr addr;
        u_int plen;
 
+       ND_TCHECK(pptr[0]);
        plen = pptr[0];   /* get prefix length */
 
+       if ((24+64) > plen)
+               return -1;
+
         plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
 
-       if (plen < 0 || 32 < plen)
+       if (32 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));
+       ND_TCHECK2(pptr[12], (plen + 7) / 8);
        memcpy(&addr, &pptr[12], (plen + 7) / 8);
        if (plen % 8) {
                ((u_char *)&addr)[(plen + 7) / 8 - 1] &=
@@ -449,176 +771,688 @@ decode_labeled_vpn_prefix4(const u_char *pptr, char *buf, u_int buflen)
        }
         /* the label may get offsetted by 4 bits so lets shift it right */
        snprintf(buf, buflen, "RD: %s, %s/%d, label:%u %s",
-                 bgp_vpn_rd_print(pptr+4),
-                 getname((u_char *)&addr),
+                 bgp_vpn_rd_print(ndo, pptr+4),
+                 getname(ndo, (u_char *)&addr),
                  plen,
                  EXTRACT_24BITS(pptr+1)>>4,
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 12 + (plen + 7) / 8;
+
+trunc:
+       return -2;
+}
+
+/*
+ * +-------------------------------+
+ * |                               |
+ * |  RD:IPv4-address (12 octets)  |
+ * |                               |
+ * +-------------------------------+
+ * |  MDT Group-address (4 octets) |
+ * +-------------------------------+
+ */
+
+#define MDT_VPN_NLRI_LEN 16
+
+static int
+decode_mdt_vpn_nlri(netdissect_options *ndo,
+                    const u_char *pptr, char *buf, u_int buflen)
+{
+
+    const u_char *rd;
+    const u_char *vpn_ip;
+
+    ND_TCHECK(pptr[0]);
+
+    /* if the NLRI is not predefined length, quit.*/
+    if (*pptr != MDT_VPN_NLRI_LEN * 8)
+       return -1;
+    pptr++;
+
+    /* RD */
+    ND_TCHECK2(pptr[0], 8);
+    rd = pptr;
+    pptr+=8;
+
+    /* IPv4 address */
+    ND_TCHECK2(pptr[0], sizeof(struct in_addr));
+    vpn_ip = pptr;
+    pptr+=sizeof(struct in_addr);
+
+    /* MDT Group Address */
+    ND_TCHECK2(pptr[0], sizeof(struct in_addr));
+
+    snprintf(buf, buflen, "RD: %s, VPN IP Address: %s, MC Group Address: %s",
+            bgp_vpn_rd_print(ndo, rd), ipaddr_string(ndo, vpn_ip), ipaddr_string(ndo, pptr));
+
+    return MDT_VPN_NLRI_LEN + 1;
+
+ trunc:
+
+return -2;
 }
 
+#define BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_I_PMSI   1
+#define BGP_MULTICAST_VPN_ROUTE_TYPE_INTER_AS_I_PMSI   2
+#define BGP_MULTICAST_VPN_ROUTE_TYPE_S_PMSI            3
+#define BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_SEG_LEAF 4
+#define BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_ACTIVE     5
+#define BGP_MULTICAST_VPN_ROUTE_TYPE_SHARED_TREE_JOIN  6
+#define BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_TREE_JOIN  7
+
+static const struct tok bgp_multicast_vpn_route_type_values[] = {
+    { BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_I_PMSI, "Intra-AS I-PMSI"},
+    { BGP_MULTICAST_VPN_ROUTE_TYPE_INTER_AS_I_PMSI, "Inter-AS I-PMSI"},
+    { BGP_MULTICAST_VPN_ROUTE_TYPE_S_PMSI, "S-PMSI"},
+    { BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_SEG_LEAF, "Intra-AS Segment-Leaf"},
+    { BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_ACTIVE, "Source-Active"},
+    { BGP_MULTICAST_VPN_ROUTE_TYPE_SHARED_TREE_JOIN, "Shared Tree Join"},
+    { BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_TREE_JOIN, "Source Tree Join"},
+};
+
 static int
-decode_labeled_vpn_l2(const u_char *pptr, char *buf, u_int buflen)
+decode_multicast_vpn(netdissect_options *ndo,
+                     const u_char *pptr, char *buf, u_int buflen)
+{
+        uint8_t route_type, route_length, addr_length, sg_length;
+        u_int offset;
+
+       ND_TCHECK2(pptr[0], 2);
+        route_type = *pptr++;
+        route_length = *pptr++;
+
+        snprintf(buf, buflen, "Route-Type: %s (%u), length: %u",
+                 tok2str(bgp_multicast_vpn_route_type_values,
+                         "Unknown", route_type),
+                 route_type, route_length);
+
+        switch(route_type) {
+        case BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_I_PMSI:
+            ND_TCHECK2(pptr[0], BGP_VPN_RD_LEN);
+            offset = strlen(buf);
+            snprintf(buf + offset, buflen - offset, ", RD: %s, Originator %s",
+                     bgp_vpn_rd_print(ndo, pptr),
+                     bgp_vpn_ip_print(ndo, pptr + BGP_VPN_RD_LEN,
+                                      (route_length - BGP_VPN_RD_LEN) << 3));
+            break;
+        case BGP_MULTICAST_VPN_ROUTE_TYPE_INTER_AS_I_PMSI:
+            ND_TCHECK2(pptr[0], BGP_VPN_RD_LEN + 4);
+            offset = strlen(buf);
+           snprintf(buf + offset, buflen - offset, ", RD: %s, Source-AS %s",
+               bgp_vpn_rd_print(ndo, pptr),
+               as_printf(ndo, astostr, sizeof(astostr),
+               EXTRACT_32BITS(pptr + BGP_VPN_RD_LEN)));
+            break;
+
+        case BGP_MULTICAST_VPN_ROUTE_TYPE_S_PMSI:
+            ND_TCHECK2(pptr[0], BGP_VPN_RD_LEN);
+            offset = strlen(buf);
+            snprintf(buf + offset, buflen - offset, ", RD: %s",
+                     bgp_vpn_rd_print(ndo, pptr));
+            pptr += BGP_VPN_RD_LEN;
+
+            sg_length = bgp_vpn_sg_print(ndo, pptr, buf, buflen);
+            addr_length =  route_length - sg_length;
+
+            ND_TCHECK2(pptr[0], addr_length);
+            offset = strlen(buf);
+            snprintf(buf + offset, buflen - offset, ", Originator %s",
+                     bgp_vpn_ip_print(ndo, pptr, addr_length << 3));
+            break;
+
+        case BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_ACTIVE:
+            ND_TCHECK2(pptr[0], BGP_VPN_RD_LEN);
+            offset = strlen(buf);
+            snprintf(buf + offset, buflen - offset, ", RD: %s",
+                     bgp_vpn_rd_print(ndo, pptr));
+            pptr += BGP_VPN_RD_LEN;
+
+            bgp_vpn_sg_print(ndo, pptr, buf, buflen);
+            break;
+
+        case BGP_MULTICAST_VPN_ROUTE_TYPE_SHARED_TREE_JOIN: /* fall through */
+        case BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_TREE_JOIN:
+            ND_TCHECK2(pptr[0], BGP_VPN_RD_LEN);
+            offset = strlen(buf);
+           snprintf(buf + offset, buflen - offset, ", RD: %s, Source-AS %s",
+               bgp_vpn_rd_print(ndo, pptr),
+               as_printf(ndo, astostr, sizeof(astostr),
+               EXTRACT_32BITS(pptr + BGP_VPN_RD_LEN)));
+            pptr += BGP_VPN_RD_LEN;
+
+            bgp_vpn_sg_print(ndo, pptr, buf, buflen);
+            break;
+
+            /*
+             * no per route-type printing yet.
+             */
+        case BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_SEG_LEAF:
+        default:
+            break;
+        }
+
+        return route_length + 2;
+
+trunc:
+       return -2;
+}
+
+/*
+ * As I remember, some versions of systems have an snprintf() that
+ * returns -1 if the buffer would have overflowed.  If the return
+ * value is negative, set buflen to 0, to indicate that we've filled
+ * the buffer up.
+ *
+ * If the return value is greater than buflen, that means that
+ * the buffer would have overflowed; again, set buflen to 0 in
+ * that case.
+ */
+#define UPDATE_BUF_BUFLEN(buf, buflen, strlen) \
+    if (strlen<0) \
+               buflen=0; \
+    else if ((u_int)strlen>buflen) \
+        buflen=0; \
+    else { \
+        buflen-=strlen; \
+       buf+=strlen; \
+    }
+
+static int
+decode_labeled_vpn_l2(netdissect_options *ndo,
+                      const u_char *pptr, char *buf, u_int buflen)
 {
         int plen,tlen,strlen,tlv_type,tlv_len,ttlv_len;
+
+       ND_TCHECK2(pptr[0], 2);
         plen=EXTRACT_16BITS(pptr);
         tlen=plen;
         pptr+=2;
-        strlen=snprintf(buf, buflen, "RD: %s, CE-ID: %u, Label-Block Offset: %u, Label Base %u",
-                        bgp_vpn_rd_print(pptr),
-                        EXTRACT_16BITS(pptr+8),
-                        EXTRACT_16BITS(pptr+10),
-                        EXTRACT_24BITS(pptr+12)>>4); /* the label is offsetted by 4 bits so lets shift it right */
-        pptr+=15;
-        tlen-=15;
-
-        /* ok now the variable part - lets read out TLVs*/
-        while (tlen>0) {
-            tlv_type=*pptr++;
-            tlv_len=EXTRACT_16BITS(pptr);
-            ttlv_len=tlv_len;
-            pptr+=2;
-
-            switch(tlv_type) {
-            case 1:
-                strlen+=snprintf(buf+strlen,buflen-strlen, "\n\t\tcircuit status vector (%u) length: %u: 0x",
-                                 tlv_type,
-                                 tlv_len);
-                ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */
-                while (ttlv_len>0) {
-                    strlen+=snprintf(buf+strlen,buflen-strlen, "%02x",*pptr++);
-                    ttlv_len--;
-                }
-                break;
-            default:
-                snprintf(buf+strlen,buflen-strlen, "\n\t\tunknown TLV #%u, length: %u",
-                         tlv_type,
-                         tlv_len);
-                break;
-            }
-            tlen-=(tlv_len<<3); /* the tlv-length is expressed in bits so lets shift it tright */
+       /* Old and new L2VPN NLRI share AFI/SAFI
+         *   -> Assume a 12 Byte-length NLRI is auto-discovery-only
+         *      and > 17 as old format. Complain for the middle case
+         */
+        if (plen==12) {
+           /* assume AD-only with RD, BGPNH */
+           ND_TCHECK2(pptr[0],12);
+           buf[0]='\0';
+           strlen=snprintf(buf, buflen, "RD: %s, BGPNH: %s",
+                           bgp_vpn_rd_print(ndo, pptr),
+                           /* need something like getname(ndo, ) here */
+                           getname(ndo, pptr+8)
+                           );
+           UPDATE_BUF_BUFLEN(buf, buflen, strlen);
+           pptr+=12;
+           tlen-=12;
+           return plen;
+        } else if (plen>17) {
+           /* assume old format */
+           /* RD, ID, LBLKOFF, LBLBASE */
+
+           ND_TCHECK2(pptr[0],15);
+           buf[0]='\0';
+           strlen=snprintf(buf, buflen, "RD: %s, CE-ID: %u, Label-Block Offset: %u, Label Base %u",
+                           bgp_vpn_rd_print(ndo, pptr),
+                           EXTRACT_16BITS(pptr+8),
+                           EXTRACT_16BITS(pptr+10),
+                           EXTRACT_24BITS(pptr+12)>>4); /* the label is offsetted by 4 bits so lets shift it right */
+           UPDATE_BUF_BUFLEN(buf, buflen, strlen);
+           pptr+=15;
+           tlen-=15;
+
+           /* ok now the variable part - lets read out TLVs*/
+           while (tlen>0) {
+               if (tlen < 3)
+                   return -1;
+               ND_TCHECK2(pptr[0], 3);
+               tlv_type=*pptr++;
+               tlv_len=EXTRACT_16BITS(pptr);
+               ttlv_len=tlv_len;
+               pptr+=2;
+
+               switch(tlv_type) {
+               case 1:
+                   if (buflen!=0) {
+                       strlen=snprintf(buf,buflen, "\n\t\tcircuit status vector (%u) length: %u: 0x",
+                                       tlv_type,
+                                       tlv_len);
+                       UPDATE_BUF_BUFLEN(buf, buflen, strlen);
+                   }
+                   ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */
+                   while (ttlv_len>0) {
+                       ND_TCHECK(pptr[0]);
+                       if (buflen!=0) {
+                           strlen=snprintf(buf,buflen, "%02x",*pptr++);
+                           UPDATE_BUF_BUFLEN(buf, buflen, strlen);
+                       }
+                       ttlv_len--;
+                   }
+                   break;
+               default:
+                   if (buflen!=0) {
+                       strlen=snprintf(buf,buflen, "\n\t\tunknown TLV #%u, length: %u",
+                                       tlv_type,
+                                       tlv_len);
+                       UPDATE_BUF_BUFLEN(buf, buflen, strlen);
+                   }
+                   break;
+               }
+               tlen-=(tlv_len<<3); /* the tlv-length is expressed in bits so lets shift it right */
+           }
+           return plen+2;
+
+        } else {
+           /* complain bitterly ? */
+           /* fall through */
+            goto trunc;
         }
-        return plen+2;
+
+trunc:
+        return -2;
 }
 
 #ifdef INET6
+int
+decode_prefix6(netdissect_options *ndo,
+               const u_char *pd, u_int itemlen, char *buf, u_int buflen)
+{
+       struct in6_addr addr;
+       u_int plen, plenbytes;
+
+       ND_TCHECK(pd[0]);
+       ITEMCHECK(1);
+       plen = pd[0];
+       if (128 < plen)
+               return -1;
+       itemlen -= 1;
+
+       memset(&addr, 0, sizeof(addr));
+       plenbytes = (plen + 7) / 8;
+       ND_TCHECK2(pd[1], plenbytes);
+       ITEMCHECK(plenbytes);
+       memcpy(&addr, &pd[1], plenbytes);
+       if (plen % 8) {
+               addr.s6_addr[plenbytes - 1] &=
+                       ((0xff00 >> (plen % 8)) & 0xff);
+       }
+       snprintf(buf, buflen, "%s/%d", getname6(ndo, (u_char *)&addr), plen);
+       return 1 + plenbytes;
+
+trunc:
+       return -2;
+
+badtlv:
+       return -3;
+}
+
 static int
-decode_prefix6(const u_char *pd, char *buf, u_int buflen)
+decode_labeled_prefix6(netdissect_options *ndo,
+                       const u_char *pptr, u_int itemlen, char *buf, u_int buflen)
+{
+       struct in6_addr addr;
+       u_int plen, plenbytes;
+
+       /* prefix length and label = 4 bytes */
+       ND_TCHECK2(pptr[0], 4);
+       ITEMCHECK(4);
+       plen = pptr[0]; /* get prefix length */
+
+       if (24 > plen)
+               return -1;
+
+        plen-=24; /* adjust prefixlen - labellength */
+
+       if (128 < plen)
+               return -1;
+       itemlen -= 4;
+
+       memset(&addr, 0, sizeof(addr));
+       plenbytes = (plen + 7) / 8;
+       ND_TCHECK2(pptr[4], plenbytes);
+       memcpy(&addr, &pptr[4], plenbytes);
+       if (plen % 8) {
+               addr.s6_addr[plenbytes - 1] &=
+                       ((0xff00 >> (plen % 8)) & 0xff);
+       }
+        /* the label may get offsetted by 4 bits so lets shift it right */
+       snprintf(buf, buflen, "%s/%d, label:%u %s",
+                 getname6(ndo, (u_char *)&addr),
+                 plen,
+                 EXTRACT_24BITS(pptr+1)>>4,
+                 ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+
+       return 4 + plenbytes;
+
+trunc:
+       return -2;
+
+badtlv:
+       return -3;
+}
+
+static int
+decode_labeled_vpn_prefix6(netdissect_options *ndo,
+                           const u_char *pptr, char *buf, u_int buflen)
 {
        struct in6_addr addr;
        u_int plen;
 
-       plen = pd[0];
-       if (plen < 0 || 128 < plen)
+       ND_TCHECK(pptr[0]);
+       plen = pptr[0];   /* get prefix length */
+
+       if ((24+64) > plen)
+               return -1;
+
+        plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
+
+       if (128 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));
-       memcpy(&addr, &pd[1], (plen + 7) / 8);
+       ND_TCHECK2(pptr[12], (plen + 7) / 8);
+       memcpy(&addr, &pptr[12], (plen + 7) / 8);
        if (plen % 8) {
                addr.s6_addr[(plen + 7) / 8 - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
        }
-       snprintf(buf, buflen, "%s/%d", getname6((u_char *)&addr), plen);
-       return 1 + (plen + 7) / 8;
+        /* the label may get offsetted by 4 bits so lets shift it right */
+       snprintf(buf, buflen, "RD: %s, %s/%d, label:%u %s",
+                 bgp_vpn_rd_print(ndo, pptr+4),
+                 getname6(ndo, (u_char *)&addr),
+                 plen,
+                 EXTRACT_24BITS(pptr+1)>>4,
+                 ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+
+       return 12 + (plen + 7) / 8;
+
+trunc:
+       return -2;
 }
 #endif
 
-static void
-bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
+static int
+decode_clnp_prefix(netdissect_options *ndo,
+                   const u_char *pptr, char *buf, u_int buflen)
+{
+        uint8_t addr[19];
+       u_int plen;
+
+       ND_TCHECK(pptr[0]);
+       plen = pptr[0]; /* get prefix length */
+
+       if (152 < plen)
+               return -1;
+
+       memset(&addr, 0, sizeof(addr));
+       ND_TCHECK2(pptr[4], (plen + 7) / 8);
+       memcpy(&addr, &pptr[4], (plen + 7) / 8);
+       if (plen % 8) {
+               addr[(plen + 7) / 8 - 1] &=
+                       ((0xff00 >> (plen % 8)) & 0xff);
+       }
+       snprintf(buf, buflen, "%s/%d",
+                 isonsap_string(addr,(plen + 7) / 8),
+                 plen);
+
+       return 1 + (plen + 7) / 8;
+
+trunc:
+       return -2;
+}
+
+static int
+decode_labeled_vpn_clnp_prefix(netdissect_options *ndo,
+                               const u_char *pptr, char *buf, u_int buflen)
+{
+        uint8_t addr[19];
+       u_int plen;
+
+       ND_TCHECK(pptr[0]);
+       plen = pptr[0];   /* get prefix length */
+
+       if ((24+64) > plen)
+               return -1;
+
+        plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
+
+       if (152 < plen)
+               return -1;
+
+       memset(&addr, 0, sizeof(addr));
+       ND_TCHECK2(pptr[12], (plen + 7) / 8);
+       memcpy(&addr, &pptr[12], (plen + 7) / 8);
+       if (plen % 8) {
+               addr[(plen + 7) / 8 - 1] &=
+                       ((0xff00 >> (plen % 8)) & 0xff);
+       }
+        /* the label may get offsetted by 4 bits so lets shift it right */
+       snprintf(buf, buflen, "RD: %s, %s/%d, label:%u %s",
+                 bgp_vpn_rd_print(ndo, pptr+4),
+                 isonsap_string(addr,(plen + 7) / 8),
+                 plen,
+                 EXTRACT_24BITS(pptr+1)>>4,
+                 ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+
+       return 12 + (plen + 7) / 8;
+
+trunc:
+       return -2;
+}
+
+/*
+ * bgp_attr_get_as_size
+ *
+ * Try to find the size of the ASs encoded in an as-path. It is not obvious, as
+ * both Old speakers that do not support 4 byte AS, and the new speakers that do
+ * support, exchange AS-Path with the same path-attribute type value 0x02.
+ */
+static int
+bgp_attr_get_as_size(netdissect_options *ndo,
+                     uint8_t bgpa_type, const u_char *pptr, int len)
+{
+    const u_char *tptr = pptr;
+
+    /*
+     * If the path attribute is the optional AS4 path type, then we already
+     * know, that ASs must be encoded in 4 byte format.
+     */
+    if (bgpa_type == BGPTYPE_AS4_PATH) {
+        return 4;
+    }
+
+    /*
+     * Let us assume that ASs are of 2 bytes in size, and check if the AS-Path
+     * TLV is good. If not, ask the caller to try with AS encoded as 4 bytes
+     * each.
+     */
+    while (tptr < pptr + len) {
+        ND_TCHECK(tptr[0]);
+
+        /*
+         * If we do not find a valid segment type, our guess might be wrong.
+         */
+        if (tptr[0] < BGP_AS_SEG_TYPE_MIN || tptr[0] > BGP_AS_SEG_TYPE_MAX) {
+            goto trunc;
+        }
+        ND_TCHECK(tptr[1]);
+        tptr += 2 + tptr[1] * 2;
+    }
+
+    /*
+     * If we correctly reached end of the AS path attribute data content,
+     * then most likely ASs were indeed encoded as 2 bytes.
+     */
+    if (tptr == pptr + len) {
+        return 2;
+    }
+
+trunc:
+
+    /*
+     * We can come here, either we did not have enough data, or if we
+     * try to decode 4 byte ASs in 2 byte format. Either way, return 4,
+     * so that calller can try to decode each AS as of 4 bytes. If indeed
+     * there was not enough data, it will crib and end the parse anyways.
+     */
+   return 4;
+}
+
+static int
+bgp_attr_print(netdissect_options *ndo,
+               u_int atype, const u_char *pptr, u_int len)
 {
        int i;
-       u_int16_t af;
-       u_int8_t safi, snpa;
+       uint16_t af;
+       uint8_t safi, snpa, nhlen;
+        union { /* copy buffer for bandwidth values */
+            float f;
+            uint32_t i;
+        } bw;
        int advance;
-       int tlen;
+       u_int tlen;
        const u_char *tptr;
        char buf[MAXHOSTNAMELEN + 100];
+       char tokbuf[TOKBUFSIZE];
+        int  as_size;
 
         tptr = pptr;
         tlen=len;
 
-       switch (attr->bgpa_type) {
+       switch (atype) {
        case BGPTYPE_ORIGIN:
                if (len != 1)
-                       printf("invalid len");
-               else
-                       printf("%s", tok2str(bgp_origin_values, "Unknown Origin Typecode", tptr[0]));
+                       ND_PRINT((ndo, "invalid len"));
+               else {
+                       ND_TCHECK(*tptr);
+                       ND_PRINT((ndo, "%s", tok2strbuf(bgp_origin_values,
+                                               "Unknown Origin Typecode",
+                                               tptr[0],
+                                               tokbuf, sizeof(tokbuf))));
+               }
                break;
+
+
+        /*
+         * Process AS4 byte path and AS2 byte path attributes here.
+         */
+       case BGPTYPE_AS4_PATH:
        case BGPTYPE_AS_PATH:
                if (len % 2) {
-                       printf("invalid len");
+                       ND_PRINT((ndo, "invalid len"));
                        break;
                }
                 if (!len) {
-                       printf("empty");
+                       ND_PRINT((ndo, "empty"));
                        break;
                 }
+
+                /*
+                 * BGP updates exchanged between New speakers that support 4
+                 * byte AS, ASs are always encoded in 4 bytes. There is no
+                 * definitive way to find this, just by the packet's
+                 * contents. So, check for packet's TLV's sanity assuming
+                 * 2 bytes first, and it does not pass, assume that ASs are
+                 * encoded in 4 bytes format and move on.
+                 */
+                as_size = bgp_attr_get_as_size(ndo, atype, pptr, len);
+
                while (tptr < pptr + len) {
-                       /*
-                        * under RFC1965, p[0] means:
-                        * 1: AS_SET 2: AS_SEQUENCE
-                        * 3: AS_CONFED_SET 4: AS_CONFED_SEQUENCE
-                        */
-                       if (tptr[0] == 3 || tptr[0] == 4)
-                               printf("confed");
-                       printf("%s", (tptr[0] & 1) ? "{" : "");
-                       for (i = 0; i < tptr[1] * 2; i += 2) {
-                               printf("%s%u", i == 0 ? "" : " ",
-                                       EXTRACT_16BITS(&tptr[2 + i]));
-                       }
-                       printf("%s", (tptr[0] & 1) ? "}" : "");
-                       tptr += 2 + tptr[1] * 2;
+                       ND_TCHECK(tptr[0]);
+                        ND_PRINT((ndo, "%s", tok2strbuf(bgp_as_path_segment_open_values,
+                                               "?", tptr[0],
+                                               tokbuf, sizeof(tokbuf))));
+                        for (i = 0; i < tptr[1] * as_size; i += as_size) {
+                            ND_TCHECK2(tptr[2 + i], as_size);
+                           ND_PRINT((ndo, "%s ",
+                               as_printf(ndo, astostr, sizeof(astostr),
+                               as_size == 2 ?
+                               EXTRACT_16BITS(&tptr[2 + i]) :
+                               EXTRACT_32BITS(&tptr[2 + i]))));
+                        }
+                       ND_TCHECK(tptr[0]);
+                        ND_PRINT((ndo, "%s", tok2strbuf(bgp_as_path_segment_close_values,
+                                               "?", tptr[0],
+                                               tokbuf, sizeof(tokbuf))));
+                        ND_TCHECK(tptr[1]);
+                        tptr += 2 + tptr[1] * as_size;
                }
                break;
        case BGPTYPE_NEXT_HOP:
                if (len != 4)
-                       printf("invalid len");
-               else
-                       printf("%s", getname(tptr));
+                       ND_PRINT((ndo, "invalid len"));
+               else {
+                       ND_TCHECK2(tptr[0], 4);
+                       ND_PRINT((ndo, "%s", getname(ndo, tptr)));
+               }
                break;
        case BGPTYPE_MULTI_EXIT_DISC:
        case BGPTYPE_LOCAL_PREF:
                if (len != 4)
-                       printf("invalid len");
-               else
-                       printf("%u", EXTRACT_32BITS(tptr));
+                       ND_PRINT((ndo, "invalid len"));
+               else {
+                       ND_TCHECK2(tptr[0], 4);
+                       ND_PRINT((ndo, "%u", EXTRACT_32BITS(tptr)));
+               }
                break;
        case BGPTYPE_ATOMIC_AGGREGATE:
                if (len != 0)
-                       printf("invalid len");
+                       ND_PRINT((ndo, "invalid len"));
                break;
-       case BGPTYPE_AGGREGATOR:
-               if (len != 6) {
-                       printf("invalid len");
+        case BGPTYPE_AGGREGATOR:
+
+                /*
+                 * Depending on the AS encoded is of 2 bytes or of 4 bytes,
+                 * the length of this PA can be either 6 bytes or 8 bytes.
+                 */
+                if (len != 6 && len != 8) {
+                    ND_PRINT((ndo, "invalid len"));
+                    break;
+                }
+                ND_TCHECK2(tptr[0], len);
+                if (len == 6) {
+                   ND_PRINT((ndo, " AS #%s, origin %s",
+                       as_printf(ndo, astostr, sizeof(astostr), EXTRACT_16BITS(tptr)),
+                       getname(ndo, tptr + 2)));
+                } else {
+                   ND_PRINT((ndo, " AS #%s, origin %s",
+                       as_printf(ndo, astostr, sizeof(astostr),
+                       EXTRACT_32BITS(tptr)), getname(ndo, tptr + 4)));
+                }
+                break;
+       case BGPTYPE_AGGREGATOR4:
+               if (len != 8) {
+                       ND_PRINT((ndo, "invalid len"));
                        break;
                }
-               printf(" AS #%u, origin %s", EXTRACT_16BITS(tptr),
-                       getname(tptr + 2));
+               ND_TCHECK2(tptr[0], 8);
+               ND_PRINT((ndo, " AS #%s, origin %s",
+                   as_printf(ndo, astostr, sizeof(astostr), EXTRACT_32BITS(tptr)),
+                   getname(ndo, tptr + 4)));
                break;
        case BGPTYPE_COMMUNITIES:
                if (len % 4) {
-                       printf("invalid len");
+                       ND_PRINT((ndo, "invalid len"));
                        break;
                }
                while (tlen>0) {
-                       u_int32_t comm;
+                       uint32_t comm;
+                       ND_TCHECK2(tptr[0], 4);
                        comm = EXTRACT_32BITS(tptr);
                        switch (comm) {
                        case BGP_COMMUNITY_NO_EXPORT:
-                               printf(" NO_EXPORT");
+                               ND_PRINT((ndo, " NO_EXPORT"));
                                break;
                        case BGP_COMMUNITY_NO_ADVERT:
-                               printf(" NO_ADVERTISE");
+                               ND_PRINT((ndo, " NO_ADVERTISE"));
                                break;
                        case BGP_COMMUNITY_NO_EXPORT_SUBCONFED:
-                               printf(" NO_EXPORT_SUBCONFED");
+                               ND_PRINT((ndo, " NO_EXPORT_SUBCONFED"));
                                break;
                        default:
-                               printf("%u:%u%s",
+                               ND_PRINT((ndo, "%u:%u%s",
                                        (comm >> 16) & 0xffff,
                                        comm & 0xffff,
-                                       (tlen>4) ? ", " : "");
+                                       (tlen>4) ? ", " : ""));
                                break;
                        }
                         tlen -=4;
@@ -627,418 +1461,871 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                break;
         case BGPTYPE_ORIGINATOR_ID:
                if (len != 4) {
-                       printf("invalid len");
+                       ND_PRINT((ndo, "invalid len"));
                        break;
                }
-                printf("%s",getname(tptr));
+               ND_TCHECK2(tptr[0], 4);
+                ND_PRINT((ndo, "%s",getname(ndo, tptr)));
                 break;
         case BGPTYPE_CLUSTER_LIST:
+               if (len % 4) {
+                       ND_PRINT((ndo, "invalid len"));
+                       break;
+               }
                 while (tlen>0) {
-                        printf("%s%s",
-                               getname(tptr),
-                                (tlen>4) ? ", " : "");
+                       ND_TCHECK2(tptr[0], 4);
+                        ND_PRINT((ndo, "%s%s",
+                               getname(ndo, tptr),
+                                (tlen>4) ? ", " : ""));
                         tlen -=4;
                         tptr +=4;
                 }
                 break;
        case BGPTYPE_MP_REACH_NLRI:
+               ND_TCHECK2(tptr[0], 3);
                af = EXTRACT_16BITS(tptr);
                safi = tptr[2];
-       
-                printf("\n\t    AFI: %s (%u), %sSAFI: %s (%u)",
-                       tok2str(bgp_afi_values, "Unknown AFI", af),
+
+                ND_PRINT((ndo, "\n\t    AFI: %s (%u), %sSAFI: %s (%u)",
+                       tok2strbuf(af_values, "Unknown AFI", af,
+                                 tokbuf, sizeof(tokbuf)),
                        af,
                        (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
-                       tok2str(bgp_safi_values, "Unknown SAFI", safi),
-                       safi);
-
-               if (af == AFNUM_INET || af==AFNUM_L2VPN)
-                       ;
+                       tok2strbuf(bgp_safi_values, "Unknown SAFI", safi,
+                                 tokbuf, sizeof(tokbuf)),
+                       safi));
+
+                switch(af<<8 | safi) {
+                case (AFNUM_INET<<8 | SAFNUM_UNICAST):
+                case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
+                case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
+                case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+                case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
+                case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+                case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
+               case (AFNUM_INET<<8 | SAFNUM_MDT):
 #ifdef INET6
-               else if (af == AFNUM_INET6)
-                       ;
+                case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
+                case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
+                case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
+                case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+                case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
 #endif
-               else {
-                    printf("\n\t    no AFI %u decoder",af);
-                    if (!vflag)
-                        print_unknown_data(tptr,"\n\t    ",tlen);
+                case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
+                case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
+                case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
+                case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
+                case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
+                case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
+                    break;
+                default:
+                    ND_TCHECK2(tptr[0], tlen);
+                    ND_PRINT((ndo, "\n\t    no AFI %u / SAFI %u decoder", af, safi));
+                    if (ndo->ndo_vflag <= 1)
+                        print_unknown_data(ndo, tptr, "\n\t    ", tlen);
+                    goto done;
                     break;
                 }
 
                 tptr +=3;
 
-               tlen = tptr[0];
+               ND_TCHECK(tptr[0]);
+               nhlen = tptr[0];
+                tlen = nhlen;
                 tptr++;
 
                if (tlen) {
-                       printf("\n\t    nexthop: ");
-                       while (tlen > 0) {
-                               switch (af) {
-                               case AFNUM_INET:
-                                    switch(safi) {
-                                    case SAFNUM_UNICAST:
-                                    case SAFNUM_MULTICAST:
-                                    case SAFNUM_UNIMULTICAST:
-                                    case SAFNUM_LABUNICAST:
-                                       printf("%s",getname(tptr));
-                                       tlen -= sizeof(struct in_addr);
-                                        tptr += sizeof(struct in_addr);
-                                       break;
-                                    case SAFNUM_VPNUNICAST:
-                                    case SAFNUM_VPNMULTICAST:
-                                    case SAFNUM_VPNUNIMULTICAST:
-                                        printf("RD: %s, %s",
-                                               bgp_vpn_rd_print(tptr),
-                                               getname(tptr+BGP_VPN_RD_LEN));
-                                       tlen -= (sizeof(struct in_addr)+BGP_VPN_RD_LEN);
-                                        tptr += (sizeof(struct in_addr)+BGP_VPN_RD_LEN);
-                                        break;
-                                    default:
-                                        printf("no SAFI %u decoder",safi);                                        
-                                        if (!vflag)
-                                            print_unknown_data(tptr,"\n\t    ",tlen);
-                                        break;
-                                    }
-                                    break;
+                    int nnh = 0;
+                    ND_PRINT((ndo, "\n\t    nexthop: "));
+                    while (tlen > 0) {
+                        if ( nnh++ > 0 ) {
+                            ND_PRINT((ndo,  ", " ));
+                        }
+                        switch(af<<8 | safi) {
+                        case (AFNUM_INET<<8 | SAFNUM_UNICAST):
+                        case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
+                        case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
+                        case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+                        case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
+                        case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
+                        case (AFNUM_INET<<8 | SAFNUM_MDT):
+                           if (tlen < (int)sizeof(struct in_addr)) {
+                                ND_PRINT((ndo, "invalid len"));
+                                tlen = 0;
+                            } else {
+                                ND_TCHECK2(tptr[0], sizeof(struct in_addr));
+                                ND_PRINT((ndo, "%s",getname(ndo, tptr)));
+                                tlen -= sizeof(struct in_addr);
+                                tptr += sizeof(struct in_addr);
+                            }
+                            break;
+                        case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
+                        case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
+                        case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+                            if (tlen < (int)(sizeof(struct in_addr)+BGP_VPN_RD_LEN)) {
+                                ND_PRINT((ndo, "invalid len"));
+                                tlen = 0;
+                            } else {
+                                ND_TCHECK2(tptr[0], sizeof(struct in_addr)+BGP_VPN_RD_LEN);
+                                ND_PRINT((ndo, "RD: %s, %s",
+                                       bgp_vpn_rd_print(ndo, tptr),
+                                       getname(ndo, tptr+BGP_VPN_RD_LEN)));
+                                tlen -= (sizeof(struct in_addr)+BGP_VPN_RD_LEN);
+                                tptr += (sizeof(struct in_addr)+BGP_VPN_RD_LEN);
+                            }
+                            break;
 #ifdef INET6
-                               case AFNUM_INET6:
-                                    switch(safi) {
-                                    case SAFNUM_UNICAST:
-                                    case SAFNUM_MULTICAST:
-                                    case SAFNUM_UNIMULTICAST:
-                                    case SAFNUM_LABUNICAST:
-                                        printf("%s", getname6(tptr));
-                                        tlen -= sizeof(struct in6_addr);
-                                        tptr += sizeof(struct in6_addr);
-                                        break;
-                                    case SAFNUM_VPNUNICAST:
-                                    case SAFNUM_VPNMULTICAST:
-                                    case SAFNUM_VPNUNIMULTICAST:
-                                        printf("RD: %s, %s",
-                                               bgp_vpn_rd_print(tptr),
-                                               getname6(tptr+BGP_VPN_RD_LEN));
-                                       tlen -= (sizeof(struct in6_addr)+BGP_VPN_RD_LEN);
-                                        tptr += (sizeof(struct in6_addr)+BGP_VPN_RD_LEN);
-                                        break;
-                                    default:
-                                        printf("no SAFI %u decoder",safi);
-                                        if (!vflag)
-                                            print_unknown_data(tptr,"\n\t    ",tlen);                                        
-                                        break;
-                                    }
-                                    break;
+                        case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
+                        case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
+                        case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
+                        case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+                            if (tlen < (int)sizeof(struct in6_addr)) {
+                                ND_PRINT((ndo, "invalid len"));
+                                tlen = 0;
+                            } else {
+                                ND_TCHECK2(tptr[0], sizeof(struct in6_addr));
+                                ND_PRINT((ndo, "%s", getname6(ndo, tptr)));
+                                tlen -= sizeof(struct in6_addr);
+                                tptr += sizeof(struct in6_addr);
+                            }
+                            break;
+                        case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
+                        case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
+                        case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+                            if (tlen < (int)(sizeof(struct in6_addr)+BGP_VPN_RD_LEN)) {
+                                ND_PRINT((ndo, "invalid len"));
+                                tlen = 0;
+                            } else {
+                                ND_TCHECK2(tptr[0], sizeof(struct in6_addr)+BGP_VPN_RD_LEN);
+                                ND_PRINT((ndo, "RD: %s, %s",
+                                       bgp_vpn_rd_print(ndo, tptr),
+                                       getname6(ndo, tptr+BGP_VPN_RD_LEN)));
+                                tlen -= (sizeof(struct in6_addr)+BGP_VPN_RD_LEN);
+                                tptr += (sizeof(struct in6_addr)+BGP_VPN_RD_LEN);
+                            }
+                            break;
 #endif
-                                case AFNUM_L2VPN:
-                                   switch(safi) {
-                                    case SAFNUM_VPNUNICAST:
-                                    case SAFNUM_VPNMULTICAST:
-                                    case SAFNUM_VPNUNIMULTICAST:
-                                        printf("%s", getname(tptr));
-                                       tlen -= (sizeof(struct in_addr));
-                                        tptr += (sizeof(struct in_addr));
-                                        break;                                   
-                                   default:
-                                        printf("no SAFI %u decoder",safi);
-                                        if (!vflag)
-                                            print_unknown_data(tptr,"\n\t    ",tlen);                                        
-                                        break;
-                                   }
-                                   break;
-
-                               default:
-                                    printf("no AFI %u decoder",af);
-                                    if (!vflag)
-                                      print_unknown_data(tptr,"\n\t    ",tlen);
-                                    break;
-                               }
-                       }
+                        case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
+                        case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
+                        case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
+                        case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
+                            if (tlen < (int)sizeof(struct in_addr)) {
+                                ND_PRINT((ndo, "invalid len"));
+                                tlen = 0;
+                            } else {
+                                ND_TCHECK2(tptr[0], sizeof(struct in_addr));
+                                ND_PRINT((ndo, "%s", getname(ndo, tptr)));
+                                tlen -= (sizeof(struct in_addr));
+                                tptr += (sizeof(struct in_addr));
+                            }
+                            break;
+                        case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
+                        case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
+                        case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
+                            ND_TCHECK2(tptr[0], tlen);
+                            ND_PRINT((ndo, "%s", isonsap_string(tptr, tlen)));
+                            tptr += tlen;
+                            tlen = 0;
+                            break;
+
+                        case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
+                        case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
+                        case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
+                            if (tlen < BGP_VPN_RD_LEN+1) {
+                                ND_PRINT((ndo, "invalid len"));
+                                tlen = 0;
+                            } else {
+                                ND_TCHECK2(tptr[0], tlen);
+                                ND_PRINT((ndo, "RD: %s, %s",
+                                       bgp_vpn_rd_print(ndo, tptr),
+                                       isonsap_string(tptr+BGP_VPN_RD_LEN,tlen-BGP_VPN_RD_LEN)));
+                                /* rfc986 mapped IPv4 address ? */
+                                if (EXTRACT_32BITS(tptr+BGP_VPN_RD_LEN) ==  0x47000601)
+                                    ND_PRINT((ndo, " = %s", getname(ndo, tptr+BGP_VPN_RD_LEN+4)));
+#ifdef INET6
+                                /* rfc1888 mapped IPv6 address ? */
+                                else if (EXTRACT_24BITS(tptr+BGP_VPN_RD_LEN) ==  0x350000)
+                                    ND_PRINT((ndo, " = %s", getname6(ndo, tptr+BGP_VPN_RD_LEN+3)));
+#endif
+                                tptr += tlen;
+                                tlen = 0;
+                            }
+                            break;
+                        default:
+                            ND_TCHECK2(tptr[0], tlen);
+                            ND_PRINT((ndo, "no AFI %u/SAFI %u decoder", af, safi));
+                            if (ndo->ndo_vflag <= 1)
+                                print_unknown_data(ndo, tptr, "\n\t    ", tlen);
+                            tptr += tlen;
+                            tlen = 0;
+                            goto done;
+                            break;
+                        }
+                    }
                }
+               ND_PRINT((ndo, ", nh-length: %u", nhlen));
                tptr += tlen;
 
+               ND_TCHECK(tptr[0]);
                snpa = tptr[0];
                tptr++;
 
                if (snpa) {
-                       printf("\n\t    %u SNPA", snpa);
+                       ND_PRINT((ndo, "\n\t    %u SNPA", snpa));
                        for (/*nothing*/; snpa > 0; snpa--) {
-                               printf("\n\t      %d bytes", tptr[0]);
+                               ND_TCHECK(tptr[0]);
+                               ND_PRINT((ndo, "\n\t      %d bytes", tptr[0]));
                                tptr += tptr[0] + 1;
                        }
                } else {
-                printf(", no SNPA");
+                       ND_PRINT((ndo, ", no SNPA"));
                 }
 
                while (len - (tptr - pptr) > 0) {
-                       switch (af) {
-                       case AFNUM_INET:
-                            switch (safi) {
-                            case SAFNUM_UNICAST:
-                            case SAFNUM_MULTICAST:
-                            case SAFNUM_UNIMULTICAST:
-                                advance = decode_prefix4(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            case SAFNUM_LABUNICAST:
-                                advance = decode_labeled_prefix4(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            case SAFNUM_VPNUNICAST:
-                            case SAFNUM_VPNMULTICAST:
-                            case SAFNUM_VPNUNIMULTICAST:
-                                advance = decode_labeled_vpn_prefix4(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            default:
-                                printf("\n\t      no SAFI %u decoder",safi);
-                                if (!vflag)
-                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
-                                advance = 0;
-                               tptr = pptr + len;
-                               break;  
-                            }
-                            break;
+                    switch (af<<8 | safi) {
+                    case (AFNUM_INET<<8 | SAFNUM_UNICAST):
+                    case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
+                    case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
+                        advance = decode_prefix4(ndo, tptr, len, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else if (advance == -3)
+                            break; /* bytes left, but not enough */
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+                        advance = decode_labeled_prefix4(ndo, tptr, len, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else if (advance == -3)
+                            break; /* bytes left, but not enough */
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
+                    case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
+                    case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+                        advance = decode_labeled_vpn_prefix4(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
+                        advance = decode_rt_routing_info(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
+                    case (AFNUM_INET6<<8 | SAFNUM_MULTICAST_VPN):
+                        advance = decode_multicast_vpn(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+
+                   case (AFNUM_INET<<8 | SAFNUM_MDT):
+                     advance = decode_mdt_vpn_nlri(ndo, tptr, buf, sizeof(buf));
+                     if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                      break;
 #ifdef INET6
-                       case AFNUM_INET6:
-                            switch (safi) {
-                            case SAFNUM_UNICAST:
-                            case SAFNUM_MULTICAST:
-                            case SAFNUM_UNIMULTICAST:
-                               advance = decode_prefix6(tptr, buf, sizeof(buf));
-                               printf("\n\t      %s", buf);
-                               break;
-                            default:
-                                printf("\n\t      no SAFI %u decoder ",safi);
-                                if (!vflag)
-                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
-                                advance = 0;
-                               tptr = pptr + len;
-                               break;
-                            }
-                            break;
+                    case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
+                    case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
+                    case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
+                        advance = decode_prefix6(ndo, tptr, len, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else if (advance == -3)
+                            break; /* bytes left, but not enough */
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+                        advance = decode_labeled_prefix6(ndo, tptr, len, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else if (advance == -3)
+                            break; /* bytes left, but not enough */
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
+                    case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
+                    case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+                        advance = decode_labeled_vpn_prefix6(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
 #endif
-                        case AFNUM_L2VPN:
-                            switch(safi) {
-                            case SAFNUM_VPNUNICAST:
-                            case SAFNUM_VPNMULTICAST:
-                            case SAFNUM_VPNUNIMULTICAST:
-                               advance = decode_labeled_vpn_l2(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);         
-                                break;                                   
-                            default:
-                                printf("no SAFI %u decoder",safi);
-                                if (!vflag)
-                                    print_unknown_data(tptr,"\n\t    ",tlen);                                        
-                                advance = 0;
-                               tptr = pptr + len;
-                                break;
-                            }
-                            break;
-
-
-                       default:
-                            printf("\n\t      no AFI %u decoder ",af);
-                            if (!vflag)
-                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
-                            advance = 0;
-                            tptr = pptr + len;
-                            break;
-                       }
-                       tptr += advance;
+                    case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
+                    case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
+                    case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
+                    case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
+                        advance = decode_labeled_vpn_l2(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
+                    case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
+                    case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
+                        advance = decode_clnp_prefix(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
+                    case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
+                    case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
+                        advance = decode_labeled_vpn_clnp_prefix(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    default:
+                        ND_TCHECK2(*tptr,tlen);
+                        ND_PRINT((ndo, "\n\t    no AFI %u / SAFI %u decoder", af, safi));
+                        if (ndo->ndo_vflag <= 1)
+                            print_unknown_data(ndo, tptr, "\n\t    ", tlen);
+                        advance = 0;
+                        tptr = pptr + len;
+                        break;
+                    }
+                    if (advance < 0)
+                        break;
+                    tptr += advance;
                }
+        done:
                break;
 
        case BGPTYPE_MP_UNREACH_NLRI:
+               ND_TCHECK2(tptr[0], BGP_MP_NLRI_MINSIZE);
                af = EXTRACT_16BITS(tptr);
                safi = tptr[2];
 
-                printf("\n\t    AFI: %s (%u), %sSAFI: %s (%u)",
-                       tok2str(bgp_afi_values, "Unknown AFI", af),
+                ND_PRINT((ndo, "\n\t    AFI: %s (%u), %sSAFI: %s (%u)",
+                       tok2strbuf(af_values, "Unknown AFI", af,
+                                 tokbuf, sizeof(tokbuf)),
                        af,
                        (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
-                       tok2str(bgp_safi_values, "Unknown SAFI", safi),
-                       safi);
+                       tok2strbuf(bgp_safi_values, "Unknown SAFI", safi,
+                                 tokbuf, sizeof(tokbuf)),
+                       safi));
+
+                if (len == BGP_MP_NLRI_MINSIZE)
+                    ND_PRINT((ndo, "\n\t      End-of-Rib Marker (empty NLRI)"));
 
                tptr += 3;
-                
-               while (len - (tptr - pptr) > 0) {
-                       switch (af) {
-                       case AFNUM_INET:
-                            switch (safi) {
-                            case SAFNUM_UNICAST:
-                            case SAFNUM_MULTICAST:
-                            case SAFNUM_UNIMULTICAST:
-                                advance = decode_prefix4(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            case SAFNUM_LABUNICAST:
-                                advance = decode_labeled_prefix4(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            case SAFNUM_VPNUNICAST:
-                            case SAFNUM_VPNMULTICAST:
-                            case SAFNUM_VPNUNIMULTICAST:
-                                advance = decode_labeled_vpn_prefix4(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            default:
-                                printf("\n\t      no SAFI %u decoder",safi);
-                                if (!vflag)
-                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
-                                advance = 0;
-                               tptr = pptr + len;
-                               break;  
-                            }
-                            break;
 
+               while (len - (tptr - pptr) > 0) {
+                    switch (af<<8 | safi) {
+                    case (AFNUM_INET<<8 | SAFNUM_UNICAST):
+                    case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
+                    case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
+                        advance = decode_prefix4(ndo, tptr, len, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else if (advance == -3)
+                            break; /* bytes left, but not enough */
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+                        advance = decode_labeled_prefix4(ndo, tptr, len, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else if (advance == -3)
+                            break; /* bytes left, but not enough */
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
+                    case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
+                    case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+                        advance = decode_labeled_vpn_prefix4(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
 #ifdef INET6
-                       case AFNUM_INET6:
-                            switch (safi) {
-                            case SAFNUM_UNICAST:
-                            case SAFNUM_MULTICAST:
-                            case SAFNUM_UNIMULTICAST:
-                               advance = decode_prefix6(tptr, buf, sizeof(buf));
-                               printf("\n\t      %s", buf);
-                               break;
-                            default:
-                                printf("\n\t      no SAFI %u decoder",safi);
-                                if (!vflag)
-                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
-                                advance = 0;
-                               tptr = pptr + len;
-                               break;
-                            }
-                            break;
+                    case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
+                    case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
+                    case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
+                        advance = decode_prefix6(ndo, tptr, len, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else if (advance == -3)
+                            break; /* bytes left, but not enough */
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+                        advance = decode_labeled_prefix6(ndo, tptr, len, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else if (advance == -3)
+                            break; /* bytes left, but not enough */
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
+                    case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
+                    case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+                        advance = decode_labeled_vpn_prefix6(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
 #endif
-
-                        case AFNUM_L2VPN:
-                            switch(safi) {
-                            case SAFNUM_VPNUNICAST:
-                            case SAFNUM_VPNMULTICAST:
-                            case SAFNUM_VPNUNIMULTICAST:
-                               advance = decode_labeled_vpn_l2(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);         
-                                break;                                   
-                            default:
-                                printf("no SAFI %u decoder",safi);
-                                if (!vflag)
-                                    print_unknown_data(tptr-3,"\n\t    ",tlen);                                        
-                                advance = 0;
-                               tptr = pptr + len;
-                                break;
-                            }
-                            break;
-
-                       default:
-                               printf("\n\t    no AFI %u decoder",af);
-                                if (!vflag)
-                                    print_unknown_data(tptr-3,"\n\t    ",tlen);
-                               advance = 0;
-                               tptr = pptr + len;
-                               break;
-                       }
-
-                       tptr += advance;
+                    case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
+                    case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
+                    case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
+                    case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
+                        advance = decode_labeled_vpn_l2(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
+                    case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
+                    case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
+                        advance = decode_clnp_prefix(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
+                    case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
+                    case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
+                        advance = decode_labeled_vpn_clnp_prefix(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                   case (AFNUM_INET<<8 | SAFNUM_MDT):
+                     advance = decode_mdt_vpn_nlri(ndo, tptr, buf, sizeof(buf));
+                     if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                      break;
+                    case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
+                    case (AFNUM_INET6<<8 | SAFNUM_MULTICAST_VPN):
+                        advance = decode_multicast_vpn(ndo, tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            ND_PRINT((ndo, "\n\t      %s", buf));
+                        break;
+                    default:
+                        ND_TCHECK2(*(tptr-3),tlen);
+                        ND_PRINT((ndo, "no AFI %u / SAFI %u decoder", af, safi));
+                        if (ndo->ndo_vflag <= 1)
+                            print_unknown_data(ndo, tptr-3, "\n\t    ", tlen);
+                        advance = 0;
+                        tptr = pptr + len;
+                        break;
+                    }
+                    if (advance < 0)
+                        break;
+                    tptr += advance;
                }
                break;
         case BGPTYPE_EXTD_COMMUNITIES:
                if (len % 8) {
-                       printf("invalid len");
+                       ND_PRINT((ndo, "invalid len"));
                        break;
                }
                 while (tlen>0) {
-                    u_int8_t extd_comm,extd_comm_type,extd_comm_subtype;
-                    extd_comm=*tptr;
-                    extd_comm_type=extd_comm&0x3f;
-                    extd_comm_subtype=*(tptr+1);
-                    switch(extd_comm_type) {
-                        case 0:
-                            switch (extd_comm_subtype) {
-                            case 2:
-                            case 3:
-                            case 4:
-                                printf("\n\t    %s%s%s:%u:%s",
-                                       (extd_comm&0x80) ? "vendor-specific: " : "",
-                                       (extd_comm&0x40) ? "non-transitive: " : "",
-                                       tok2str(bgp_extd_comm_subtype_values,
-                                               "unknown",
-                                               extd_comm_subtype&0x3f),
-                                       EXTRACT_16BITS(tptr+2),
-                                       getname(tptr+4));
-                                break;
-                            /* juniper has allocated typecode 10 to convey l2 information */
-                            case 10:
-                                printf("\n\t    %s%s:%s:Control Flags [0x%02x]:MTU %u",
-                                       (extd_comm&0x40) ? "non-transitive: " : "",
-                                       tok2str(bgp_extd_comm_subtype_values,
-                                               "unknown",
-                                               extd_comm_subtype&0x3f),
-                                       tok2str(bgp_l2vpn_encaps_values,
-                                               "unknown encaps",
-                                               *(tptr+2)),
+                    uint16_t extd_comm;
+
+                    ND_TCHECK2(tptr[0], 2);
+                    extd_comm=EXTRACT_16BITS(tptr);
+
+                   ND_PRINT((ndo, "\n\t    %s (0x%04x), Flags [%s]",
+                          tok2strbuf(bgp_extd_comm_subtype_values,
+                                     "unknown extd community typecode",
+                                     extd_comm, tokbuf, sizeof(tokbuf)),
+                          extd_comm,
+                          bittok2str(bgp_extd_comm_flag_values, "none", extd_comm)));
+
+                    ND_TCHECK2(*(tptr+2), 6);
+                    switch(extd_comm) {
+                    case BGP_EXT_COM_RT_0:
+                    case BGP_EXT_COM_RO_0:
+                    case BGP_EXT_COM_L2VPN_RT_0:
+                        ND_PRINT((ndo, ": %u:%u (= %s)",
+                               EXTRACT_16BITS(tptr+2),
+                               EXTRACT_32BITS(tptr+4),
+                               getname(ndo, tptr+4)));
+                        break;
+                    case BGP_EXT_COM_RT_1:
+                    case BGP_EXT_COM_RO_1:
+                    case BGP_EXT_COM_L2VPN_RT_1:
+                    case BGP_EXT_COM_VRF_RT_IMP:
+                        ND_PRINT((ndo, ": %s:%u",
+                               getname(ndo, tptr+2),
+                               EXTRACT_16BITS(tptr+6)));
+                        break;
+                    case BGP_EXT_COM_RT_2:
+                    case BGP_EXT_COM_RO_2:
+                       ND_PRINT((ndo, ": %s:%u",
+                           as_printf(ndo, astostr, sizeof(astostr),
+                           EXTRACT_32BITS(tptr+2)), EXTRACT_16BITS(tptr+6)));
+                       break;
+                    case BGP_EXT_COM_LINKBAND:
+                       bw.i = EXTRACT_32BITS(tptr+2);
+                        ND_PRINT((ndo, ": bandwidth: %.3f Mbps",
+                               bw.f*8/1000000));
+                        break;
+                    case BGP_EXT_COM_VPN_ORIGIN:
+                    case BGP_EXT_COM_VPN_ORIGIN2:
+                    case BGP_EXT_COM_VPN_ORIGIN3:
+                    case BGP_EXT_COM_VPN_ORIGIN4:
+                    case BGP_EXT_COM_OSPF_RID:
+                    case BGP_EXT_COM_OSPF_RID2:
+                        ND_PRINT((ndo, "%s", getname(ndo, tptr+2)));
+                        break;
+                    case BGP_EXT_COM_OSPF_RTYPE:
+                    case BGP_EXT_COM_OSPF_RTYPE2:
+                        ND_PRINT((ndo, ": area:%s, router-type:%s, metric-type:%s%s",
+                               getname(ndo, tptr+2),
+                               tok2strbuf(bgp_extd_comm_ospf_rtype_values,
+                                         "unknown (0x%02x)",
+                                         *(tptr+6),
+                                         tokbuf, sizeof(tokbuf)),
+                               (*(tptr+7) &  BGP_OSPF_RTYPE_METRIC_TYPE) ? "E2" : "",
+                               ((*(tptr+6) == BGP_OSPF_RTYPE_EXT) || (*(tptr+6) == BGP_OSPF_RTYPE_NSSA)) ? "E1" : ""));
+                        break;
+                    case BGP_EXT_COM_L2INFO:
+                        ND_PRINT((ndo, ": %s Control Flags [0x%02x]:MTU %u",
+                               tok2strbuf(l2vpn_encaps_values,
+                                         "unknown encaps",
+                                         *(tptr+2),
+                                         tokbuf, sizeof(tokbuf)),
                                        *(tptr+3),
-                                       EXTRACT_16BITS(tptr+4));
-                                break;
-                            }
-                            break;
-                        case 1:
-                            printf("\n\t    %s%s%s:%s:%u",
-                                   (extd_comm&0x80) ? "vendor-specific: " : "",
-                                   (extd_comm&0x40) ? "non-transitive: " : "",
-                                   tok2str(bgp_extd_comm_subtype_values,
-                                           "unknown",
-                                           extd_comm_subtype&0x3f),
-                                   getname(tptr+2),
-                                   EXTRACT_16BITS(tptr+6));
-                            break;
-                        case 2:
-                            printf("\n\t    %s%s%s:%u:%u",
-                                   (extd_comm&0x80) ? "vendor-specific: " : "",
-                                   (extd_comm&0x40) ? "non-transitive: " : "",
-                                   tok2str(bgp_extd_comm_subtype_values,
-                                           "unknown",
-                                           extd_comm_subtype&0x3f),
-                                   EXTRACT_32BITS(tptr+2),
-                                   EXTRACT_16BITS(tptr+6));
-                            break;
-                        default:
-                            printf("\n\t      no typecode %u decoder",
-                               extd_comm_type);
-                            print_unknown_data(tptr,"\n\t      ",8);
-                            break;
+                               EXTRACT_16BITS(tptr+4)));
+                        break;
+                    case BGP_EXT_COM_SOURCE_AS:
+                        ND_PRINT((ndo, ": AS %u", EXTRACT_16BITS(tptr+2)));
+                        break;
+                    default:
+                        ND_TCHECK2(*tptr,8);
+                        print_unknown_data(ndo, tptr, "\n\t      ", 8);
+                        break;
                     }
                     tlen -=8;
                     tptr +=8;
                 }
                 break;
 
+        case BGPTYPE_PMSI_TUNNEL:
+        {
+                uint8_t tunnel_type, flags;
+
+                tunnel_type = *(tptr+1);
+                flags = *tptr;
+                tlen = len;
+
+                ND_TCHECK2(tptr[0], 5);
+                ND_PRINT((ndo, "\n\t    Tunnel-type %s (%u), Flags [%s], MPLS Label %u",
+                       tok2str(bgp_pmsi_tunnel_values, "Unknown", tunnel_type),
+                       tunnel_type,
+                       bittok2str(bgp_pmsi_flag_values, "none", flags),
+                       EXTRACT_24BITS(tptr+2)>>4));
+
+                tptr +=5;
+                tlen -= 5;
+
+                switch (tunnel_type) {
+                case BGP_PMSI_TUNNEL_PIM_SM: /* fall through */
+                case BGP_PMSI_TUNNEL_PIM_BIDIR:
+                    ND_TCHECK2(tptr[0], 8);
+                    ND_PRINT((ndo, "\n\t      Sender %s, P-Group %s",
+                           ipaddr_string(ndo, tptr),
+                           ipaddr_string(ndo, tptr+4)));
+                    break;
+
+                case BGP_PMSI_TUNNEL_PIM_SSM:
+                    ND_TCHECK2(tptr[0], 8);
+                    ND_PRINT((ndo, "\n\t      Root-Node %s, P-Group %s",
+                           ipaddr_string(ndo, tptr),
+                           ipaddr_string(ndo, tptr+4)));
+                    break;
+                case BGP_PMSI_TUNNEL_INGRESS:
+                    ND_TCHECK2(tptr[0], 4);
+                    ND_PRINT((ndo, "\n\t      Tunnel-Endpoint %s",
+                           ipaddr_string(ndo, tptr)));
+                    break;
+                case BGP_PMSI_TUNNEL_LDP_P2MP: /* fall through */
+                case BGP_PMSI_TUNNEL_LDP_MP2MP:
+                    ND_TCHECK2(tptr[0], 8);
+                    ND_PRINT((ndo, "\n\t      Root-Node %s, LSP-ID 0x%08x",
+                           ipaddr_string(ndo, tptr),
+                           EXTRACT_32BITS(tptr+4)));
+                    break;
+                case BGP_PMSI_TUNNEL_RSVP_P2MP:
+                    ND_TCHECK2(tptr[0], 8);
+                    ND_PRINT((ndo, "\n\t      Extended-Tunnel-ID %s, P2MP-ID 0x%08x",
+                           ipaddr_string(ndo, tptr),
+                           EXTRACT_32BITS(tptr+4)));
+                    break;
+                default:
+                    if (ndo->ndo_vflag <= 1) {
+                        print_unknown_data(ndo, tptr, "\n\t      ", tlen);
+                    }
+                }
+                break;
+        }
+        case BGPTYPE_ATTR_SET:
+                ND_TCHECK2(tptr[0], 4);
+                if (len < 4)
+                       goto trunc;
+               ND_PRINT((ndo, "\n\t    Origin AS: %s",
+                   as_printf(ndo, astostr, sizeof(astostr), EXTRACT_32BITS(tptr))));
+               tptr+=4;
+                len -=4;
+
+                while (len) {
+                    u_int aflags, atype, alenlen, alen;
+
+                    ND_TCHECK2(tptr[0], 2);
+                    if (len < 2)
+                        goto trunc;
+                    aflags = *tptr;
+                    atype = *(tptr + 1);
+                    tptr += 2;
+                    len -= 2;
+                    alenlen = bgp_attr_lenlen(aflags, tptr);
+                    ND_TCHECK2(tptr[0], alenlen);
+                    if (len < alenlen)
+                        goto trunc;
+                    alen = bgp_attr_len(aflags, tptr);
+                    tptr += alenlen;
+                    len -= alenlen;
+
+                    ND_PRINT((ndo, "\n\t      %s (%u), length: %u",
+                           tok2strbuf(bgp_attr_values,
+                                      "Unknown Attribute", atype,
+                                      tokbuf, sizeof(tokbuf)),
+                           atype,
+                           alen));
+
+                    if (aflags) {
+                        ND_PRINT((ndo, ", Flags [%s%s%s%s",
+                               aflags & 0x80 ? "O" : "",
+                               aflags & 0x40 ? "T" : "",
+                               aflags & 0x20 ? "P" : "",
+                               aflags & 0x10 ? "E" : ""));
+                        if (aflags & 0xf)
+                            ND_PRINT((ndo, "+%x", aflags & 0xf));
+                        ND_PRINT((ndo, "]: "));
+                    }
+                    /* FIXME check for recursion */
+                    if (!bgp_attr_print(ndo, atype, tptr, alen))
+                        return 0;
+                    tptr += alen;
+                    len -= alen;
+               }
+                break;
+
+
        default:
-            printf("\n\t    no Attribute %u decoder",attr->bgpa_type); /* we have no decoder for the attribute */
-            if (!vflag)
-                print_unknown_data(pptr,"\n\t    ",len);
+           ND_TCHECK2(*pptr,len);
+            ND_PRINT((ndo, "\n\t    no Attribute %u decoder", atype)); /* we have no decoder for the attribute */
+            if (ndo->ndo_vflag <= 1)
+                print_unknown_data(ndo, pptr, "\n\t    ", len);
             break;
        }
-        if (vflag&&len) /* omit zero length attributes*/
-            print_unknown_data(pptr,"\n\t    ",len);
+        if (ndo->ndo_vflag > 1 && len) { /* omit zero length attributes*/
+            ND_TCHECK2(*pptr,len);
+            print_unknown_data(ndo, pptr, "\n\t    ", len);
+        }
+        return 1;
+
+trunc:
+        return 0;
+}
+
+static void
+bgp_capabilities_print(netdissect_options *ndo,
+                       const u_char *opt, int caps_len)
+{
+       char tokbuf[TOKBUFSIZE];
+       char tokbuf2[TOKBUFSIZE];
+       int cap_type, cap_len, tcap_len, cap_offset;
+        int i = 0;
+
+        while (i < caps_len) {
+                ND_TCHECK2(opt[i], BGP_CAP_HEADER_SIZE);
+                cap_type=opt[i];
+                cap_len=opt[i+1];
+                tcap_len=cap_len;
+                ND_PRINT((ndo, "\n\t      %s (%u), length: %u",
+                       tok2strbuf(bgp_capcode_values, "Unknown",
+                                  cap_type, tokbuf, sizeof(tokbuf)),
+                       cap_type,
+                       cap_len));
+                ND_TCHECK2(opt[i+2], cap_len);
+                switch (cap_type) {
+                case BGP_CAPCODE_MP:
+                    ND_PRINT((ndo, "\n\t\tAFI %s (%u), SAFI %s (%u)",
+                           tok2strbuf(af_values, "Unknown",
+                                      EXTRACT_16BITS(opt+i+2),
+                                      tokbuf, sizeof(tokbuf)),
+                           EXTRACT_16BITS(opt+i+2),
+                           tok2strbuf(bgp_safi_values, "Unknown",
+                                      opt[i+5],
+                                      tokbuf, sizeof(tokbuf)),
+                           opt[i+5]));
+                    break;
+                case BGP_CAPCODE_RESTART:
+                    ND_PRINT((ndo, "\n\t\tRestart Flags: [%s], Restart Time %us",
+                           ((opt[i+2])&0x80) ? "R" : "none",
+                           EXTRACT_16BITS(opt+i+2)&0xfff));
+                    tcap_len-=2;
+                    cap_offset=4;
+                    while(tcap_len>=4) {
+                        ND_PRINT((ndo, "\n\t\t  AFI %s (%u), SAFI %s (%u), Forwarding state preserved: %s",
+                               tok2strbuf(af_values,"Unknown",
+                                          EXTRACT_16BITS(opt+i+cap_offset),
+                                          tokbuf, sizeof(tokbuf)),
+                               EXTRACT_16BITS(opt+i+cap_offset),
+                               tok2strbuf(bgp_safi_values,"Unknown",
+                                          opt[i+cap_offset+2],
+                                          tokbuf2, sizeof(tokbuf2)),
+                               opt[i+cap_offset+2],
+                               ((opt[i+cap_offset+3])&0x80) ? "yes" : "no" ));
+                        tcap_len-=4;
+                        cap_offset+=4;
+                    }
+                    break;
+                case BGP_CAPCODE_RR:
+                case BGP_CAPCODE_RR_CISCO:
+                    break;
+                case BGP_CAPCODE_AS_NEW:
+
+                    /*
+                     * Extract the 4 byte AS number encoded.
+                     */
+                    if (cap_len == 4) {
+                        ND_PRINT((ndo, "\n\t\t 4 Byte AS %s",
+                            as_printf(ndo, astostr, sizeof(astostr),
+                            EXTRACT_32BITS(opt + i + 2))));
+                    }
+                    break;
+                default:
+                    ND_PRINT((ndo, "\n\t\tno decoder for Capability %u",
+                           cap_type));
+                    if (ndo->ndo_vflag <= 1)
+                        print_unknown_data(ndo, &opt[i+2], "\n\t\t", cap_len);
+                    break;
+                }
+                if (ndo->ndo_vflag > 1 && cap_len > 0) {
+                    print_unknown_data(ndo, &opt[i+2], "\n\t\t", cap_len);
+                }
+                i += BGP_CAP_HEADER_SIZE + cap_len;
+        }
+        return;
+
+trunc:
+       ND_PRINT((ndo, "[|BGP]"));
 }
 
 static void
-bgp_open_print(const u_char *dat, int length)
+bgp_open_print(netdissect_options *ndo,
+               const u_char *dat, int length)
 {
        struct bgp_open bgpo;
        struct bgp_opt bgpopt;
-       int hlen;
        const u_char *opt;
-       int i,cap_type,cap_len;
+       int i;
+       char tokbuf[TOKBUFSIZE];
 
-       TCHECK2(dat[0], BGP_OPEN_SIZE);
+       ND_TCHECK2(dat[0], BGP_OPEN_SIZE);
        memcpy(&bgpo, dat, BGP_OPEN_SIZE);
-       hlen = ntohs(bgpo.bgpo_len);
 
-       printf("\n\t  Version %d, ", bgpo.bgpo_version);
-       printf("my AS %u, ", ntohs(bgpo.bgpo_myas));
-       printf("Holdtime %us, ", ntohs(bgpo.bgpo_holdtime));
-       printf("ID %s", getname((u_char *)&bgpo.bgpo_id));
-       printf("\n\t  Optional parameters, length: %u", bgpo.bgpo_optlen);
+       ND_PRINT((ndo, "\n\t  Version %d, ", bgpo.bgpo_version));
+       ND_PRINT((ndo, "my AS %s, ",
+           as_printf(ndo, astostr, sizeof(astostr), ntohs(bgpo.bgpo_myas))));
+       ND_PRINT((ndo, "Holdtime %us, ", ntohs(bgpo.bgpo_holdtime)));
+       ND_PRINT((ndo, "ID %s", getname(ndo, (u_char *)&bgpo.bgpo_id)));
+       ND_PRINT((ndo, "\n\t  Optional parameters, length: %u", bgpo.bgpo_optlen));
+
+        /* some little sanity checking */
+        if (length < bgpo.bgpo_optlen+BGP_OPEN_SIZE)
+            return;
 
        /* ugly! */
        opt = &((const struct bgp_open *)dat)->bgpo_optlen;
@@ -1046,170 +2333,278 @@ bgp_open_print(const u_char *dat, int length)
 
        i = 0;
        while (i < bgpo.bgpo_optlen) {
-               TCHECK2(opt[i], BGP_OPT_SIZE);
+               ND_TCHECK2(opt[i], BGP_OPT_SIZE);
                memcpy(&bgpopt, &opt[i], BGP_OPT_SIZE);
                if (i + 2 + bgpopt.bgpopt_len > bgpo.bgpo_optlen) {
-                        printf("\n\t     Option %d, length: %u", bgpopt.bgpopt_type, bgpopt.bgpopt_len);
+                       ND_PRINT((ndo, "\n\t     Option %d, length: %u", bgpopt.bgpopt_type, bgpopt.bgpopt_len));
                        break;
                }
 
-               printf("\n\t    Option %s (%u), length: %u",
-                       tok2str(bgp_opt_values,"Unknown", bgpopt.bgpopt_type),
-                       bgpopt.bgpopt_type,
-                       bgpopt.bgpopt_len);
-
-                /* now lets decode the options we know*/
-                switch(bgpopt.bgpopt_type) {
-                case BGP_OPT_CAP:
-                    cap_type=opt[i+BGP_OPT_SIZE];
-                    cap_len=opt[i+BGP_OPT_SIZE+1];
-                    printf("\n\t      %s, length: %u",
-                           tok2str(bgp_capcode_values,"Unknown", cap_type),
-                           cap_len);
-                    switch(cap_type) {
-                    case BGP_CAPCODE_MP:
-                        printf("\n\t\tAFI %s (%u), SAFI %s (%u)",
-                               tok2str(bgp_afi_values,"Unknown", EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+2)),
-                               EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+2),
-                               tok2str(bgp_safi_values,"Unknown", opt[i+BGP_OPT_SIZE+5]),
-                               opt[i+BGP_OPT_SIZE+5]);
-                        break;
-                    case BGP_CAPCODE_RR:
-                    case BGP_CAPCODE_RR_CISCO:
-                        break;
-                    default:
-                        printf("\n\t\tno decoder for Capability %u",
-                               cap_type);
-                        break;
-                    }
-                    break;
-                case BGP_OPT_AUTH:
-                default:
-                       printf("\n\t      no decoder for option %u",
-                           bgpopt.bgpopt_type);
-                       break;
-                }
+               ND_PRINT((ndo, "\n\t    Option %s (%u), length: %u",
+                      tok2strbuf(bgp_opt_values,"Unknown",
+                                 bgpopt.bgpopt_type,
+                                 tokbuf, sizeof(tokbuf)),
+                      bgpopt.bgpopt_type,
+                      bgpopt.bgpopt_len));
+
+               /* now let's decode the options we know*/
+               switch(bgpopt.bgpopt_type) {
+
+               case BGP_OPT_CAP:
+                       bgp_capabilities_print(ndo, &opt[i+BGP_OPT_SIZE],
+                           bgpopt.bgpopt_len);
+                       break;
 
+               case BGP_OPT_AUTH:
+               default:
+                      ND_PRINT((ndo, "\n\t      no decoder for option %u",
+                          bgpopt.bgpopt_type));
+                      break;
+               }
                i += BGP_OPT_SIZE + bgpopt.bgpopt_len;
        }
        return;
 trunc:
-       printf("[|BGP]");
+       ND_PRINT((ndo, "[|BGP]"));
 }
 
 static void
-bgp_update_print(const u_char *dat, int length)
+bgp_update_print(netdissect_options *ndo,
+                 const u_char *dat, int length)
 {
        struct bgp bgp;
-       struct bgp_attr bgpa;
-       int hlen;
        const u_char *p;
+       int withdrawn_routes_len;
        int len;
        int i;
+       char tokbuf[TOKBUFSIZE];
+#ifndef INET6
+       char buf[MAXHOSTNAMELEN + 100];
+       int wpfx;
+#endif
 
-       TCHECK2(dat[0], BGP_SIZE);
+       ND_TCHECK2(dat[0], BGP_SIZE);
+       if (length < BGP_SIZE)
+               goto trunc;
        memcpy(&bgp, dat, BGP_SIZE);
-       hlen = ntohs(bgp.bgp_len);
        p = dat + BGP_SIZE;     /*XXX*/
+       length -= BGP_SIZE;
 
        /* Unfeasible routes */
-       len = EXTRACT_16BITS(p);
-       if (len) {
+       ND_TCHECK2(p[0], 2);
+       if (length < 2)
+               goto trunc;
+       withdrawn_routes_len = EXTRACT_16BITS(p);
+       p += 2;
+       length -= 2;
+       if (withdrawn_routes_len) {
                /*
                 * Without keeping state from the original NLRI message,
                 * it's not possible to tell if this a v4 or v6 route,
                 * so only try to decode it if we're not v6 enabled.
                 */
+               ND_TCHECK2(p[0], withdrawn_routes_len);
+               if (length < withdrawn_routes_len)
+                       goto trunc;
 #ifdef INET6
-               printf("\n\t  Withdrawn routes: %d bytes", len);
+               ND_PRINT((ndo, "\n\t  Withdrawn routes: %d bytes", withdrawn_routes_len));
+               p += withdrawn_routes_len;
+               length -= withdrawn_routes_len;
 #else
-               char buf[MAXHOSTNAMELEN + 100];
+               if (withdrawn_routes_len < 2)
+                       goto trunc;
+               length -= 2;
+               withdrawn_routes_len -= 2;
 
-               TCHECK2(p[2], len);
-               i = 2;
 
-               printf("\n\t  Withdrawn routes:");
+               ND_PRINT((ndo, "\n\t  Withdrawn routes:"));
 
-               while(i < 2 + len) {
-                       i += decode_prefix4(&p[i], buf, sizeof(buf));
-                       printf("\n\t    %s", buf);
+               while(withdrawn_routes_len > 0) {
+                       wpfx = decode_prefix4(ndo, p, withdrawn_routes_len, buf, sizeof(buf));
+                       if (wpfx == -1) {
+                               ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
+                               break;
+                       } else if (wpfx == -2)
+                               goto trunc;
+                       else if (wpfx == -3)
+                               goto trunc; /* bytes left, but not enough */
+                       else {
+                               ND_PRINT((ndo, "\n\t    %s", buf));
+                               p += wpfx;
+                               length -= wpfx;
+                               withdrawn_routes_len -= wpfx;
+                       }
                }
 #endif
        }
-       p += 2 + len;
 
-       TCHECK2(p[0], 2);
+       ND_TCHECK2(p[0], 2);
+       if (length < 2)
+               goto trunc;
        len = EXTRACT_16BITS(p);
+       p += 2;
+       length -= 2;
+
+        if (withdrawn_routes_len == 0 && len == 0 && length == 0) {
+            /* No withdrawn routes, no path attributes, no NLRI */
+            ND_PRINT((ndo, "\n\t  End-of-Rib Marker (empty NLRI)"));
+            return;
+        }
+
        if (len) {
                /* do something more useful!*/
-               i = 2;
-               while (i < 2 + len) {
-                       int alen, aoff;
-
-                       TCHECK2(p[i], sizeof(bgpa));
-                       memcpy(&bgpa, &p[i], sizeof(bgpa));
-                       alen = bgp_attr_len(&bgpa);
-                       aoff = bgp_attr_off(&bgpa);
-
-                      printf("\n\t  %s (%u), length: %u",
-                              tok2str(bgp_attr_values, "Unknown Attribute", bgpa.bgpa_type),
-                              bgpa.bgpa_type,
-                              alen);
-
-                       if (bgpa.bgpa_flags) {
-                               printf(", flags [%s%s%s%s",
-                                       bgpa.bgpa_flags & 0x80 ? "O" : "",
-                                       bgpa.bgpa_flags & 0x40 ? "T" : "",
-                                       bgpa.bgpa_flags & 0x20 ? "P" : "",
-                                       bgpa.bgpa_flags & 0x10 ? "E" : "");
-                               if (bgpa.bgpa_flags & 0xf)
-                                       printf("+%x", bgpa.bgpa_flags & 0xf);
-                               printf("]: ");
+               while (len) {
+                       int aflags, atype, alenlen, alen;
+
+                       ND_TCHECK2(p[0], 2);
+                       if (len < 2)
+                           goto trunc;
+                       if (length < 2)
+                           goto trunc;
+                       aflags = *p;
+                       atype = *(p + 1);
+                       p += 2;
+                       len -= 2;
+                       length -= 2;
+                       alenlen = bgp_attr_lenlen(aflags, p);
+                       ND_TCHECK2(p[0], alenlen);
+                       if (len < alenlen)
+                           goto trunc;
+                       if (length < alenlen)
+                           goto trunc;
+                       alen = bgp_attr_len(aflags, p);
+                       p += alenlen;
+                       len -= alenlen;
+                       length -= alenlen;
+
+                       ND_PRINT((ndo, "\n\t  %s (%u), length: %u",
+                              tok2strbuf(bgp_attr_values, "Unknown Attribute",
+                                        atype,
+                                        tokbuf, sizeof(tokbuf)),
+                              atype,
+                              alen));
+
+                       if (aflags) {
+                               ND_PRINT((ndo, ", Flags [%s%s%s%s",
+                                       aflags & 0x80 ? "O" : "",
+                                       aflags & 0x40 ? "T" : "",
+                                       aflags & 0x20 ? "P" : "",
+                                       aflags & 0x10 ? "E" : ""));
+                               if (aflags & 0xf)
+                                       ND_PRINT((ndo, "+%x", aflags & 0xf));
+                               ND_PRINT((ndo, "]: "));
                        }
-                       bgp_attr_print(&bgpa, &p[i + aoff], alen);
-                       i += aoff + alen;
+                       if (len < alen)
+                               goto trunc;
+                       if (length < alen)
+                               goto trunc;
+                       if (!bgp_attr_print(ndo, atype, p, alen))
+                               goto trunc;
+                       p += alen;
+                       len -= alen;
+                       length -= alen;
                }
        }
-       p += 2 + len;
 
-       if (dat + length > p) {
-            printf("\n\t  Updated routes:");
-               while (dat + length > p) {
+       if (length) {
+               /*
+                * XXX - what if they're using the "Advertisement of
+                * Multiple Paths in BGP" feature:
+                *
+                * https://datatracker.ietf.org/doc/draft-ietf-idr-add-paths/
+                *
+                * http://tools.ietf.org/html/draft-ietf-idr-add-paths-06
+                */
+               ND_PRINT((ndo, "\n\t  Updated routes:"));
+               while (length) {
                        char buf[MAXHOSTNAMELEN + 100];
-                       i = decode_prefix4(p, buf, sizeof(buf));
-                       printf("\n\t    %s", buf);
-                       if (i < 0)
+                       i = decode_prefix4(ndo, p, length, buf, sizeof(buf));
+                       if (i == -1) {
+                               ND_PRINT((ndo, "\n\t    (illegal prefix length)"));
                                break;
-                       p += i;
+                       } else if (i == -2)
+                               goto trunc;
+                       else if (i == -3)
+                               goto trunc; /* bytes left, but not enough */
+                       else {
+                               ND_PRINT((ndo, "\n\t    %s", buf));
+                               p += i;
+                               length -= i;
+                       }
                }
        }
        return;
 trunc:
-       printf("[|BGP]");
+       ND_PRINT((ndo, "[|BGP]"));
 }
 
 static void
-bgp_notification_print(const u_char *dat, int length)
+bgp_notification_print(netdissect_options *ndo,
+                       const u_char *dat, int length)
 {
        struct bgp_notification bgpn;
-       int hlen;
+       const u_char *tptr;
+       char tokbuf[TOKBUFSIZE];
+       char tokbuf2[TOKBUFSIZE];
 
-       TCHECK2(dat[0], BGP_NOTIFICATION_SIZE);
+       ND_TCHECK2(dat[0], BGP_NOTIFICATION_SIZE);
        memcpy(&bgpn, dat, BGP_NOTIFICATION_SIZE);
-       hlen = ntohs(bgpn.bgpn_len);
 
-       printf(", Error - %s", tok2str(bgp_notify_major_values, "Unknown", bgpn.bgpn_major));
+        /* some little sanity checking */
+        if (length<BGP_NOTIFICATION_SIZE)
+            return;
+
+       ND_PRINT((ndo, ", %s (%u)",
+              tok2strbuf(bgp_notify_major_values, "Unknown Error",
+                         bgpn.bgpn_major, tokbuf, sizeof(tokbuf)),
+              bgpn.bgpn_major));
 
         switch (bgpn.bgpn_major) {
 
         case BGP_NOTIFY_MAJOR_MSG:
-            printf(" subcode %s", tok2str(bgp_notify_minor_msg_values, "Unknown", bgpn.bgpn_minor));
+            ND_PRINT((ndo, ", subcode %s (%u)",
+                  tok2strbuf(bgp_notify_minor_msg_values, "Unknown",
+                             bgpn.bgpn_minor, tokbuf, sizeof(tokbuf)),
+                  bgpn.bgpn_minor));
             break;
         case BGP_NOTIFY_MAJOR_OPEN:
-            printf(" subcode %s", tok2str(bgp_notify_minor_open_values, "Unknown", bgpn.bgpn_minor));
+            ND_PRINT((ndo, ", subcode %s (%u)",
+                  tok2strbuf(bgp_notify_minor_open_values, "Unknown",
+                             bgpn.bgpn_minor, tokbuf, sizeof(tokbuf)),
+                  bgpn.bgpn_minor));
             break;
         case BGP_NOTIFY_MAJOR_UPDATE:
-            printf(" subcode %s", tok2str(bgp_notify_minor_update_values, "Unknown", bgpn.bgpn_minor));
+            ND_PRINT((ndo, ", subcode %s (%u)",
+                  tok2strbuf(bgp_notify_minor_update_values, "Unknown",
+                             bgpn.bgpn_minor, tokbuf, sizeof(tokbuf)),
+                  bgpn.bgpn_minor));
+            break;
+        case BGP_NOTIFY_MAJOR_CAP:
+            ND_PRINT((ndo, " subcode %s (%u)",
+                  tok2strbuf(bgp_notify_minor_cap_values, "Unknown",
+                             bgpn.bgpn_minor, tokbuf, sizeof(tokbuf)),
+                  bgpn.bgpn_minor));
+        case BGP_NOTIFY_MAJOR_CEASE:
+            ND_PRINT((ndo, ", subcode %s (%u)",
+                  tok2strbuf(bgp_notify_minor_cease_values, "Unknown",
+                             bgpn.bgpn_minor, tokbuf, sizeof(tokbuf)),
+                  bgpn.bgpn_minor));
+
+           /* draft-ietf-idr-cease-subcode-02 mentions optionally 7 bytes
+             * for the maxprefix subtype, which may contain AFI, SAFI and MAXPREFIXES
+             */
+           if(bgpn.bgpn_minor == BGP_NOTIFY_MINOR_CEASE_MAXPRFX && length >= BGP_NOTIFICATION_SIZE + 7) {
+               tptr = dat + BGP_NOTIFICATION_SIZE;
+               ND_TCHECK2(*tptr, 7);
+               ND_PRINT((ndo, ", AFI %s (%u), SAFI %s (%u), Max Prefixes: %u",
+                      tok2strbuf(af_values, "Unknown",
+                                 EXTRACT_16BITS(tptr), tokbuf, sizeof(tokbuf)),
+                      EXTRACT_16BITS(tptr),
+                      tok2strbuf(bgp_safi_values, "Unknown", *(tptr+2),
+                                 tokbuf2, sizeof(tokbuf)),
+                      *(tptr+2),
+                      EXTRACT_32BITS(tptr+3)));
+           }
             break;
         default:
             break;
@@ -1217,69 +2612,93 @@ bgp_notification_print(const u_char *dat, int length)
 
        return;
 trunc:
-       printf("[|BGP]");
+       ND_PRINT((ndo, "[|BGP]"));
 }
 
 static void
-bgp_route_refresh_print(const u_char *pptr, int len) {
+bgp_route_refresh_print(netdissect_options *ndo,
+                        const u_char *pptr, int len) {
 
         const struct bgp_route_refresh *bgp_route_refresh_header;
+       char tokbuf[TOKBUFSIZE];
+       char tokbuf2[TOKBUFSIZE];
+
+       ND_TCHECK2(pptr[0], BGP_ROUTE_REFRESH_SIZE);
+
+        /* some little sanity checking */
+        if (len<BGP_ROUTE_REFRESH_SIZE)
+            return;
+
         bgp_route_refresh_header = (const struct bgp_route_refresh *)pptr;
 
-        printf("\n\t  AFI %s (%u), SAFI %s (%u)",
-               tok2str(bgp_afi_values,"Unknown",
-                       EXTRACT_16BITS(&bgp_route_refresh_header->afi)), /* this stinks but the compiler pads the structure weird */
+        ND_PRINT((ndo, "\n\t  AFI %s (%u), SAFI %s (%u)",
+               tok2strbuf(af_values,"Unknown",
+                         /* this stinks but the compiler pads the structure
+                          * weird */
+                         EXTRACT_16BITS(&bgp_route_refresh_header->afi),
+                         tokbuf, sizeof(tokbuf)),
                EXTRACT_16BITS(&bgp_route_refresh_header->afi),
-               tok2str(bgp_safi_values,"Unknown",
-                       bgp_route_refresh_header->safi),
-               bgp_route_refresh_header->safi);
+               tok2strbuf(bgp_safi_values,"Unknown",
+                         bgp_route_refresh_header->safi,
+                         tokbuf2, sizeof(tokbuf2)),
+               bgp_route_refresh_header->safi));
+
+        if (ndo->ndo_vflag > 1) {
+            ND_TCHECK2(*pptr, len);
+            print_unknown_data(ndo, pptr, "\n\t  ", len);
+        }
 
-        if (vflag)
-            print_unknown_data(pptr,"\n\t  ", len);
-        
         return;
+trunc:
+       ND_PRINT((ndo, "[|BGP]"));
 }
 
-static void
-bgp_header_print(const u_char *dat, int length)
+static int
+bgp_header_print(netdissect_options *ndo,
+                 const u_char *dat, int length)
 {
        struct bgp bgp;
+       char tokbuf[TOKBUFSIZE];
 
-       TCHECK2(dat[0], BGP_SIZE);
+       ND_TCHECK2(dat[0], BGP_SIZE);
        memcpy(&bgp, dat, BGP_SIZE);
-       printf("\n\t%s Message (%u), length: %u ",
-               tok2str(bgp_msg_values, "Unknown", bgp.bgp_type),
+       ND_PRINT((ndo, "\n\t%s Message (%u), length: %u",
+               tok2strbuf(bgp_msg_values, "Unknown", bgp.bgp_type,
+                         tokbuf, sizeof(tokbuf)),
                bgp.bgp_type,
-               length);
+               length));
 
        switch (bgp.bgp_type) {
        case BGP_OPEN:
-               bgp_open_print(dat, length);
+               bgp_open_print(ndo, dat, length);
                break;
        case BGP_UPDATE:
-               bgp_update_print(dat, length);
+               bgp_update_print(ndo, dat, length);
                break;
        case BGP_NOTIFICATION:
-               bgp_notification_print(dat, length);
+               bgp_notification_print(ndo, dat, length);
                break;
         case BGP_KEEPALIVE:
                 break;
         case BGP_ROUTE_REFRESH:
-                bgp_route_refresh_print(dat, length);
+                bgp_route_refresh_print(ndo, dat, length);
                 break;
         default:
-            /* we have no decoder for the BGP message */
-            printf("\n\t  no Message %u decoder",bgp.bgp_type);
-            print_unknown_data(dat,"\n\t  ",length);
+                /* we have no decoder for the BGP message */
+                ND_TCHECK2(*dat, length);
+                ND_PRINT((ndo, "\n\t  no Message %u decoder", bgp.bgp_type));
+                print_unknown_data(ndo, dat, "\n\t  ", length);
                 break;
        }
-       return;
+       return 1;
 trunc:
-       printf("[|BGP]");
+       ND_PRINT((ndo, "[|BGP]"));
+       return 0;
 }
 
 void
-bgp_print(const u_char *dat, int length)
+bgp_print(netdissect_options *ndo,
+          const u_char *dat, int length)
 {
        const u_char *p;
        const u_char *ep;
@@ -1289,25 +2708,29 @@ bgp_print(const u_char *dat, int length)
                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
        };
        struct bgp bgp;
-       u_int16_t hlen;
+       uint16_t hlen;
+       char tokbuf[TOKBUFSIZE];
 
        ep = dat + length;
-       if (snapend < dat + length)
-               ep = snapend;
+       if (ndo->ndo_snapend < dat + length)
+               ep = ndo->ndo_snapend;
 
-       printf(": BGP");
+       ND_PRINT((ndo, ": BGP, length: %u", length));
+
+        if (ndo->ndo_vflag < 1) /* lets be less chatty */
+                return;
 
        p = dat;
        start = p;
-       while (p < snapend) {
-               if (!TTEST2(p[0], 1))
+       while (p < ep) {
+               if (!ND_TTEST2(p[0], 1))
                        break;
                if (p[0] != 0xff) {
                        p++;
                        continue;
                }
 
-               if (!TTEST2(p[0], sizeof(marker)))
+               if (!ND_TTEST2(p[0], sizeof(marker)))
                        break;
                if (memcmp(p, marker, sizeof(marker)) != 0) {
                        p++;
@@ -1315,20 +2738,30 @@ bgp_print(const u_char *dat, int length)
                }
 
                /* found BGP header */
-               TCHECK2(p[0], BGP_SIZE);        /*XXX*/
+               ND_TCHECK2(p[0], BGP_SIZE);     /*XXX*/
                memcpy(&bgp, p, BGP_SIZE);
 
                if (start != p)
-                       printf(" [|BGP]");
+                       ND_PRINT((ndo, " [|BGP]"));
 
                hlen = ntohs(bgp.bgp_len);
+               if (hlen < BGP_SIZE) {
+                       ND_PRINT((ndo, "\n[|BGP Bogus header length %u < %u]", hlen,
+                           BGP_SIZE));
+                       break;
+               }
 
-               if (TTEST2(p[0], hlen)) {
-                       bgp_header_print(p, hlen);
+               if (ND_TTEST2(p[0], hlen)) {
+                       if (!bgp_header_print(ndo, p, hlen))
+                               return;
                        p += hlen;
                        start = p;
                } else {
-                       printf("[|BGP %s]", tok2str(bgp_msg_values, "Unknown Message Type",bgp.bgp_type));
+                       ND_PRINT((ndo, "\n[|BGP %s]",
+                              tok2strbuf(bgp_msg_values,
+                                         "Unknown Message Type",
+                                         bgp.bgp_type,
+                                         tokbuf, sizeof(tokbuf))));
                        break;
                }
        }
@@ -1336,16 +2769,12 @@ bgp_print(const u_char *dat, int length)
        return;
 
 trunc:
-       printf(" [|BGP]");
+       ND_PRINT((ndo, " [|BGP]"));
 }
 
-
-
-
-
-
-
-
-
-
-
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 4
+ * End:
+ */