Update from current NetBSD version of ieee80211_radiotap.h.

[tcpdump] / print-bgp.c

diff --git a/print-bgp.c b/print-bgp.c
index 0a2e5666e8c62714d3f76cf73ceb175ffc6769aa..e4c08f27a5a9d7d43c6e515bc9c175c33ea97a1d 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -35,8 +35,8 @@
 #endif
 
 #ifndef lint
 #endif
 
 #ifndef lint

-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.65 2003-05-30 11:09:39 hannes Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.91.2.9 2006-02-02 12:36:46 hannes Exp $";

 #endif
 
 #include <tcpdump-stdinc.h>
 #endif
 
 #include <tcpdump-stdinc.h>


@@ -45,8 +45,11 @@ static const char rcsid[] =
 #include <string.h>
 
 #include "interface.h"
 #include <string.h>
 
 #include "interface.h"

+#include "decode_prefix.h"

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

+#include "bgp.h"
+#include "l2vpn.h"

 
 struct bgp {
        u_int8_t bgp_marker[16];
 
 struct bgp {
        u_int8_t bgp_marker[16];


@@ -90,13 +93,14 @@ struct bgp_opt {
 };
 #define BGP_OPT_SIZE           2       /* some compilers may pad to 4 bytes */
 
 };
 #define BGP_OPT_SIZE           2       /* some compilers may pad to 4 bytes */
 

+#define BGP_UPDATE_MINSIZE      23
+

 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;
 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;

-        u_int8_t bgpn_data[0];          /* data should follow */

 };
 #define BGP_NOTIFICATION_SIZE          21      /* unaligned */
 
 };
 #define BGP_NOTIFICATION_SIZE          21      /* unaligned */
 


@@ -140,6 +144,9 @@ 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_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_ATTR_SET               128      /* draft-marques-ppvpn-ibgp */
+
+#define BGP_MP_NLRI_MINSIZE              3       /* End of RIB Marker detection */

 
 static struct tok bgp_attr_values[] = {
     { BGPTYPE_ORIGIN,           "Origin"},
 
 static struct tok bgp_attr_values[] = {
     { BGPTYPE_ORIGIN,           "Origin"},


@@ -158,10 +165,32 @@ 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_MP_REACH_NLRI,    "Multi-Protocol Reach NLRI"},
     { BGPTYPE_MP_UNREACH_NLRI,  "Multi-Protocol Unreach NLRI"},
     { BGPTYPE_EXTD_COMMUNITIES, "Extended Community"},

+    { BGPTYPE_ATTR_SET,         "Attribute Set"},

     { 255,                      "Reserved for development"},
     { 0, NULL}
 };
 
     { 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  */
+
+static 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 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
 
 #define BGP_OPT_AUTH                    1
 #define BGP_OPT_CAP                     2
 


@@ -174,13 +203,19 @@ static struct tok bgp_opt_values[] = {
 
 #define BGP_CAPCODE_MP                  1
 #define BGP_CAPCODE_RR                  2
 
 #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_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[] = {
     { BGP_CAPCODE_MP,           "Multiprotocol Extensions"},
     { BGP_CAPCODE_RR,           "Route Refresh"},
 #define BGP_CAPCODE_RR_CISCO          128
 
 static 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_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}
 };
     { BGP_CAPCODE_RR_CISCO,     "Route Refresh (Cisco)"},
     { 0, NULL}
 };


@@ -271,10 +306,15 @@ static struct tok bgp_origin_values[] = {
 #define SAFNUM_UNIMULTICAST             3
 /* labeled BGP RFC3107 */
 #define SAFNUM_LABUNICAST               4
 #define SAFNUM_UNIMULTICAST             3
 /* labeled BGP RFC3107 */
 #define SAFNUM_LABUNICAST               4

+#define SAFNUM_TUNNEL                   64 /* XXX */
+#define SAFNUM_VPLS                     65 /* XXX */
+#define SAFNUM_MDT                      66 /* XXX */

 /* Section 4.3.4 of draft-rosen-rfc2547bis-03.txt  */
 #define SAFNUM_VPNUNICAST               128
 #define SAFNUM_VPNMULTICAST             129
 #define SAFNUM_VPNUNIMULTICAST          130
 /* 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
 
 
 #define BGP_VPN_RD_LEN                  8
 


@@ -284,9 +324,13 @@ static struct tok bgp_safi_values[] = {
     { SAFNUM_MULTICAST,         "Multicast"},
     { SAFNUM_UNIMULTICAST,      "Unicast+Multicast"},
     { SAFNUM_LABUNICAST,        "labeled 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_VPNUNICAST,        "labeled VPN Unicast"},
     { SAFNUM_VPNMULTICAST,      "labeled VPN Multicast"},
     { SAFNUM_VPNUNIMULTICAST,   "labeled VPN Unicast+Multicast"},

+    { SAFNUM_RT_ROUTING_INFO,   "Route Target Routing Information"}, /* draft-marques-ppvpn-rt-constrain-01.txt */

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


@@ -311,6 +355,7 @@ static struct tok bgp_safi_values[] = {
 #define AFNUM_DECNET   13
 #define AFNUM_BANYAN   14
 #define AFNUM_E164NSAP 15
 #define AFNUM_DECNET   13
 #define AFNUM_BANYAN   14
 #define AFNUM_E164NSAP 15

+#define AFNUM_VPLS      25

 /* draft-kompella-ppvpn-l2vpn */
 #define AFNUM_L2VPN     196 /* still to be approved by IANA */
 
 /* draft-kompella-ppvpn-l2vpn */
 #define AFNUM_L2VPN     196 /* still to be approved by IANA */
 


@@ -332,16 +377,20 @@ static struct tok bgp_afi_values[] = {
     { AFNUM_BANYAN,           "Banyan Vines"},
     { AFNUM_E164NSAP,         "E.164 with NSAP subaddress"},
     { AFNUM_L2VPN,            "Layer-2 VPN"},
     { AFNUM_BANYAN,           "Banyan Vines"},
     { AFNUM_E164NSAP,         "E.164 with NSAP subaddress"},
     { AFNUM_L2VPN,            "Layer-2 VPN"},

+    { AFNUM_VPLS,             "VPLS"},

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

-/* Extended community type - draft-ramachandra-bgp-ext-communities */
+/* 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_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_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_LINKBAND    0x4004  /* Link Bandwidth,Format AS(2B):Bandwidth(4B) */
                                         /* rfc2547 bgp-mpls-vpns */

+#define BGP_EXT_COM_CISCO_MCAST 0x0009  /* cisco proprietary */

 
 #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_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 */


@@ -356,12 +405,29 @@ static struct tok bgp_afi_values[] = {
 
 #define BGP_EXT_COM_L2INFO      0x800a  /* draft-kompella-ppvpn-l2vpn */
 
 
 #define BGP_EXT_COM_L2INFO      0x800a  /* draft-kompella-ppvpn-l2vpn */
 

+/* 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 struct tok bgp_extd_comm_flag_values[] = {
+    { 0x8000,                  "vendor-specific"},
+    { 0x4000,                  "non-transitive"},
+    { 0, NULL},
+};
+

 static struct tok bgp_extd_comm_subtype_values[] = {
     { BGP_EXT_COM_RT_0,        "target"},
     { BGP_EXT_COM_RT_1,        "target"},
 static 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_0,        "origin"},
     { BGP_EXT_COM_RO_1,        "origin"},

+    { BGP_EXT_COM_RO_2,        "origin"},

     { BGP_EXT_COM_LINKBAND,    "link-BW"},
     { BGP_EXT_COM_LINKBAND,    "link-BW"},

+    { BGP_EXT_COM_CISCO_MCAST, "mdt-group"},

     { 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_ORIGIN,  "ospf-domain"},
     { BGP_EXT_COM_VPN_ORIGIN2, "ospf-domain"},
     { BGP_EXT_COM_VPN_ORIGIN3, "ospf-domain"},


@@ -371,6 +437,12 @@ static struct tok bgp_extd_comm_subtype_values[] = {
     { 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_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)" },

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


@@ -393,35 +465,19 @@ static struct tok bgp_extd_comm_ospf_rtype_values[] = {
   { 0, NULL },
 };
 
   { 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},
-};
-
-static int
+int

 decode_prefix4(const u_char *pptr, char *buf, u_int buflen)
 {
        struct in_addr addr;
        u_int plen;
 
 decode_prefix4(const u_char *pptr, char *buf, u_int buflen)
 {
        struct in_addr addr;
        u_int plen;
 

+       TCHECK(pptr[0]);

        plen = pptr[0];
        if (32 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));
        plen = pptr[0];
        if (32 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));

+       TCHECK2(pptr[1], (plen + 7) / 8);

        memcpy(&addr, &pptr[1], (plen + 7) / 8);
        if (plen % 8) {
                ((u_char *)&addr)[(plen + 7) / 8 - 1] &=
        memcpy(&addr, &pptr[1], (plen + 7) / 8);
        if (plen % 8) {
                ((u_char *)&addr)[(plen + 7) / 8 - 1] &=


@@ -429,6 +485,9 @@ decode_prefix4(const u_char *pptr, char *buf, u_int buflen)
        }
        snprintf(buf, buflen, "%s/%d", getname((u_char *)&addr), plen);
        return 1 + (plen + 7) / 8;
        }
        snprintf(buf, buflen, "%s/%d", getname((u_char *)&addr), plen);
        return 1 + (plen + 7) / 8;

+
+trunc:
+       return -2;

 }
 
 static int
 }
 
 static int


@@ -437,6 +496,7 @@ decode_labeled_prefix4(const u_char *pptr, char *buf, u_int buflen)
        struct in_addr addr;
        u_int plen;
 
        struct in_addr addr;
        u_int plen;
 

+       TCHECK(pptr[0]);

        plen = pptr[0];   /* get prefix length */
 
         /* this is one of the weirdnesses of rfc3107
        plen = pptr[0];   /* get prefix length */
 
         /* this is one of the weirdnesses of rfc3107


@@ -447,12 +507,16 @@ decode_labeled_prefix4(const u_char *pptr, char *buf, u_int buflen)
            stacked labels in a a single BGP message
         */
 
            stacked labels in a a single BGP message
         */
 

+       if (24 > plen)
+               return -1;
+

         plen-=24; /* adjust prefixlen - labellength */
 
        if (32 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));
         plen-=24; /* adjust prefixlen - labellength */
 
        if (32 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));

+       TCHECK2(pptr[4], (plen + 7) / 8);

        memcpy(&addr, &pptr[4], (plen + 7) / 8);
        if (plen % 8) {
                ((u_char *)&addr)[(plen + 7) / 8 - 1] &=
        memcpy(&addr, &pptr[4], (plen + 7) / 8);
        if (plen % 8) {
                ((u_char *)&addr)[(plen + 7) / 8 - 1] &=


@@ -466,60 +530,107 @@ decode_labeled_prefix4(const u_char *pptr, char *buf, u_int buflen)
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 4 + (plen + 7) / 8;
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 4 + (plen + 7) / 8;

+
+trunc:
+       return -2;

 }
 
 }
 

-static char *
+/* 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 (const u_char *pptr) {
 
 bgp_vpn_rd_print (const u_char *pptr) {
 

-   /* allocate space for the following string
-    * xxx.xxx.xxx.xxx:xxxxx
-    * 21 bytes plus one termination byte */
-    static char rd[22];
+   /* 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)) {
     char *pos = rd;
 
     /* ok lets load the RD format */
     switch (EXTRACT_16BITS(pptr)) {

+

         /* AS:IP-address fmt*/
     case 0:
         /* AS:IP-address fmt*/
     case 0:

-        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",
+            EXTRACT_16BITS(pptr+2), *(pptr+4), *(pptr+5), *(pptr+6), *(pptr+7));

         break;
         /* IP-address:AS fmt*/
         break;
         /* IP-address:AS fmt*/

+

     case 1:
     case 1:

-        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), "%u:%u (%u.%u.%u.%u:%u)",
+            EXTRACT_32BITS(pptr+2), EXTRACT_16BITS(pptr+6),
+            *(pptr+2), *(pptr+3), *(pptr+4), *(pptr+5), EXTRACT_16BITS(pptr+6));

         break;
     default:
         break;
     default:

-        sprintf(pos, "unknown RD format");
+        snprintf(pos, sizeof(rd) - (pos - rd), "unknown RD format");

         break;
     }
         break;
     }

-    pos+=strlen(pos);
+    pos += strlen(pos);

     *(pos) = '\0';
     return (rd);
 }
 
     *(pos) = '\0';
     return (rd);
 }
 

+static int
+decode_rt_routing_info(const u_char *pptr, char *buf, u_int buflen)
+{
+       u_int8_t route_target[8];
+       u_int plen;
+
+       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));
+       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: %u, route target %s",
+                 EXTRACT_32BITS(pptr+1),
+                 bgp_vpn_rd_print((u_char *)&route_target));
+
+       return 5 + (plen + 7) / 8;
+
+trunc:
+       return -2;
+}
+

 static int
 decode_labeled_vpn_prefix4(const u_char *pptr, char *buf, u_int buflen)
 {
        struct in_addr addr;
        u_int plen;
 
 static int
 decode_labeled_vpn_prefix4(const u_char *pptr, char *buf, u_int buflen)
 {
        struct in_addr addr;
        u_int plen;
 

+       TCHECK(pptr[0]);

        plen = pptr[0];   /* get prefix length */
 
        plen = pptr[0];   /* get prefix length */
 

+       if ((24+64) > plen)
+               return -1;
+

         plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
 
        if (32 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));
         plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
 
        if (32 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));

+       TCHECK2(pptr[12], (plen + 7) / 8);

        memcpy(&addr, &pptr[12], (plen + 7) / 8);
        if (plen % 8) {
                ((u_char *)&addr)[(plen + 7) / 8 - 1] &=
        memcpy(&addr, &pptr[12], (plen + 7) / 8);
        if (plen % 8) {
                ((u_char *)&addr)[(plen + 7) / 8 - 1] &=


@@ -534,15 +645,21 @@ decode_labeled_vpn_prefix4(const u_char *pptr, char *buf, u_int buflen)
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 12 + (plen + 7) / 8;
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 12 + (plen + 7) / 8;

+
+trunc:
+       return -2;

 }
 
 static int
 decode_labeled_vpn_l2(const u_char *pptr, char *buf, u_int buflen)
 {
         int plen,tlen,strlen,tlv_type,tlv_len,ttlv_len;
 }
 
 static int
 decode_labeled_vpn_l2(const u_char *pptr, char *buf, u_int buflen)
 {
         int plen,tlen,strlen,tlv_type,tlv_len,ttlv_len;

+
+       TCHECK2(pptr[0], 2);

         plen=EXTRACT_16BITS(pptr);
         tlen=plen;
         pptr+=2;
         plen=EXTRACT_16BITS(pptr);
         tlen=plen;
         pptr+=2;

+       TCHECK2(pptr[0],15);

         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),
         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),


@@ -553,6 +670,9 @@ decode_labeled_vpn_l2(const u_char *pptr, char *buf, u_int buflen)
 
         /* ok now the variable part - lets read out TLVs*/
         while (tlen>0) {
 
         /* ok now the variable part - lets read out TLVs*/
         while (tlen>0) {

+            if (tlen < 3)
+                return -1;
+            TCHECK2(pptr[0], 3);

             tlv_type=*pptr++;
             tlv_len=EXTRACT_16BITS(pptr);
             ttlv_len=tlv_len;
             tlv_type=*pptr++;
             tlv_len=EXTRACT_16BITS(pptr);
             ttlv_len=tlv_len;


@@ -565,6 +685,7 @@ decode_labeled_vpn_l2(const u_char *pptr, char *buf, u_int buflen)
                                  tlv_len);
                 ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */
                 while (ttlv_len>0) {
                                  tlv_len);
                 ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */
                 while (ttlv_len>0) {

+                    TCHECK(pptr[0]);

                     strlen+=snprintf(buf+strlen,buflen-strlen, "%02x",*pptr++);
                     ttlv_len--;
                 }
                     strlen+=snprintf(buf+strlen,buflen-strlen, "%02x",*pptr++);
                     ttlv_len--;
                 }


@@ -578,20 +699,25 @@ decode_labeled_vpn_l2(const u_char *pptr, char *buf, u_int buflen)
             tlen-=(tlv_len<<3); /* the tlv-length is expressed in bits so lets shift it tright */
         }
         return plen+2;
             tlen-=(tlv_len<<3); /* the tlv-length is expressed in bits so lets shift it tright */
         }
         return plen+2;

+
+trunc:
+        return -2;

 }
 
 #ifdef INET6
 }
 
 #ifdef INET6

-static int
+int

 decode_prefix6(const u_char *pd, char *buf, u_int buflen)
 {
        struct in6_addr addr;
        u_int plen;
 
 decode_prefix6(const u_char *pd, char *buf, u_int buflen)
 {
        struct in6_addr addr;
        u_int plen;
 

+       TCHECK(pd[0]);

        plen = pd[0];
        if (128 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));
        plen = pd[0];
        if (128 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));

+       TCHECK2(pd[1], (plen + 7) / 8);

        memcpy(&addr, &pd[1], (plen + 7) / 8);
        if (plen % 8) {
                addr.s6_addr[(plen + 7) / 8 - 1] &=
        memcpy(&addr, &pd[1], (plen + 7) / 8);
        if (plen % 8) {
                addr.s6_addr[(plen + 7) / 8 - 1] &=


@@ -599,6 +725,9 @@ decode_prefix6(const u_char *pd, char *buf, u_int buflen)
        }
        snprintf(buf, buflen, "%s/%d", getname6((u_char *)&addr), plen);
        return 1 + (plen + 7) / 8;
        }
        snprintf(buf, buflen, "%s/%d", getname6((u_char *)&addr), plen);
        return 1 + (plen + 7) / 8;

+
+trunc:
+       return -2;

 }
 
 static int
 }
 
 static int


@@ -607,13 +736,19 @@ decode_labeled_prefix6(const u_char *pptr, char *buf, u_int buflen)
        struct in6_addr addr;
        u_int plen;
 
        struct in6_addr addr;
        u_int plen;
 

+       TCHECK(pptr[0]);

        plen = pptr[0]; /* get prefix length */
        plen = pptr[0]; /* get prefix length */

+
+       if (24 > plen)
+               return -1;
+

         plen-=24; /* adjust prefixlen - labellength */
 
        if (128 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));
         plen-=24; /* adjust prefixlen - labellength */
 
        if (128 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));

+       TCHECK2(pptr[4], (plen + 7) / 8);

        memcpy(&addr, &pptr[4], (plen + 7) / 8);
        if (plen % 8) {
                addr.s6_addr[(plen + 7) / 8 - 1] &=
        memcpy(&addr, &pptr[4], (plen + 7) / 8);
        if (plen % 8) {
                addr.s6_addr[(plen + 7) / 8 - 1] &=


@@ -627,6 +762,9 @@ decode_labeled_prefix6(const u_char *pptr, char *buf, u_int buflen)
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 4 + (plen + 7) / 8;
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 4 + (plen + 7) / 8;

+
+trunc:
+       return -2;

 }
 
 static int
 }
 
 static int


@@ -635,14 +773,19 @@ decode_labeled_vpn_prefix6(const u_char *pptr, char *buf, u_int buflen)
        struct in6_addr addr;
        u_int plen;
 
        struct in6_addr addr;
        u_int plen;
 

+       TCHECK(pptr[0]);

        plen = pptr[0];   /* get prefix length */
 
        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));
         plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
 
        if (128 < plen)
                return -1;
 
        memset(&addr, 0, sizeof(addr));

+       TCHECK2(pptr[12], (plen + 7) / 8);

        memcpy(&addr, &pptr[12], (plen + 7) / 8);
        if (plen % 8) {
                addr.s6_addr[(plen + 7) / 8 - 1] &=
        memcpy(&addr, &pptr[12], (plen + 7) / 8);
        if (plen % 8) {
                addr.s6_addr[(plen + 7) / 8 - 1] &=


@@ -657,20 +800,94 @@ decode_labeled_vpn_prefix6(const u_char *pptr, char *buf, u_int buflen)
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 12 + (plen + 7) / 8;
                  ((pptr[3]&1)==0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
        return 12 + (plen + 7) / 8;

+
+trunc:
+       return -2;

 }
 #endif
 
 }
 #endif
 

-static void
+static int
+decode_clnp_prefix(const u_char *pptr, char *buf, u_int buflen)
+{
+        u_int8_t addr[19];
+       u_int plen;
+
+       TCHECK(pptr[0]);
+       plen = pptr[0]; /* get prefix length */
+
+       if (152 < plen)
+               return -1;
+
+       memset(&addr, 0, sizeof(addr));
+       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(const u_char *pptr, char *buf, u_int buflen)
+{
+        u_int8_t addr[19];
+       u_int plen;
+
+       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));
+       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(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;
+}
+
+static int

 bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
 {
        int i;
        u_int16_t af;
 bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
 {
        int i;
        u_int16_t af;

-       u_int8_t safi, snpa;
-        float bw; /* copy buffer for bandwidth values */
+       u_int8_t safi, snpa, nhlen;
+        union { /* copy buffer for bandwidth values */
+            float f; 
+            u_int32_t i;
+        } bw;

        int advance;
        int tlen;
        const u_char *tptr;
        char buf[MAXHOSTNAMELEN + 100];
        int advance;
        int tlen;
        const u_char *tptr;
        char buf[MAXHOSTNAMELEN + 100];

+       char tokbuf[TOKBUFSIZE];

 
         tptr = pptr;
         tlen=len;
 
         tptr = pptr;
         tlen=len;


@@ -679,9 +896,15 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
        case BGPTYPE_ORIGIN:
                if (len != 1)
                        printf("invalid len");
        case BGPTYPE_ORIGIN:
                if (len != 1)
                        printf("invalid len");

-               else
-                       printf("%s", tok2str(bgp_origin_values, "Unknown Origin Typecode", tptr[0]));
+               else {
+                       TCHECK(*tptr);
+                       printf("%s", tok2strbuf(bgp_origin_values,
+                                               "Unknown Origin Typecode",
+                                               tptr[0],
+                                               tokbuf, sizeof(tokbuf)));
+               }

                break;
                break;

+

        case BGPTYPE_AS_PATH:
                if (len % 2) {
                        printf("invalid len");
        case BGPTYPE_AS_PATH:
                if (len % 2) {
                        printf("invalid len");


@@ -691,35 +914,40 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                        printf("empty");
                        break;
                 }
                        printf("empty");
                        break;
                 }

+

                while (tptr < 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;
+                       TCHECK(tptr[0]);
+                        printf("%s", tok2strbuf(bgp_as_path_segment_open_values,
+                                               "?", tptr[0],
+                                               tokbuf, sizeof(tokbuf)));
+                        for (i = 0; i < tptr[1] * 2; i += 2) {
+                            TCHECK2(tptr[2 + i], 2);
+                            printf("%u ", EXTRACT_16BITS(&tptr[2 + i]));
+                        }
+                       TCHECK(tptr[0]);
+                        printf("%s", tok2strbuf(bgp_as_path_segment_close_values,
+                                               "?", tptr[0],
+                                               tokbuf, sizeof(tokbuf)));
+                        TCHECK(tptr[1]);
+                        tptr += 2 + tptr[1] * 2;

                }
                break;
        case BGPTYPE_NEXT_HOP:
                if (len != 4)
                        printf("invalid len");
                }
                break;
        case BGPTYPE_NEXT_HOP:
                if (len != 4)
                        printf("invalid len");

-               else
+               else {
+                       TCHECK2(tptr[0], 4);

                        printf("%s", getname(tptr));
                        printf("%s", getname(tptr));

+               }

                break;
        case BGPTYPE_MULTI_EXIT_DISC:
        case BGPTYPE_LOCAL_PREF:
                if (len != 4)
                        printf("invalid len");
                break;
        case BGPTYPE_MULTI_EXIT_DISC:
        case BGPTYPE_LOCAL_PREF:
                if (len != 4)
                        printf("invalid len");

-               else
+               else {
+                       TCHECK2(tptr[0], 4);

                        printf("%u", EXTRACT_32BITS(tptr));
                        printf("%u", EXTRACT_32BITS(tptr));

+               }

                break;
        case BGPTYPE_ATOMIC_AGGREGATE:
                if (len != 0)
                break;
        case BGPTYPE_ATOMIC_AGGREGATE:
                if (len != 0)


@@ -730,6 +958,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                        printf("invalid len");
                        break;
                }
                        printf("invalid len");
                        break;
                }

+               TCHECK2(tptr[0], 6);

                printf(" AS #%u, origin %s", EXTRACT_16BITS(tptr),
                        getname(tptr + 2));
                break;
                printf(" AS #%u, origin %s", EXTRACT_16BITS(tptr),
                        getname(tptr + 2));
                break;


@@ -740,6 +969,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                }
                while (tlen>0) {
                        u_int32_t comm;
                }
                while (tlen>0) {
                        u_int32_t comm;

+                       TCHECK2(tptr[0], 4);

                        comm = EXTRACT_32BITS(tptr);
                        switch (comm) {
                        case BGP_COMMUNITY_NO_EXPORT:
                        comm = EXTRACT_32BITS(tptr);
                        switch (comm) {
                        case BGP_COMMUNITY_NO_EXPORT:


@@ -767,10 +997,16 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                        printf("invalid len");
                        break;
                }
                        printf("invalid len");
                        break;
                }

+               TCHECK2(tptr[0], 4);

                 printf("%s",getname(tptr));
                 break;
         case BGPTYPE_CLUSTER_LIST:
                 printf("%s",getname(tptr));
                 break;
         case BGPTYPE_CLUSTER_LIST:

+               if (len % 4) {
+                       printf("invalid len");
+                       break;
+               }

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

+                       TCHECK2(tptr[0], 4);

                         printf("%s%s",
                                getname(tptr),
                                 (tlen>4) ? ", " : "");
                         printf("%s%s",
                                getname(tptr),
                                 (tlen>4) ? ", " : "");


@@ -779,328 +1015,472 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                 }
                 break;
        case BGPTYPE_MP_REACH_NLRI:
                 }
                 break;
        case BGPTYPE_MP_REACH_NLRI:

+               TCHECK2(tptr[0], 3);

                af = EXTRACT_16BITS(tptr);
                safi = tptr[2];
        
                 printf("\n\t    AFI: %s (%u), %sSAFI: %s (%u)",
                af = EXTRACT_16BITS(tptr);
                safi = tptr[2];
        
                 printf("\n\t    AFI: %s (%u), %sSAFI: %s (%u)",

-                       tok2str(bgp_afi_values, "Unknown AFI", af),
+                       tok2strbuf(bgp_afi_values, "Unknown AFI", af,
+                                 tokbuf, sizeof(tokbuf)),

                        af,
                        (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
                        af,
                        (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */

-                       tok2str(bgp_safi_values, "Unknown SAFI", safi),
+                       tok2strbuf(bgp_safi_values, "Unknown SAFI", safi,
+                                 tokbuf, sizeof(tokbuf)),

                        safi);
 
                        safi);
 

-               if (af == AFNUM_INET || af==AFNUM_L2VPN)
-                       ;
+                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):

 #ifdef INET6
 #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_RT_ROUTING_INFO):
+                case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):

 #endif
 #endif

-               else {
-                    printf("\n\t    no AFI %u decoder",af);
+                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:
+                    TCHECK2(tptr[0], tlen);
+                    printf("\n\t    no AFI %u / SAFI %u decoder",af,safi);

                     if (vflag <= 1)
                         print_unknown_data(tptr,"\n\t    ",tlen);
                     if (vflag <= 1)
                         print_unknown_data(tptr,"\n\t    ",tlen);

+                    goto done;

                     break;
                 }
 
                 tptr +=3;
 
                     break;
                 }
 
                 tptr +=3;
 

-               tlen = tptr[0];
+               TCHECK(tptr[0]);
+               nhlen = tptr[0];
+                tlen = nhlen;

                 tptr++;
 
                if (tlen) {
                 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 <= 1)
-                                            print_unknown_data(tptr,"\n\t    ",tlen);
-                                        break;
-                                    }
-                                    break;
+                    printf("\n\t    nexthop: ");
+                    while (tlen > 0) {
+                        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):
+                            if (tlen < (int)sizeof(struct in_addr)) {
+                                printf("invalid len");
+                                tlen = 0;
+                            } else {
+                                TCHECK2(tptr[0], sizeof(struct in_addr));
+                                printf("%s",getname(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)) {
+                                printf("invalid len");
+                                tlen = 0;
+                            } else {
+                                TCHECK2(tptr[0], sizeof(struct in_addr)+BGP_VPN_RD_LEN);
+                                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;

 #ifdef INET6
 #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 <= 1)
-                                            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):
+                        case (AFNUM_INET6<<8 | SAFNUM_RT_ROUTING_INFO):
+                            if (tlen < (int)sizeof(struct in6_addr)) {
+                                printf("invalid len");
+                                tlen = 0;
+                            } else {
+                                TCHECK2(tptr[0], sizeof(struct in6_addr));
+                                printf("%s", getname6(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)) {
+                                printf("invalid len");
+                                tlen = 0;
+                            } else {
+                                TCHECK2(tptr[0], sizeof(struct in6_addr)+BGP_VPN_RD_LEN);
+                                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;

 #endif
 #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 <= 1)
-                                            print_unknown_data(tptr,"\n\t    ",tlen);                                        
-                                        break;
-                                   }
-                                   break;
-
-                               default:
-                                    printf("no AFI %u decoder",af);
-                                    if (vflag <= 1)
-                                      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)) {
+                                printf("invalid len");
+                                tlen = 0;
+                            } else {
+                                TCHECK2(tptr[0], sizeof(struct in_addr));
+                                printf("%s", getname(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):
+                            TCHECK2(tptr[0], tlen);
+                            printf("%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) {
+                                printf("invalid len");
+                                tlen = 0;
+                            } else {
+                                TCHECK2(tptr[0], tlen);
+                                printf("RD: %s, %s",
+                                       bgp_vpn_rd_print(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)
+                                    printf(" = %s", getname(tptr+BGP_VPN_RD_LEN+4));
+#ifdef INET6
+                                /* rfc1888 mapped IPv6 address ? */
+                                else if (EXTRACT_24BITS(tptr+BGP_VPN_RD_LEN) ==  0x350000)
+                                    printf(" = %s", getname6(tptr+BGP_VPN_RD_LEN+3));
+#endif
+                                tptr += tlen;
+                                tlen = 0;
+                            }
+                            break;
+                        default:
+                            TCHECK2(tptr[0], tlen);
+                            printf("no AFI %u/SAFI %u decoder",af,safi);
+                            if (vflag <= 1)
+                                print_unknown_data(tptr,"\n\t    ",tlen);
+                            tptr += tlen;
+                            tlen = 0;
+                            goto done;
+                            break;
+                        }
+                    }

                }
                }

+                printf(", nh-length: %u", nhlen);

                tptr += tlen;
 
                tptr += tlen;
 

+               TCHECK(tptr[0]);

                snpa = tptr[0];
                tptr++;
 
                if (snpa) {
                        printf("\n\t    %u SNPA", snpa);
                        for (/*nothing*/; snpa > 0; snpa--) {
                snpa = tptr[0];
                tptr++;
 
                if (snpa) {
                        printf("\n\t    %u SNPA", snpa);
                        for (/*nothing*/; snpa > 0; snpa--) {

+                               TCHECK(tptr[0]);

                                printf("\n\t      %d bytes", tptr[0]);
                                tptr += tptr[0] + 1;
                        }
                } else {
                                printf("\n\t      %d bytes", tptr[0]);
                                tptr += tptr[0] + 1;
                        }
                } else {

-                printf(", no SNPA");
+                       printf(", no SNPA");

                 }
 
                while (len - (tptr - pptr) > 0) {
                 }
 
                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));
-                               if (advance >= 0)
-                                       printf("\n\t      %s", buf);
-                               else 
-                                       printf("\n\t    (illegal prefix length)");
-                                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 <= 1)
-                                    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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+                        advance = decode_labeled_prefix4(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
+                        advance = decode_rt_routing_info(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;

 #ifdef INET6
 #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;
-                            case SAFNUM_LABUNICAST:
-                                advance = decode_labeled_prefix6(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            case SAFNUM_VPNUNICAST:
-                            case SAFNUM_VPNMULTICAST:
-                            case SAFNUM_VPNUNIMULTICAST:
-                                advance = decode_labeled_vpn_prefix6(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            default:
-                                printf("\n\t      no SAFI %u decoder ",safi);
-                                if (vflag <= 1)
-                                    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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;
+                    case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+                        advance = decode_labeled_prefix6(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;
+                    case (AFNUM_INET6<<8 | SAFNUM_RT_ROUTING_INFO):
+                        advance = decode_rt_routing_info(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;

 #endif
 #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 <= 1)
-                                    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 <= 1)
-                                    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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;                                   
+                    default:
+                        TCHECK2(*tptr,tlen);
+                        printf("\n\t    no AFI %u / SAFI %u decoder",af,safi);
+                        if (vflag <= 1)
+                            print_unknown_data(tptr,"\n\t    ",tlen);
+                        advance = 0;
+                        tptr = pptr + len;
+                        break;
+                    }
+                    if (advance < 0)
+                        break;
+                    tptr += advance;

                }
                }

+        done:

                break;
 
        case BGPTYPE_MP_UNREACH_NLRI:
                break;
 
        case BGPTYPE_MP_UNREACH_NLRI:

+               TCHECK2(tptr[0], BGP_MP_NLRI_MINSIZE);

                af = EXTRACT_16BITS(tptr);
                safi = tptr[2];
 
                 printf("\n\t    AFI: %s (%u), %sSAFI: %s (%u)",
                af = EXTRACT_16BITS(tptr);
                safi = tptr[2];
 
                 printf("\n\t    AFI: %s (%u), %sSAFI: %s (%u)",

-                       tok2str(bgp_afi_values, "Unknown AFI", af),
+                       tok2strbuf(bgp_afi_values, "Unknown AFI", af,
+                                 tokbuf, sizeof(tokbuf)),

                        af,
                        (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
                        af,
                        (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */

-                       tok2str(bgp_safi_values, "Unknown SAFI", safi),
+                       tok2strbuf(bgp_safi_values, "Unknown SAFI", safi,
+                                 tokbuf, sizeof(tokbuf)),

                        safi);
 
                        safi);
 

+                if (len == BGP_MP_NLRI_MINSIZE)
+                    printf("\n\t      End-of-Rib Marker (empty NLRI)");
+

                tptr += 3;
                 
                while (len - (tptr - pptr) > 0) {
                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));
-                               if (advance >= 0) 
-                                       printf("\n\t      %s", buf);
-                               else
-                                       printf("\n\t    (illegal prefix length)");
-                                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 <= 1)
-                                    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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;
+                    case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+                        advance = decode_labeled_prefix4(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;

 #ifdef INET6
 #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;
-                            case SAFNUM_LABUNICAST:
-                                advance = decode_labeled_prefix6(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            case SAFNUM_VPNUNICAST:
-                            case SAFNUM_VPNMULTICAST:
-                            case SAFNUM_VPNUNIMULTICAST:
-                                advance = decode_labeled_vpn_prefix6(tptr, buf, sizeof(buf));
-                                printf("\n\t      %s", buf);
-                                break;
-                            default:
-                                printf("\n\t      no SAFI %u decoder",safi);
-                                if (vflag <= 1)
-                                    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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;
+                    case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+                        advance = decode_labeled_prefix6(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;

 #endif
 #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 <= 1)
-                                    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 <= 1)
-                                    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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\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(tptr, buf, sizeof(buf));
+                        if (advance == -1)
+                            printf("\n\t    (illegal prefix length)");
+                        else if (advance == -2)
+                            goto trunc;
+                        else
+                            printf("\n\t      %s", buf);
+                        break;                                   
+                    default:
+                        TCHECK2(*(tptr-3),tlen);
+                        printf("no AFI %u / SAFI %u decoder",af,safi);
+                        if (vflag <= 1)
+                            print_unknown_data(tptr-3,"\n\t    ",tlen);                                        
+                        advance = 0;
+                        tptr = pptr + len;
+                        break;
+                    }
+                    if (advance < 0)
+                        break;
+                    tptr += advance;

                }
                break;
         case BGPTYPE_EXTD_COMMUNITIES:
                }
                break;
         case BGPTYPE_EXTD_COMMUNITIES:


@@ -1110,42 +1490,46 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                }
                 while (tlen>0) {
                     u_int16_t extd_comm;
                }
                 while (tlen>0) {
                     u_int16_t extd_comm;

+
+                    TCHECK2(tptr[0], 2);

                     extd_comm=EXTRACT_16BITS(tptr);
                     extd_comm=EXTRACT_16BITS(tptr);

+
+                   printf("\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));
+
+                    TCHECK2(*(tptr+2), 6);

                     switch(extd_comm) {
                     case BGP_EXT_COM_RT_0:
                     case BGP_EXT_COM_RO_0:
                     switch(extd_comm) {
                     case BGP_EXT_COM_RT_0:
                     case BGP_EXT_COM_RO_0:

-                        printf("\n\t    %s%s%s(0x%04x):%u:%s",
-                               (extd_comm&0x8000) ? "vendor-specific: " : "",
-                               (extd_comm&0x4000) ? "non-transitive: " : "",
-                               tok2str(bgp_extd_comm_subtype_values,
-                                       "unknown",
-                                       extd_comm),
-                               extd_comm,
+                        printf(": %u:%s",

                                EXTRACT_16BITS(tptr+2),
                                getname(tptr+4));
                         break;
                     case BGP_EXT_COM_RT_1:
                     case BGP_EXT_COM_RO_1:
                                EXTRACT_16BITS(tptr+2),
                                getname(tptr+4));
                         break;
                     case BGP_EXT_COM_RT_1:
                     case BGP_EXT_COM_RO_1:

-                        printf("\n\t    %s%s%s(0x%04x):%s:%u",
-                               (extd_comm&0x8000) ? "vendor-specific: " : "",
-                               (extd_comm&0x4000) ? "non-transitive: " : "",
-                               tok2str(bgp_extd_comm_subtype_values,
-                                       "unknown",
-                                       extd_comm),
-                               extd_comm,
+                        printf(": %s:%u",

                                getname(tptr+2),
                                EXTRACT_16BITS(tptr+6));
                         break;
                                getname(tptr+2),
                                EXTRACT_16BITS(tptr+6));
                         break;

+                    case BGP_EXT_COM_RT_2:
+                    case BGP_EXT_COM_RO_2:
+                        printf(": %u:%u",
+                               EXTRACT_32BITS(tptr+2),
+                               EXTRACT_16BITS(tptr+6));
+                        break;

                     case BGP_EXT_COM_LINKBAND:
                     case BGP_EXT_COM_LINKBAND:

-                        memcpy (&bw, tptr+2, 4);
-                        printf("\n\t    %s%s%s(0x%04x):bandwidth: %.3f Mbps",
-                               (extd_comm&0x8000) ? "vendor-specific: " : "",
-                               (extd_comm&0x4000) ? "non-transitive: " : "",
-                               tok2str(bgp_extd_comm_subtype_values,
-                                       "unknown",
-                                       extd_comm),
-                               extd_comm,
-                               bw*8/1000000);
+                       bw.i = EXTRACT_32BITS(tptr+2);
+                        printf(": bandwidth: %.3f Mbps",
+                               bw.f*8/1000000);
+                        break;
+                    case BGP_EXT_COM_CISCO_MCAST:
+                        printf(": AS %u, group %s",
+                               EXTRACT_16BITS(tptr+2),
+                               getname(tptr+4));

                         break;
                     case BGP_EXT_COM_VPN_ORIGIN:
                     case BGP_EXT_COM_VPN_ORIGIN2:
                         break;
                     case BGP_EXT_COM_VPN_ORIGIN:
                     case BGP_EXT_COM_VPN_ORIGIN2:


@@ -1153,47 +1537,30 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                     case BGP_EXT_COM_VPN_ORIGIN4:
                     case BGP_EXT_COM_OSPF_RID:
                     case BGP_EXT_COM_OSPF_RID2:
                     case BGP_EXT_COM_VPN_ORIGIN4:
                     case BGP_EXT_COM_OSPF_RID:
                     case BGP_EXT_COM_OSPF_RID2:

-                        printf("\n\t    %s%s%s(0x%04x):%s",
-                               (extd_comm&0x8000) ? "vendor-specific: " : "",
-                               (extd_comm&0x4000) ? "non-transitive: " : "",
-                               tok2str(bgp_extd_comm_subtype_values,
-                                       "unknown",
-                                       extd_comm),
-                               extd_comm,
-                               getname(tptr+2));
+                        printf("%s", getname(tptr+2));

                         break;
                     case BGP_EXT_COM_OSPF_RTYPE:
                     case BGP_EXT_COM_OSPF_RTYPE2: 
                         break;
                     case BGP_EXT_COM_OSPF_RTYPE:
                     case BGP_EXT_COM_OSPF_RTYPE2: 

-                        printf("\n\t    %s%s%s(0x%04x), area:%s, router-type:%s, metric-type:%s%s",
-                               (extd_comm&0x8000) ? "vendor-specific: " : "",
-                               (extd_comm&0x4000) ? "non-transitive: " : "",
-                               tok2str(bgp_extd_comm_subtype_values,
-                                       "unknown",
-                                       extd_comm),
-                               extd_comm,
+                        printf(": area:%s, router-type:%s, metric-type:%s%s",

                                getname(tptr+2),
                                getname(tptr+2),

-                               tok2str(bgp_extd_comm_ospf_rtype_values,
-                                       "unknown (0x%02x)",
-                                       *(tptr+6)),
+                               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 ||BGP_OSPF_RTYPE_NSSA )) ? "E1" : "");
                         break;
                     case BGP_EXT_COM_L2INFO:
                                (*(tptr+7) &  BGP_OSPF_RTYPE_METRIC_TYPE) ? "E2" : "",
                                (*(tptr+6) == (BGP_OSPF_RTYPE_EXT ||BGP_OSPF_RTYPE_NSSA )) ? "E1" : "");
                         break;
                     case BGP_EXT_COM_L2INFO:

-                        printf("\n\t    %s%s(0x%04x):%s Control Flags [0x%02x]:MTU %u",
-                               (extd_comm&0x4000) ? "non-transitive: " : "",
-                               tok2str(bgp_extd_comm_subtype_values,
-                                       "unknown",
-                                       extd_comm),
-                               extd_comm,
-                               tok2str(bgp_l2vpn_encaps_values,
-                                       "unknown encaps",
-                                       *(tptr+2)),
+                        printf(": %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;
                     default:
                                        *(tptr+3),
                                EXTRACT_16BITS(tptr+4));
                         break;
                     default:

-                        printf("\n\t    unknown extd community typecode (0x%04x)",
-                               extd_comm);
+                        TCHECK2(*tptr,8);

                         print_unknown_data(tptr,"\n\t      ",8);
                         break;
                     }
                         print_unknown_data(tptr,"\n\t      ",8);
                         break;
                     }


@@ -1202,14 +1569,63 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                 }
                 break;
 
                 }
                 break;
 

+        case BGPTYPE_ATTR_SET:
+                TCHECK2(tptr[0], 4);
+                printf("\n\t    Origin AS: %u", EXTRACT_32BITS(tptr));
+                tptr+=4;
+                len -=4;
+
+                while (len >= 2 ) {
+                    int alen;
+                    struct bgp_attr bgpa;
+                    
+                    TCHECK2(tptr[0], sizeof(bgpa));
+                    memcpy(&bgpa, tptr, sizeof(bgpa));
+                    alen = bgp_attr_len(&bgpa);
+                    tptr += bgp_attr_off(&bgpa);
+                    len -= bgp_attr_off(&bgpa);
+                    
+                    printf("\n\t      %s (%u), length: %u",
+                           tok2strbuf(bgp_attr_values,
+                                     "Unknown Attribute", bgpa.bgpa_type,
+                                     tokbuf, sizeof(tokbuf)),
+                           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("]: ");
+                    }
+                    /* FIXME check for recursion */
+                    if (!bgp_attr_print(&bgpa, tptr, alen))
+                        return 0;
+                    tptr += alen;
+                    len -= alen;
+               }
+                break;
+           
+

        default:
        default:

+           TCHECK2(*pptr,len);

             printf("\n\t    no Attribute %u decoder",attr->bgpa_type); /* we have no decoder for the attribute */
             if (vflag <= 1)
                 print_unknown_data(pptr,"\n\t    ",len);
             break;
        }
             printf("\n\t    no Attribute %u decoder",attr->bgpa_type); /* we have no decoder for the attribute */
             if (vflag <= 1)
                 print_unknown_data(pptr,"\n\t    ",len);
             break;
        }

-        if (vflag > 1 && len) /* omit zero length attributes*/
+        if (vflag > 1 && len) { /* omit zero length attributes*/
+            TCHECK2(*pptr,len);

             print_unknown_data(pptr,"\n\t    ",len);
             print_unknown_data(pptr,"\n\t    ",len);

+        }
+        return 1;
+
+trunc:
+        return 0;

 }
 
 static void
 }
 
 static void


@@ -1217,13 +1633,13 @@ bgp_open_print(const u_char *dat, int length)
 {
        struct bgp_open bgpo;
        struct bgp_opt bgpopt;
 {
        struct bgp_open bgpo;
        struct bgp_opt bgpopt;

-       int hlen;

        const u_char *opt;
        int i,cap_type,cap_len,tcap_len,cap_offset;
        const u_char *opt;
        int i,cap_type,cap_len,tcap_len,cap_offset;

+       char tokbuf[TOKBUFSIZE];
+       char tokbuf2[TOKBUFSIZE];

 
        TCHECK2(dat[0], BGP_OPEN_SIZE);
        memcpy(&bgpo, dat, BGP_OPEN_SIZE);
 
        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("\n\t  Version %d, ", bgpo.bgpo_version);
        printf("my AS %u, ", ntohs(bgpo.bgpo_myas));


@@ -1249,7 +1665,9 @@ bgp_open_print(const u_char *dat, int length)
                }
 
                printf("\n\t    Option %s (%u), length: %u",
                }
 
                printf("\n\t    Option %s (%u), length: %u",

-                       tok2str(bgp_opt_values,"Unknown", bgpopt.bgpopt_type),
+                       tok2strbuf(bgp_opt_values,"Unknown",
+                                 bgpopt.bgpopt_type,
+                                 tokbuf, sizeof(tokbuf)),

                        bgpopt.bgpopt_type,
                        bgpopt.bgpopt_len);
 
                        bgpopt.bgpopt_type,
                        bgpopt.bgpopt_len);
 


@@ -1259,15 +1677,21 @@ bgp_open_print(const u_char *dat, int length)
                     cap_type=opt[i+BGP_OPT_SIZE];
                     cap_len=opt[i+BGP_OPT_SIZE+1];
                     tcap_len=cap_len;
                     cap_type=opt[i+BGP_OPT_SIZE];
                     cap_len=opt[i+BGP_OPT_SIZE+1];
                     tcap_len=cap_len;

-                    printf("\n\t      %s, length: %u",
-                           tok2str(bgp_capcode_values,"Unknown", cap_type),
+                    printf("\n\t      %s (%u), length: %u",
+                           tok2strbuf(bgp_capcode_values, "Unknown",
+                                     cap_type, tokbuf, sizeof(tokbuf)),
+                           cap_type,

                            cap_len);
                     switch(cap_type) {
                     case BGP_CAPCODE_MP:
                         printf("\n\t\tAFI %s (%u), SAFI %s (%u)",
                            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)),
+                               tok2strbuf(bgp_afi_values, "Unknown",
+                                         EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+2),
+                                         tokbuf, sizeof(tokbuf)),

                                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]),
+                               tok2strbuf(bgp_safi_values, "Unknown",
+                                         opt[i+BGP_OPT_SIZE+5],
+                                         tokbuf, sizeof(tokbuf)),

                                opt[i+BGP_OPT_SIZE+5]);
                         break;
                     case BGP_CAPCODE_RESTART:
                                opt[i+BGP_OPT_SIZE+5]);
                         break;
                     case BGP_CAPCODE_RESTART:


@@ -1278,9 +1702,13 @@ bgp_open_print(const u_char *dat, int length)
                         cap_offset=4;
                         while(tcap_len>=4) {
                             printf("\n\t\t  AFI %s (%u), SAFI %s (%u), Forwarding state preserved: %s",
                         cap_offset=4;
                         while(tcap_len>=4) {
                             printf("\n\t\t  AFI %s (%u), SAFI %s (%u), Forwarding state preserved: %s",

-                                   tok2str(bgp_afi_values,"Unknown", EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+cap_offset)),
+                                   tok2strbuf(bgp_afi_values,"Unknown",
+                                             EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+cap_offset),
+                                             tokbuf, sizeof(tokbuf)),

                                    EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+cap_offset),
                                    EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+cap_offset),

-                                   tok2str(bgp_safi_values,"Unknown", opt[i+BGP_OPT_SIZE+cap_offset+2]),
+                                   tok2strbuf(bgp_safi_values,"Unknown",
+                                             opt[i+BGP_OPT_SIZE+cap_offset+2],
+                                             tokbuf2, sizeof(tokbuf2)),

                                    opt[i+BGP_OPT_SIZE+cap_offset+2],
                                    ((opt[i+BGP_OPT_SIZE+cap_offset+3])&0x80) ? "yes" : "no" );
                             tcap_len-=4;
                                    opt[i+BGP_OPT_SIZE+cap_offset+2],
                                    ((opt[i+BGP_OPT_SIZE+cap_offset+3])&0x80) ? "yes" : "no" );
                             tcap_len-=4;


@@ -1291,14 +1719,17 @@ bgp_open_print(const u_char *dat, int length)
                     case BGP_CAPCODE_RR_CISCO:
                         break;
                     default:
                     case BGP_CAPCODE_RR_CISCO:
                         break;
                     default:

+                        TCHECK2(opt[i+BGP_OPT_SIZE+2],cap_len);

                         printf("\n\t\tno decoder for Capability %u",
                                cap_type);
                         if (vflag <= 1)
                             print_unknown_data(&opt[i+BGP_OPT_SIZE+2],"\n\t\t",cap_len);
                         break;
                     }
                         printf("\n\t\tno decoder for Capability %u",
                                cap_type);
                         if (vflag <= 1)
                             print_unknown_data(&opt[i+BGP_OPT_SIZE+2],"\n\t\t",cap_len);
                         break;
                     }

-                    if (vflag > 1)
+                    if (vflag > 1) {
+                        TCHECK2(opt[i+BGP_OPT_SIZE+2],cap_len);

                         print_unknown_data(&opt[i+BGP_OPT_SIZE+2],"\n\t\t",cap_len);
                         print_unknown_data(&opt[i+BGP_OPT_SIZE+2],"\n\t\t",cap_len);

+                    }

                     break;
                 case BGP_OPT_AUTH:
                 default:
                     break;
                 case BGP_OPT_AUTH:
                 default:


@@ -1319,14 +1750,13 @@ bgp_update_print(const u_char *dat, int length)
 {
        struct bgp bgp;
        struct bgp_attr bgpa;
 {
        struct bgp bgp;
        struct bgp_attr bgpa;

-       int hlen;

        const u_char *p;
        int len;
        int i;
        const u_char *p;
        int len;
        int i;

+       char tokbuf[TOKBUFSIZE];

 
        TCHECK2(dat[0], BGP_SIZE);
        memcpy(&bgp, dat, BGP_SIZE);
 
        TCHECK2(dat[0], BGP_SIZE);
        memcpy(&bgp, dat, BGP_SIZE);

-       hlen = ntohs(bgp.bgp_len);

        p = dat + BGP_SIZE;     /*XXX*/
 
        /* Unfeasible routes */
        p = dat + BGP_SIZE;     /*XXX*/
 
        /* Unfeasible routes */


@@ -1350,12 +1780,14 @@ bgp_update_print(const u_char *dat, int length)
 
                while(i < 2 + len) {
                        wpfx = decode_prefix4(&p[i], buf, sizeof(buf));
 
                while(i < 2 + len) {
                        wpfx = decode_prefix4(&p[i], buf, sizeof(buf));

-                       if (wpfx >= 0) {
-                               i += wpfx;
-                               printf("\n\t    %s", buf);
-                       } else {
+                       if (wpfx == -1) {

                                printf("\n\t    (illegal prefix length)");
                                break;
                                printf("\n\t    (illegal prefix length)");
                                break;

+                       } else if (wpfx == -2)
+                               goto trunc;
+                       else {
+                               i += wpfx;
+                               printf("\n\t    %s", buf);

                        }
                }
 #endif
                        }
                }
 #endif


@@ -1364,6 +1796,12 @@ bgp_update_print(const u_char *dat, int length)
 
        TCHECK2(p[0], 2);
        len = EXTRACT_16BITS(p);
 
        TCHECK2(p[0], 2);
        len = EXTRACT_16BITS(p);

+
+        if (len == 0 && length == BGP_UPDATE_MINSIZE) {
+            printf("\n\t  End-of-Rib Marker (empty NLRI)");
+            return;
+        }
+

        if (len) {
                /* do something more useful!*/
                i = 2;
        if (len) {
                /* do something more useful!*/
                i = 2;


@@ -1376,12 +1814,14 @@ bgp_update_print(const u_char *dat, int length)
                        aoff = bgp_attr_off(&bgpa);
 
                       printf("\n\t  %s (%u), length: %u",
                        aoff = bgp_attr_off(&bgpa);
 
                       printf("\n\t  %s (%u), length: %u",

-                              tok2str(bgp_attr_values, "Unknown Attribute", bgpa.bgpa_type),
+                              tok2strbuf(bgp_attr_values, "Unknown Attribute",
+                                        bgpa.bgpa_type,
+                                        tokbuf, sizeof(tokbuf)),

                               bgpa.bgpa_type,
                               alen);
 
                        if (bgpa.bgpa_flags) {
                               bgpa.bgpa_type,
                               alen);
 
                        if (bgpa.bgpa_flags) {

-                               printf(", flags [%s%s%s%s",
+                               printf(", Flags [%s%s%s%s",

                                        bgpa.bgpa_flags & 0x80 ? "O" : "",
                                        bgpa.bgpa_flags & 0x40 ? "T" : "",
                                        bgpa.bgpa_flags & 0x20 ? "P" : "",
                                        bgpa.bgpa_flags & 0x80 ? "O" : "",
                                        bgpa.bgpa_flags & 0x40 ? "T" : "",
                                        bgpa.bgpa_flags & 0x20 ? "P" : "",


@@ -1390,23 +1830,26 @@ bgp_update_print(const u_char *dat, int length)
                                        printf("+%x", bgpa.bgpa_flags & 0xf);
                                printf("]: ");
                        }
                                        printf("+%x", bgpa.bgpa_flags & 0xf);
                                printf("]: ");
                        }

-                       bgp_attr_print(&bgpa, &p[i + aoff], alen);
+                       if (!bgp_attr_print(&bgpa, &p[i + aoff], alen))
+                               goto trunc;

                        i += aoff + alen;
                }
                        i += aoff + alen;
                }

-       }
+       } 

        p += 2 + len;
 
        if (dat + length > p) {
        p += 2 + len;
 
        if (dat + length > p) {

-            printf("\n\t  Updated routes:");
+               printf("\n\t  Updated routes:");

                while (dat + length > p) {
                        char buf[MAXHOSTNAMELEN + 100];
                        i = decode_prefix4(p, buf, sizeof(buf));
                while (dat + length > p) {
                        char buf[MAXHOSTNAMELEN + 100];
                        i = decode_prefix4(p, buf, sizeof(buf));

-                       if (i >= 0) {
-                               printf("\n\t    %s", buf);
-                               p += i;
-                       } else {
+                       if (i == -1) {

                                printf("\n\t    (illegal prefix length)");
                                break;
                                printf("\n\t    (illegal prefix length)");
                                break;

+                       } else if (i == -2)
+                               goto trunc;
+                       else {
+                               printf("\n\t    %s", buf);
+                               p += i;

                        }
                }
        }
                        }
                }
        }


@@ -1419,56 +1862,68 @@ static void
 bgp_notification_print(const u_char *dat, int length)
 {
        struct bgp_notification bgpn;
 bgp_notification_print(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);
        memcpy(&bgpn, dat, BGP_NOTIFICATION_SIZE);
 
        TCHECK2(dat[0], BGP_NOTIFICATION_SIZE);
        memcpy(&bgpn, dat, BGP_NOTIFICATION_SIZE);

-       hlen = ntohs(bgpn.bgpn_len);

 
         /* some little sanity checking */
         if (length<BGP_NOTIFICATION_SIZE)
             return;
 
        printf(", %s (%u)",
 
         /* some little sanity checking */
         if (length<BGP_NOTIFICATION_SIZE)
             return;
 
        printf(", %s (%u)",

-              tok2str(bgp_notify_major_values, "Unknown Error", bgpn.bgpn_major),
+              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 (%u)",
               bgpn.bgpn_major);
 
         switch (bgpn.bgpn_major) {
 
         case BGP_NOTIFY_MAJOR_MSG:
             printf(", subcode %s (%u)",

-                  tok2str(bgp_notify_minor_msg_values, "Unknown", bgpn.bgpn_minor),
+                  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 (%u)",
                   bgpn.bgpn_minor);
             break;
         case BGP_NOTIFY_MAJOR_OPEN:
             printf(", subcode %s (%u)",

-                  tok2str(bgp_notify_minor_open_values, "Unknown", bgpn.bgpn_minor),
+                  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 (%u)",
                   bgpn.bgpn_minor);
             break;
         case BGP_NOTIFY_MAJOR_UPDATE:
             printf(", subcode %s (%u)",

-                  tok2str(bgp_notify_minor_update_values, "Unknown", bgpn.bgpn_minor),
+                  tok2strbuf(bgp_notify_minor_update_values, "Unknown",
+                             bgpn.bgpn_minor, tokbuf, sizeof(tokbuf)),

                   bgpn.bgpn_minor);
             break;
         case BGP_NOTIFY_MAJOR_CAP:
             printf(" subcode %s (%u)",
                   bgpn.bgpn_minor);
             break;
         case BGP_NOTIFY_MAJOR_CAP:
             printf(" subcode %s (%u)",

-                  tok2str(bgp_notify_minor_cap_values, "Unknown", bgpn.bgpn_minor),
+                  tok2strbuf(bgp_notify_minor_cap_values, "Unknown",
+                             bgpn.bgpn_minor, tokbuf, sizeof(tokbuf)),

                   bgpn.bgpn_minor);
         case BGP_NOTIFY_MAJOR_CEASE:
             printf(", subcode %s (%u)",
                   bgpn.bgpn_minor);
         case BGP_NOTIFY_MAJOR_CEASE:
             printf(", subcode %s (%u)",

-                  tok2str(bgp_notify_minor_cease_values, "Unknown", bgpn.bgpn_minor),
+                  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
              */
                   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)
+           if(bgpn.bgpn_minor == BGP_NOTIFY_MINOR_CEASE_MAXPRFX && length >= BGP_NOTIFICATION_SIZE + 7) {
+               tptr = dat + BGP_NOTIFICATION_SIZE;
+               TCHECK2(*tptr, 7);

                printf(", AFI %s (%u), SAFI %s (%u), Max Prefixes: %u",
                printf(", AFI %s (%u), SAFI %s (%u), Max Prefixes: %u",

-                      tok2str(bgp_afi_values, "Unknown", EXTRACT_16BITS(&bgpn.bgpn_data)),
-                      EXTRACT_16BITS(&bgpn.bgpn_data),
-                      tok2str(bgp_safi_values, "Unknown", *(bgpn.bgpn_data+2)),
-                      *(bgpn.bgpn_data+2),
-                      EXTRACT_32BITS(&bgpn.bgpn_data+3));
+                      tok2strbuf(bgp_afi_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;
             break;
         default:
             break;


@@ -1483,31 +1938,50 @@ static void
 bgp_route_refresh_print(const u_char *pptr, int len) {
 
         const struct bgp_route_refresh *bgp_route_refresh_header;
 bgp_route_refresh_print(const u_char *pptr, int len) {
 
         const struct bgp_route_refresh *bgp_route_refresh_header;

+       char tokbuf[TOKBUFSIZE];
+       char tokbuf2[TOKBUFSIZE];
+
+       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)",
         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 */
+               tok2strbuf(bgp_afi_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),
                EXTRACT_16BITS(&bgp_route_refresh_header->afi),

-               tok2str(bgp_safi_values,"Unknown",
-                       bgp_route_refresh_header->safi),
+               tok2strbuf(bgp_safi_values,"Unknown",
+                         bgp_route_refresh_header->safi,
+                         tokbuf2, sizeof(tokbuf2)),

                bgp_route_refresh_header->safi);
 
                bgp_route_refresh_header->safi);
 

-        if (vflag > 1)
+        if (vflag > 1) {
+            TCHECK2(*pptr, len);

             print_unknown_data(pptr,"\n\t  ", len);
             print_unknown_data(pptr,"\n\t  ", len);

+        }

         
         return;
         
         return;

+trunc:
+       printf("[|BGP]");

 }
 
 }
 

-static void
+static int

 bgp_header_print(const u_char *dat, int length)
 {
        struct bgp bgp;
 bgp_header_print(const u_char *dat, int length)
 {
        struct bgp bgp;

+       char tokbuf[TOKBUFSIZE];

 
        TCHECK2(dat[0], BGP_SIZE);
        memcpy(&bgp, dat, BGP_SIZE);
        printf("\n\t%s Message (%u), length: %u",
 
        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),
+               tok2strbuf(bgp_msg_values, "Unknown", bgp.bgp_type,
+                         tokbuf, sizeof(tokbuf)),

                bgp.bgp_type,
                length);
 
                bgp.bgp_type,
                length);
 


@@ -1527,14 +2001,16 @@ bgp_header_print(const u_char *dat, int length)
                 bgp_route_refresh_print(dat, length);
                 break;
         default:
                 bgp_route_refresh_print(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 */
+                TCHECK2(*dat, length);
+                printf("\n\t  no Message %u decoder",bgp.bgp_type);
+                print_unknown_data(dat,"\n\t  ",length);

                 break;
        }
                 break;
        }

-       return;
+       return 1;

 trunc:
        printf("[|BGP]");
 trunc:
        printf("[|BGP]");

+       return 0;

 }
 
 void
 }
 
 void


@@ -1549,6 +2025,7 @@ bgp_print(const u_char *dat, int length)
        };
        struct bgp bgp;
        u_int16_t hlen;
        };
        struct bgp bgp;
        u_int16_t hlen;

+       char tokbuf[TOKBUFSIZE];

 
        ep = dat + length;
        if (snapend < dat + length)
 
        ep = dat + length;
        if (snapend < dat + length)


@@ -1561,7 +2038,7 @@ bgp_print(const u_char *dat, int length)
 
        p = dat;
        start = p;
 
        p = dat;
        start = p;

-       while (p < snapend) {
+       while (p < ep) {

                if (!TTEST2(p[0], 1))
                        break;
                if (p[0] != 0xff) {
                if (!TTEST2(p[0], 1))
                        break;
                if (p[0] != 0xff) {


@@ -1584,13 +2061,23 @@ bgp_print(const u_char *dat, int length)
                        printf(" [|BGP]");
 
                hlen = ntohs(bgp.bgp_len);
                        printf(" [|BGP]");
 
                hlen = ntohs(bgp.bgp_len);

+               if (hlen < BGP_SIZE) {
+                       printf("\n[|BGP Bogus header length %u < %u]", hlen,
+                           BGP_SIZE);
+                       break;
+               }

 
                if (TTEST2(p[0], hlen)) {
 
                if (TTEST2(p[0], hlen)) {

-                       bgp_header_print(p, hlen);
+                       if (!bgp_header_print(p, hlen))
+                               return;

                        p += hlen;
                        start = p;
                } else {
                        p += hlen;
                        start = p;
                } else {

-                       printf("\n[|BGP %s]", tok2str(bgp_msg_values, "Unknown Message Type",bgp.bgp_type));
+                       printf("\n[|BGP %s]",
+                              tok2strbuf(bgp_msg_values,
+                                         "Unknown Message Type",
+                                         bgp.bgp_type,
+                                         tokbuf, sizeof(tokbuf)));

                        break;
                }
        }
                        break;
                }
        }


@@ -1600,14 +2087,3 @@ bgp_print(const u_char *dat, int length)
 trunc:
        printf(" [|BGP]");
 }
 trunc:
        printf(" [|BGP]");
 }

-
-
-
-
-
-
-
-
-
-
-