CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10

[tcpdump] / print-bgp.c

diff --git a/print-bgp.c b/print-bgp.c
index c4c79b2d591ffef0b8d8560e7f8167372d927a4e..bb302545d34494cc0c014935e1d537d17cb04abf 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -34,9 +34,7 @@
 
 /* specification: RFC 4271 */
 
 
 /* specification: RFC 4271 */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -288,7 +286,8 @@ static const struct tok bgp_capcode_values[] = {
 #define BGP_NOTIFY_MAJOR_HOLDTIME       4
 #define BGP_NOTIFY_MAJOR_FSM            5
 #define BGP_NOTIFY_MAJOR_CEASE          6
 #define BGP_NOTIFY_MAJOR_HOLDTIME       4
 #define BGP_NOTIFY_MAJOR_FSM            5
 #define BGP_NOTIFY_MAJOR_CEASE          6

-#define BGP_NOTIFY_MAJOR_CAP            7
+#define BGP_NOTIFY_MAJOR_ROUTEREFRESH   7
+#define BGP_NOTIFY_MAJOR_SENDHOLDTIME   8

 
 static const struct tok bgp_notify_major_values[] = {
     { BGP_NOTIFY_MAJOR_MSG,     "Message Header Error"},
 
 static const struct tok bgp_notify_major_values[] = {
     { BGP_NOTIFY_MAJOR_MSG,     "Message Header Error"},


@@ -297,7 +296,8 @@ static const struct tok bgp_notify_major_values[] = {
     { BGP_NOTIFY_MAJOR_HOLDTIME,"Hold Timer Expired"},
     { BGP_NOTIFY_MAJOR_FSM,     "Finite State Machine Error"},
     { BGP_NOTIFY_MAJOR_CEASE,   "Cease"},
     { BGP_NOTIFY_MAJOR_HOLDTIME,"Hold Timer Expired"},
     { BGP_NOTIFY_MAJOR_FSM,     "Finite State Machine Error"},
     { BGP_NOTIFY_MAJOR_CEASE,   "Cease"},

-    { BGP_NOTIFY_MAJOR_CAP,     "Capability Message Error"},
+    { BGP_NOTIFY_MAJOR_ROUTEREFRESH, "ROUTE-REFRESH Message Error"},
+    { BGP_NOTIFY_MAJOR_SENDHOLDTIME, "Send Hold Timer Expired"},

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


@@ -363,11 +363,8 @@ static const struct tok bgp_notify_minor_fsm_values[] = {
     { 0, NULL }
 };
 
     { 0, NULL }
 };
 

-static const struct tok bgp_notify_minor_cap_values[] = {
-    { 1,                        "Invalid Action Value" },
-    { 2,                        "Invalid Capability Length" },
-    { 3,                        "Malformed Capability Value" },
-    { 4,                        "Unsupported Capability Code" },
+static const struct tok bgp_notify_minor_routerefresh_values[] = {
+    { 1,                        "Invalid Message Length" },

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


@@ -698,9 +695,8 @@ badtlv:
 }
 
 static int
 }
 
 static int

-decode_labeled_prefix4(netdissect_options *ndo,
-                       const u_char *pptr, u_int itemlen, char *buf,
-                       size_t buflen)
+print_labeled_prefix4(netdissect_options *ndo,
+                      const u_char *pptr, u_int itemlen)

 {
     nd_ipv4 addr;
     u_int plen, plenbytes;
 {
     nd_ipv4 addr;
     u_int plen, plenbytes;


@@ -719,12 +715,12 @@ decode_labeled_prefix4(netdissect_options *ndo,
     */
 
     if (24 > plen)
     */
 
     if (24 > plen)

-        return -1;
+        goto badplen;

 
     plen-=24; /* adjust prefixlen - labellength */
 
     if (32 < plen)
 
     plen-=24; /* adjust prefixlen - labellength */
 
     if (32 < plen)

-        return -1;
+        goto badplen;

     itemlen -= 4;
 
     memset(&addr, 0, sizeof(addr));
     itemlen -= 4;
 
     memset(&addr, 0, sizeof(addr));


@@ -735,7 +731,7 @@ decode_labeled_prefix4(netdissect_options *ndo,
         ((u_char *)&addr)[plenbytes - 1] &= ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* the label may get offsetted by 4 bits so lets shift it right */
         ((u_char *)&addr)[plenbytes - 1] &= ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* the label may get offsetted by 4 bits so lets shift it right */

-    snprintf(buf, buflen, "%s/%u, label:%u %s",
+    ND_PRINT("\n\t      %s/%u, label:%u %s",

              ipaddr_string(ndo, (const u_char *)&addr),
              plen,
              GET_BE_U_3(pptr + 1)>>4,
              ipaddr_string(ndo, (const u_char *)&addr),
              plen,
              GET_BE_U_3(pptr + 1)>>4,


@@ -743,6 +739,10 @@ decode_labeled_prefix4(netdissect_options *ndo,
 
     return 4 + plenbytes;
 
 
     return 4 + plenbytes;
 

+badplen:
+    ND_PRINT("\n\t    (illegal prefix length)");
+    return -1;
+

 trunc:
     return -2;
 
 trunc:
     return -2;
 


@@ -800,11 +800,10 @@ bgp_vpn_ip_print(netdissect_options *ndo,
  * return the number of bytes read from the wire.
  */
 static u_int
  * return the number of bytes read from the wire.
  */
 static u_int

-bgp_vpn_sg_print(netdissect_options *ndo,
-                 const u_char *pptr, char *buf, size_t buflen)
+bgp_vpn_sg_print(netdissect_options *ndo, const u_char *pptr)

 {
     uint8_t addr_length;
 {
     uint8_t addr_length;

-    u_int total_length, offset;
+    u_int total_length;

 
     total_length = 0;
 
 
     total_length = 0;
 


@@ -815,10 +814,9 @@ bgp_vpn_sg_print(netdissect_options *ndo,
     /* Source address */
     ND_TCHECK_LEN(pptr, (addr_length >> 3));
     total_length += (addr_length >> 3) + 1;
     /* Source address */
     ND_TCHECK_LEN(pptr, (addr_length >> 3));
     total_length += (addr_length >> 3) + 1;

-    offset = (u_int)strlen(buf);

     if (addr_length) {
     if (addr_length) {

-        snprintf(buf + offset, buflen - offset, ", Source %s",
-             bgp_vpn_ip_print(ndo, pptr, addr_length));
+        ND_PRINT(", Source %s",
+                 bgp_vpn_ip_print(ndo, pptr, addr_length));

         pptr += (addr_length >> 3);
     }
 
         pptr += (addr_length >> 3);
     }
 


@@ -829,10 +827,9 @@ bgp_vpn_sg_print(netdissect_options *ndo,
     /* Group address */
     ND_TCHECK_LEN(pptr, (addr_length >> 3));
     total_length += (addr_length >> 3) + 1;
     /* Group address */
     ND_TCHECK_LEN(pptr, (addr_length >> 3));
     total_length += (addr_length >> 3) + 1;

-    offset = (u_int)strlen(buf);

     if (addr_length) {
     if (addr_length) {

-        snprintf(buf + offset, buflen - offset, ", Group %s",
-             bgp_vpn_ip_print(ndo, pptr, addr_length));
+        ND_PRINT(", Group %s",
+                 bgp_vpn_ip_print(ndo, pptr, addr_length));

         pptr += (addr_length >> 3);
     }
 
         pptr += (addr_length >> 3);
     }
 


@@ -842,8 +839,7 @@ trunc:
 
 /* Print an RFC 4364 Route Distinguisher */
 const char *
 
 /* Print an RFC 4364 Route Distinguisher */
 const char *

-bgp_vpn_rd_print(netdissect_options *ndo,
-                 const u_char *pptr)
+bgp_vpn_rd_print(netdissect_options *ndo, const u_char *pptr)

 {
     /* allocate space for the largest possible string */
     static char rd[sizeof("xxxxx.xxxxx:xxxxx (xxx.xxx.xxx.xxx:xxxxx)")];
 {
     /* allocate space for the largest possible string */
     static char rd[sizeof("xxxxx.xxxxx:xxxxx (xxx.xxx.xxx.xxx:xxxxx)")];


@@ -895,10 +891,6 @@ static void
 bgp_extended_community_print(netdissect_options *ndo,
                              const u_char *pptr)
 {
 bgp_extended_community_print(netdissect_options *ndo,
                              const u_char *pptr)
 {

-    union { /* copy buffer for bandwidth values */
-        float f;
-        uint32_t i;
-    } bw;

     /* allocate space for the largest possible string */
     char astostr[AS_STR_SIZE];
 
     /* allocate space for the largest possible string */
     char astostr[AS_STR_SIZE];
 


@@ -930,9 +922,8 @@ bgp_extended_community_print(netdissect_options *ndo,
             break;
 
     case BGP_EXT_COM_LINKBAND:
             break;
 
     case BGP_EXT_COM_LINKBAND:

-            bw.i = GET_BE_U_4(pptr + 4);

             ND_PRINT("bandwidth: %.3f Mbps",
             ND_PRINT("bandwidth: %.3f Mbps",

-                     bw.f*8/1000000);
+                     GET_BE_F_4(pptr + 4)*8/1000000);

             break;
 
     case BGP_EXT_COM_OVS:
             break;
 
     case BGP_EXT_COM_OVS:


@@ -1093,8 +1084,7 @@ bgp_rt_prefix_print(netdissect_options *ndo,
 
 /* RFC 4684 */
 static int
 
 /* RFC 4684 */
 static int

-decode_rt_routing_info(netdissect_options *ndo,
-                       const u_char *pptr)
+print_rt_routing_info(netdissect_options *ndo, const u_char *pptr)

 {
     uint8_t route_target[8];
     u_int plen;
 {
     uint8_t route_target[8];
     u_int plen;


@@ -1150,8 +1140,7 @@ decode_rt_routing_info(netdissect_options *ndo,
 }
 
 static int
 }
 
 static int

-decode_labeled_vpn_prefix4(netdissect_options *ndo,
-                           const u_char *pptr, char *buf, size_t buflen)
+print_labeled_vpn_prefix4(netdissect_options *ndo, const u_char *pptr)

 {
     nd_ipv4 addr;
     u_int plen;
 {
     nd_ipv4 addr;
     u_int plen;


@@ -1159,12 +1148,12 @@ decode_labeled_vpn_prefix4(netdissect_options *ndo,
     plen = GET_U_1(pptr);   /* get prefix length */
 
     if ((24+64) > plen)
     plen = GET_U_1(pptr);   /* get prefix length */
 
     if ((24+64) > plen)

-        return -1;
+        goto badplen;

 
     plen -= (24+64); /* adjust prefixlen - labellength - RD len*/
 
     if (32 < plen)
 
     plen -= (24+64); /* adjust prefixlen - labellength - RD len*/
 
     if (32 < plen)

-        return -1;
+        goto badplen;

 
     memset(&addr, 0, sizeof(addr));
     GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);
 
     memset(&addr, 0, sizeof(addr));
     GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);


@@ -1173,7 +1162,7 @@ decode_labeled_vpn_prefix4(netdissect_options *ndo,
             ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* the label may get offsetted by 4 bits so lets shift it right */
             ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* the label may get offsetted by 4 bits so lets shift it right */

-    snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
+    ND_PRINT("\n\t      RD: %s, %s/%u, label:%u %s",

                 bgp_vpn_rd_print(ndo, pptr+4),
                 ipaddr_string(ndo, (const u_char *)&addr),
                 plen,
                 bgp_vpn_rd_print(ndo, pptr+4),
                 ipaddr_string(ndo, (const u_char *)&addr),
                 plen,


@@ -1181,6 +1170,10 @@ decode_labeled_vpn_prefix4(netdissect_options *ndo,
                 ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
     return 12 + (plen + 7) / 8;
                 ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
     return 12 + (plen + 7) / 8;

+
+badplen:
+    ND_PRINT("\n\t    (illegal prefix length)");
+    return -1;

 }
 
 /*
 }
 
 /*


@@ -1196,15 +1189,16 @@ decode_labeled_vpn_prefix4(netdissect_options *ndo,
 #define MDT_VPN_NLRI_LEN 16
 
 static int
 #define MDT_VPN_NLRI_LEN 16
 
 static int

-decode_mdt_vpn_nlri(netdissect_options *ndo,
-                    const u_char *pptr, char *buf, size_t buflen)
+print_mdt_vpn_nlri(netdissect_options *ndo, const u_char *pptr)

 {
     const u_char *rd;
     const u_char *vpn_ip;
 
     /* if the NLRI is not predefined length, quit.*/
 {
     const u_char *rd;
     const u_char *vpn_ip;
 
     /* if the NLRI is not predefined length, quit.*/

-    if (GET_U_1(pptr) != MDT_VPN_NLRI_LEN * 8)
+    if (GET_U_1(pptr) != MDT_VPN_NLRI_LEN * 8) {
+        ND_PRINT("\n\t    (illegal prefix length)");

         return -1;
         return -1;

+    }

     pptr++;
 
     /* RD */
     pptr++;
 
     /* RD */


@@ -1217,8 +1211,10 @@ decode_mdt_vpn_nlri(netdissect_options *ndo,
     pptr += sizeof(nd_ipv4);
 
     /* MDT Group Address */
     pptr += sizeof(nd_ipv4);
 
     /* MDT Group Address */

-    snprintf(buf, buflen, "RD: %s, VPN IP Address: %s, MC Group Address: %s",
-                bgp_vpn_rd_print(ndo, rd), GET_IPADDR_STRING(vpn_ip), GET_IPADDR_STRING(pptr));
+    ND_PRINT("\n\t      RD: %s, VPN IP Address: %s, MC Group Address: %s",
+             bgp_vpn_rd_print(ndo, rd),
+             GET_IPADDR_STRING(vpn_ip),
+             GET_IPADDR_STRING(pptr));

 
     return MDT_VPN_NLRI_LEN + 1;
 
 
     return MDT_VPN_NLRI_LEN + 1;
 


@@ -1246,21 +1242,19 @@ static const struct tok bgp_multicast_vpn_route_type_values[] = {
 };
 
 static int
 };
 
 static int

-decode_multicast_vpn(netdissect_options *ndo,
-                     const u_char *pptr, char *buf, size_t buflen)
+print_multicast_vpn(netdissect_options *ndo, const u_char *pptr)

 {
     /* allocate space for the largest possible string */
     char astostr[AS_STR_SIZE];
     uint8_t route_type, route_length;
     u_int addr_length, sg_length;
 {
     /* allocate space for the largest possible string */
     char astostr[AS_STR_SIZE];
     uint8_t route_type, route_length;
     u_int addr_length, sg_length;

-    u_int offset;

 
     route_type = GET_U_1(pptr);
     pptr++;
     route_length = GET_U_1(pptr);
     pptr++;
 
 
     route_type = GET_U_1(pptr);
     pptr++;
     route_length = GET_U_1(pptr);
     pptr++;
 

-    snprintf(buf, buflen, "Route-Type: %s (%u), length: %u",
+    ND_PRINT("\n\t      Route-Type: %s (%u), length: %u",

          tok2str(bgp_multicast_vpn_route_type_values,
                  "Unknown", route_type),
          route_type, route_length);
          tok2str(bgp_multicast_vpn_route_type_values,
                  "Unknown", route_type),
          route_type, route_length);


@@ -1268,58 +1262,52 @@ decode_multicast_vpn(netdissect_options *ndo,
     switch(route_type) {
     case BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_I_PMSI:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);
     switch(route_type) {
     case BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_I_PMSI:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);

-        offset = (u_int)strlen(buf);
-        snprintf(buf + offset, buflen - offset, ", RD: %s, Originator %s",
+        if (route_length < BGP_VPN_RD_LEN)
+            goto trunc;
+        ND_PRINT(", RD: %s, Originator %s",

                     bgp_vpn_rd_print(ndo, pptr),
                     bgp_vpn_ip_print(ndo, pptr + BGP_VPN_RD_LEN,
                                      (route_length - BGP_VPN_RD_LEN) << 3));
         break;
     case BGP_MULTICAST_VPN_ROUTE_TYPE_INTER_AS_I_PMSI:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN + 4);
                     bgp_vpn_rd_print(ndo, pptr),
                     bgp_vpn_ip_print(ndo, pptr + BGP_VPN_RD_LEN,
                                      (route_length - BGP_VPN_RD_LEN) << 3));
         break;
     case BGP_MULTICAST_VPN_ROUTE_TYPE_INTER_AS_I_PMSI:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN + 4);

-        offset = (u_int)strlen(buf);
-        snprintf(buf + offset, buflen - offset, ", RD: %s, Source-AS %s",
-        bgp_vpn_rd_print(ndo, pptr),
-        as_printf(ndo, astostr, sizeof(astostr),
-        GET_BE_U_4(pptr + BGP_VPN_RD_LEN)));
+        ND_PRINT(", RD: %s, Source-AS %s",
+                 bgp_vpn_rd_print(ndo, pptr),
+                 as_printf(ndo, astostr, sizeof(astostr),
+                           GET_BE_U_4(pptr + BGP_VPN_RD_LEN)));

         break;
 
     case BGP_MULTICAST_VPN_ROUTE_TYPE_S_PMSI:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);
         break;
 
     case BGP_MULTICAST_VPN_ROUTE_TYPE_S_PMSI:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);

-        offset = (u_int)strlen(buf);
-        snprintf(buf + offset, buflen - offset, ", RD: %s",
-                    bgp_vpn_rd_print(ndo, pptr));
+        ND_PRINT(", RD: %s",  bgp_vpn_rd_print(ndo, pptr));

         pptr += BGP_VPN_RD_LEN;
 
         pptr += BGP_VPN_RD_LEN;
 

-        sg_length = bgp_vpn_sg_print(ndo, pptr, buf, buflen);
+        sg_length = bgp_vpn_sg_print(ndo, pptr);

         addr_length =  route_length - sg_length;
 
         ND_TCHECK_LEN(pptr, addr_length);
         addr_length =  route_length - sg_length;
 
         ND_TCHECK_LEN(pptr, addr_length);

-        offset = (u_int)strlen(buf);
-        snprintf(buf + offset, buflen - offset, ", Originator %s",
-                    bgp_vpn_ip_print(ndo, pptr, addr_length << 3));
+        ND_PRINT(", Originator %s",
+                 bgp_vpn_ip_print(ndo, pptr, addr_length << 3));

         break;
 
     case BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_ACTIVE:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);
         break;
 
     case BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_ACTIVE:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);

-        offset = (u_int)strlen(buf);
-        snprintf(buf + offset, buflen - offset, ", RD: %s",
-                    bgp_vpn_rd_print(ndo, pptr));
+        ND_PRINT(", RD: %s", bgp_vpn_rd_print(ndo, pptr));

         pptr += BGP_VPN_RD_LEN;
 
         pptr += BGP_VPN_RD_LEN;
 

-        bgp_vpn_sg_print(ndo, pptr, buf, buflen);
+        bgp_vpn_sg_print(ndo, pptr);

         break;
 
     case BGP_MULTICAST_VPN_ROUTE_TYPE_SHARED_TREE_JOIN: /* fall through */
     case BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_TREE_JOIN:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN + 4);
         break;
 
     case BGP_MULTICAST_VPN_ROUTE_TYPE_SHARED_TREE_JOIN: /* fall through */
     case BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_TREE_JOIN:
         ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN + 4);

-        offset = (u_int)strlen(buf);
-        snprintf(buf + offset, buflen - offset, ", RD: %s, Source-AS %s",
-                    bgp_vpn_rd_print(ndo, pptr),
-                    as_printf(ndo, astostr, sizeof(astostr),
-                    GET_BE_U_4(pptr + BGP_VPN_RD_LEN)));
+        ND_PRINT(", RD: %s, Source-AS %s",
+                 bgp_vpn_rd_print(ndo, pptr),
+                 as_printf(ndo, astostr, sizeof(astostr),
+                           GET_BE_U_4(pptr + BGP_VPN_RD_LEN)));

         pptr += BGP_VPN_RD_LEN + 4;
 
         pptr += BGP_VPN_RD_LEN + 4;
 

-        bgp_vpn_sg_print(ndo, pptr, buf, buflen);
+        bgp_vpn_sg_print(ndo, pptr);

         break;
 
         /*
         break;
 
         /*


@@ -1336,32 +1324,10 @@ trunc:
     return -2;
 }
 
     return -2;
 }
 

-/*
- * As I remember, some versions of systems have an snprintf() that
- * returns -1 if the buffer would have overflowed.  If the return
- * value is negative, set buflen to 0, to indicate that we've filled
- * the buffer up.
- *
- * If the return value is greater than buflen, that means that
- * the buffer would have overflowed; again, set buflen to 0 in
- * that case.
- */
-#define UPDATE_BUF_BUFLEN(buf, buflen, stringlen) \
-    if (stringlen<0) \
-        buflen=0; \
-    else if ((u_int)stringlen>buflen) \
-        buflen=0; \
-    else { \
-        buflen-=stringlen; \
-        buf+=stringlen; \
-    }
-

 static int
 static int

-decode_labeled_vpn_l2(netdissect_options *ndo,
-                      const u_char *pptr, char *buf, size_t buflen)
+print_labeled_vpn_l2(netdissect_options *ndo, const u_char *pptr)

 {
     u_int plen, tlen, tlv_type, tlv_len, ttlv_len;
 {
     u_int plen, tlen, tlv_type, tlv_len, ttlv_len;

-    int stringlen;

 
     plen = GET_BE_U_2(pptr);
     tlen = plen;
 
     plen = GET_BE_U_2(pptr);
     tlen = plen;


@@ -1373,36 +1339,27 @@ decode_labeled_vpn_l2(netdissect_options *ndo,
     if (plen == 12) {
         /* assume AD-only with RD, BGPNH */
         ND_TCHECK_LEN(pptr, 12);
     if (plen == 12) {
         /* assume AD-only with RD, BGPNH */
         ND_TCHECK_LEN(pptr, 12);

-        buf[0] = '\0';
-        stringlen = snprintf(buf, buflen, "RD: %s, BGPNH: %s",
+        ND_PRINT("\n\t      RD: %s, BGPNH: %s",

                                 bgp_vpn_rd_print(ndo, pptr),
                                 GET_IPADDR_STRING(pptr+8));
                                 bgp_vpn_rd_print(ndo, pptr),
                                 GET_IPADDR_STRING(pptr+8));

-        UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
-        pptr += 12;
-        tlen -= 12;

         return plen + 2;
     } else if (plen > 17) {
         /* assume old format */
         /* RD, ID, LBLKOFF, LBLBASE */
 
         ND_TCHECK_LEN(pptr, 15);
         return plen + 2;
     } else if (plen > 17) {
         /* assume old format */
         /* RD, ID, LBLKOFF, LBLBASE */
 
         ND_TCHECK_LEN(pptr, 15);

-        buf[0] = '\0';
-        stringlen = snprintf(buf, buflen, "RD: %s, CE-ID: %u, Label-Block Offset: %u, Label Base %u",
+        ND_PRINT("\n\t      RD: %s, CE-ID: %u, Label-Block Offset: %u, Label Base %u",

                                 bgp_vpn_rd_print(ndo, pptr),
                                 GET_BE_U_2(pptr + 8),
                                 GET_BE_U_2(pptr + 10),
                                 GET_BE_U_3(pptr + 12)>>4); /* the label is offsetted by 4 bits so lets shift it right */
                                 bgp_vpn_rd_print(ndo, pptr),
                                 GET_BE_U_2(pptr + 8),
                                 GET_BE_U_2(pptr + 10),
                                 GET_BE_U_3(pptr + 12)>>4); /* the label is offsetted by 4 bits so lets shift it right */

-        UPDATE_BUF_BUFLEN(buf, buflen, stringlen);

         pptr += 15;
         tlen -= 15;
 
         /* ok now the variable part - lets read out TLVs*/
         while (tlen != 0) {
             if (tlen < 3) {
         pptr += 15;
         tlen -= 15;
 
         /* ok now the variable part - lets read out TLVs*/
         while (tlen != 0) {
             if (tlen < 3) {

-                if (buflen != 0) {
-                    stringlen=snprintf(buf,buflen, "\n\t\tran past the end");
-                    UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
-                }
+                ND_PRINT("\n\t\tran past the end");

                 return plen + 2;
             }
             tlv_type = GET_U_1(pptr);
                 return plen + 2;
             }
             tlv_type = GET_U_1(pptr);


@@ -1413,43 +1370,27 @@ decode_labeled_vpn_l2(netdissect_options *ndo,
 
             switch(tlv_type) {
             case 1:
 
             switch(tlv_type) {
             case 1:

-                if (buflen != 0) {
-                    stringlen=snprintf(buf,buflen, "\n\t\tcircuit status vector (%u) length: %u: 0x",
-                                          tlv_type,
-                                          tlv_len);
-                    UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
-                }
+                ND_PRINT("\n\t\tcircuit status vector (%u) length: %u: 0x",
+                                      tlv_type,
+                                      tlv_len);

                 while (ttlv_len != 0) {
                     if (tlen < 1) {
                 while (ttlv_len != 0) {
                     if (tlen < 1) {

-                        if (buflen != 0) {
-                            stringlen=snprintf(buf,buflen, " (ran past the end)");
-                            UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
-                        }
+                        ND_PRINT(" (ran past the end)");

                         return plen + 2;
                     }
                     ND_TCHECK_1(pptr);
                         return plen + 2;
                     }
                     ND_TCHECK_1(pptr);

-                    if (buflen != 0) {
-                        stringlen=snprintf(buf,buflen, "%02x",
-                                              GET_U_1(pptr));
-                        pptr++;
-                        UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
-                    }
+                    ND_PRINT("%02x", GET_U_1(pptr));
+                    pptr++;

                     ttlv_len--;
                     tlen--;
                 }
                 break;
             default:
                     ttlv_len--;
                     tlen--;
                 }
                 break;
             default:

-                if (buflen != 0) {
-                    stringlen=snprintf(buf,buflen, "\n\t\tunknown TLV #%u, length: %u",
-                                          tlv_type,
-                                          tlv_len);
-                    UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
-                }
+                ND_PRINT("\n\t\tunknown TLV #%u, length: %u",
+                                      tlv_type,
+                                      tlv_len);

                 if (tlen < ttlv_len) {
                 if (tlen < ttlv_len) {

-                    if (buflen != 0) {
-                        stringlen=snprintf(buf,buflen, " (ran past the end)");
-                        UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
-                    }
+                    ND_PRINT(" (ran past the end)");

                     return plen + 2;
                 }
                 tlen -= ttlv_len;
                     return plen + 2;
                 }
                 tlen -= ttlv_len;


@@ -1496,8 +1437,8 @@ badtlv:
 }
 
 static int
 }
 
 static int

-decode_labeled_prefix6(netdissect_options *ndo,
-               const u_char *pptr, u_int itemlen, char *buf, size_t buflen)
+print_labeled_prefix6(netdissect_options *ndo,
+                      const u_char *pptr, u_int itemlen)

 {
     nd_ipv6 addr;
     u_int plen, plenbytes;
 {
     nd_ipv6 addr;
     u_int plen, plenbytes;


@@ -1508,12 +1449,12 @@ decode_labeled_prefix6(netdissect_options *ndo,
     plen = GET_U_1(pptr); /* get prefix length */
 
     if (24 > plen)
     plen = GET_U_1(pptr); /* get prefix length */
 
     if (24 > plen)

-        return -1;
+        goto badplen;

 
     plen -= 24; /* adjust prefixlen - labellength */
 
     if (128 < plen)
 
     plen -= 24; /* adjust prefixlen - labellength */
 
     if (128 < plen)

-        return -1;
+        goto badplen;

     itemlen -= 4;
 
     memset(&addr, 0, sizeof(addr));
     itemlen -= 4;
 
     memset(&addr, 0, sizeof(addr));


@@ -1524,7 +1465,7 @@ decode_labeled_prefix6(netdissect_options *ndo,
             ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* the label may get offsetted by 4 bits so lets shift it right */
             ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* the label may get offsetted by 4 bits so lets shift it right */

-    snprintf(buf, buflen, "%s/%u, label:%u %s",
+    ND_PRINT("\n\t      %s/%u, label:%u %s",

                 ip6addr_string(ndo, (const u_char *)&addr),
                 plen,
                 GET_BE_U_3(pptr + 1)>>4,
                 ip6addr_string(ndo, (const u_char *)&addr),
                 plen,
                 GET_BE_U_3(pptr + 1)>>4,


@@ -1532,6 +1473,10 @@ decode_labeled_prefix6(netdissect_options *ndo,
 
     return 4 + plenbytes;
 
 
     return 4 + plenbytes;
 

+badplen:
+    ND_PRINT("\n\t    (illegal prefix length)");
+    return -1;
+

 trunc:
     return -2;
 
 trunc:
     return -2;
 


@@ -1540,8 +1485,7 @@ badtlv:
 }
 
 static int
 }
 
 static int

-decode_labeled_vpn_prefix6(netdissect_options *ndo,
-                           const u_char *pptr, char *buf, size_t buflen)
+print_labeled_vpn_prefix6(netdissect_options *ndo, const u_char *pptr)

 {
     nd_ipv6 addr;
     u_int plen;
 {
     nd_ipv6 addr;
     u_int plen;


@@ -1549,12 +1493,12 @@ decode_labeled_vpn_prefix6(netdissect_options *ndo,
     plen = GET_U_1(pptr);   /* get prefix length */
 
     if ((24+64) > plen)
     plen = GET_U_1(pptr);   /* get prefix length */
 
     if ((24+64) > plen)

-        return -1;
+        goto badplen;

 
     plen -= (24+64); /* adjust prefixlen - labellength - RD len*/
 
     if (128 < plen)
 
     plen -= (24+64); /* adjust prefixlen - labellength - RD len*/
 
     if (128 < plen)

-        return -1;
+        goto badplen;

 
     memset(&addr, 0, sizeof(addr));
     GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);
 
     memset(&addr, 0, sizeof(addr));
     GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);


@@ -1563,7 +1507,7 @@ decode_labeled_vpn_prefix6(netdissect_options *ndo,
             ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* the label may get offsetted by 4 bits so lets shift it right */
             ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* the label may get offsetted by 4 bits so lets shift it right */

-    snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
+    ND_PRINT("\n\t      RD: %s, %s/%u, label:%u %s",

                 bgp_vpn_rd_print(ndo, pptr+4),
                 ip6addr_string(ndo, (const u_char *)&addr),
                 plen,
                 bgp_vpn_rd_print(ndo, pptr+4),
                 ip6addr_string(ndo, (const u_char *)&addr),
                 plen,


@@ -1571,11 +1515,14 @@ decode_labeled_vpn_prefix6(netdissect_options *ndo,
                 ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
     return 12 + (plen + 7) / 8;
                 ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
     return 12 + (plen + 7) / 8;

+
+badplen:
+    ND_PRINT("\n\t    (illegal prefix length)");
+    return -1;

 }
 
 static int
 }
 
 static int

-decode_clnp_prefix(netdissect_options *ndo,
-                   const u_char *pptr, char *buf, size_t buflen)
+print_clnp_prefix(netdissect_options *ndo, const u_char *pptr)

 {
     uint8_t addr[19];
     u_int plen;
 {
     uint8_t addr[19];
     u_int plen;


@@ -1583,7 +1530,7 @@ decode_clnp_prefix(netdissect_options *ndo,
     plen = GET_U_1(pptr); /* get prefix length */
 
     if (152 < plen)
     plen = GET_U_1(pptr); /* get prefix length */
 
     if (152 < plen)

-        return -1;
+        goto badplen;

 
     memset(&addr, 0, sizeof(addr));
     GET_CPY_BYTES(&addr, pptr + 4, (plen + 7) / 8);
 
     memset(&addr, 0, sizeof(addr));
     GET_CPY_BYTES(&addr, pptr + 4, (plen + 7) / 8);


@@ -1592,16 +1539,19 @@ decode_clnp_prefix(netdissect_options *ndo,
             ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* Cannot use GET_ISONSAP_STRING (not packet buffer pointer) */
             ((0xff00 >> (plen % 8)) & 0xff);
     }
     /* Cannot use GET_ISONSAP_STRING (not packet buffer pointer) */

-    snprintf(buf, buflen, "%s/%u",
+    ND_PRINT("\n\t      %s/%u",

                 isonsap_string(ndo, addr,(plen + 7) / 8),
                 plen);
 
     return 1 + (plen + 7) / 8;
                 isonsap_string(ndo, addr,(plen + 7) / 8),
                 plen);
 
     return 1 + (plen + 7) / 8;

+
+badplen:
+    ND_PRINT("\n\t    (illegal prefix length)");
+    return -1;

 }
 
 static int
 }
 
 static int

-decode_labeled_vpn_clnp_prefix(netdissect_options *ndo,
-                               const u_char *pptr, char *buf, size_t buflen)
+print_labeled_vpn_clnp_prefix(netdissect_options *ndo, const u_char *pptr)

 {
     uint8_t addr[19];
     u_int plen;
 {
     uint8_t addr[19];
     u_int plen;


@@ -1609,12 +1559,12 @@ decode_labeled_vpn_clnp_prefix(netdissect_options *ndo,
     plen = GET_U_1(pptr);   /* get prefix length */
 
     if ((24+64) > plen)
     plen = GET_U_1(pptr);   /* get prefix length */
 
     if ((24+64) > plen)

-        return -1;
+        goto badplen;

 
     plen -= (24+64); /* adjust prefixlen - labellength - RD len*/
 
     if (152 < plen)
 
     plen -= (24+64); /* adjust prefixlen - labellength - RD len*/
 
     if (152 < plen)

-        return -1;
+        goto badplen;

 
     memset(&addr, 0, sizeof(addr));
     GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);
 
     memset(&addr, 0, sizeof(addr));
     GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);


@@ -1623,7 +1573,7 @@ decode_labeled_vpn_clnp_prefix(netdissect_options *ndo,
     }
     /* the label may get offsetted by 4 bits so lets shift it right */
     /* Cannot use GET_ISONSAP_STRING (not packet buffer pointer) */
     }
     /* the label may get offsetted by 4 bits so lets shift it right */
     /* Cannot use GET_ISONSAP_STRING (not packet buffer pointer) */

-    snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
+    ND_PRINT("\n\t      RD: %s, %s/%u, label:%u %s",

                 bgp_vpn_rd_print(ndo, pptr+4),
                 isonsap_string(ndo, addr,(plen + 7) / 8),
                 plen,
                 bgp_vpn_rd_print(ndo, pptr+4),
                 isonsap_string(ndo, addr,(plen + 7) / 8),
                 plen,


@@ -1631,6 +1581,10 @@ decode_labeled_vpn_clnp_prefix(netdissect_options *ndo,
                 ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
     return 12 + (plen + 7) / 8;
                 ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
 
     return 12 + (plen + 7) / 8;

+
+badplen:
+    ND_PRINT("\n\t    (illegal prefix length)");
+    return -1;

 }
 
 /*
 }
 
 /*


@@ -1682,7 +1636,7 @@ trunc:
     /*
      * We can come here, either we did not have enough data, or if we
      * try to decode 4 byte ASs in 2 byte format. Either way, return 4,
     /*
      * We can come here, either we did not have enough data, or if we
      * try to decode 4 byte ASs in 2 byte format. Either way, return 4,

-     * so that calller can try to decode each AS as of 4 bytes. If indeed
+     * so that caller can try to decode each AS as of 4 bytes. If indeed

      * there was not enough data, it will crib and end the parse anyways.
      */
     return 4;
      * there was not enough data, it will crib and end the parse anyways.
      */
     return 4;


@@ -1705,7 +1659,7 @@ check_add_path(netdissect_options *ndo, const u_char *pptr, u_int length,
     }
 
     /*
     }
 
     /*

-     * Scan through the NLRI information under the assumpetion that
+     * Scan through the NLRI information under the assumption that

      * it doesn't have path IDs.
      */
     for (offset = 0; offset < length;) {
      * it doesn't have path IDs.
      */
     for (offset = 0; offset < length;) {


@@ -1776,23 +1730,23 @@ bgp_mp_af_print(netdissect_options *ndo,
                   safi);
 
         switch(af<<8 | safi) {
                   safi);
 
         switch(af<<8 | safi) {

-        case (AFNUM_INET<<8 | SAFNUM_UNICAST):
-        case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
-        case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
-        case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
-        case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
-        case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
-        case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
-        case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
-        case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
-        case (AFNUM_INET<<8 | SAFNUM_MDT):
-        case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_UNICAST):
+        case (AFNUM_IP<<8 | SAFNUM_MULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_UNIMULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_LABUNICAST):
+        case (AFNUM_IP<<8 | SAFNUM_RT_ROUTING_INFO):
+        case (AFNUM_IP<<8 | SAFNUM_VPNUNICAST):
+        case (AFNUM_IP<<8 | SAFNUM_VPNMULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_VPNUNIMULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_MULTICAST_VPN):
+        case (AFNUM_IP<<8 | SAFNUM_MDT):
+        case (AFNUM_IP6<<8 | SAFNUM_UNICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_MULTICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_UNIMULTICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_LABUNICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_VPNUNICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_VPNMULTICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_VPNUNIMULTICAST):

         case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
         case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
         case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
         case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
         case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
         case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):


@@ -1819,21 +1773,21 @@ trunc:
 static int
 bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
               const u_char *tptr, u_int len,
 static int
 bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
               const u_char *tptr, u_int len,

-              char *buf, size_t buflen,

               int add_path4, int add_path6)
 {
        int advance;
        u_int path_id = 0;
               int add_path4, int add_path6)
 {
        int advance;
        u_int path_id = 0;

+       char buf[512];

 
        switch (af<<8 | safi) {
 
        switch (af<<8 | safi) {

-            case (AFNUM_INET<<8 | SAFNUM_UNICAST):
-            case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
-            case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
+            case (AFNUM_IP<<8 | SAFNUM_UNICAST):
+            case (AFNUM_IP<<8 | SAFNUM_MULTICAST):
+            case (AFNUM_IP<<8 | SAFNUM_UNIMULTICAST):

                 if (add_path4) {
                     path_id = GET_BE_U_4(tptr);
                     tptr += 4;
                 }
                 if (add_path4) {
                     path_id = GET_BE_U_4(tptr);
                     tptr += 4;
                 }

-                advance = decode_prefix4(ndo, tptr, len, buf, buflen);
+                advance = decode_prefix4(ndo, tptr, len, buf, sizeof(buf));

                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
                 else if (advance == -2)
                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
                 else if (advance == -2)


@@ -1845,57 +1799,39 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
                    advance += 4;
                 }
                 break;
                    advance += 4;
                 }
                 break;

-            case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
-                advance = decode_labeled_prefix4(ndo, tptr, len, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal prefix length)");
-                else if (advance == -2)
+            case (AFNUM_IP<<8 | SAFNUM_LABUNICAST):
+                advance = print_labeled_prefix4(ndo, tptr, len);
+                if (advance == -2)

                     goto trunc;
                     goto trunc;

-                else if (advance == -3)
-                    break; /* bytes left, but not enough */
-                else
-                    ND_PRINT("\n\t      %s", buf);

                 break;
                 break;

-            case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
-            case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
-            case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
-                advance = decode_labeled_vpn_prefix4(ndo, tptr, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal prefix length)");
-                else
-                    ND_PRINT("\n\t      %s", buf);
+            case (AFNUM_IP<<8 | SAFNUM_VPNUNICAST):
+            case (AFNUM_IP<<8 | SAFNUM_VPNMULTICAST):
+            case (AFNUM_IP<<8 | SAFNUM_VPNUNIMULTICAST):
+                advance = print_labeled_vpn_prefix4(ndo, tptr);

                 break;
                 break;

-            case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
-                advance = decode_rt_routing_info(ndo, tptr);
+            case (AFNUM_IP<<8 | SAFNUM_RT_ROUTING_INFO):
+                advance = print_rt_routing_info(ndo, tptr);

                 break;
                 break;

-            case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
-            case (AFNUM_INET6<<8 | SAFNUM_MULTICAST_VPN):
-                advance = decode_multicast_vpn(ndo, tptr, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal prefix length)");
-                else if (advance == -2)
+            case (AFNUM_IP<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
+            case (AFNUM_IP6<<8 | SAFNUM_MULTICAST_VPN):
+                advance = print_multicast_vpn(ndo, tptr);
+                if (advance == -2)

                     goto trunc;
                     goto trunc;

-                else
-                    ND_PRINT("\n\t      %s", buf);

                 break;
 
                 break;
 

-            case (AFNUM_INET<<8 | SAFNUM_MDT):
-                advance = decode_mdt_vpn_nlri(ndo, tptr, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal prefix length)");
-                else if (advance == -2)
+            case (AFNUM_IP<<8 | SAFNUM_MDT):
+                advance = print_mdt_vpn_nlri(ndo, tptr);
+                if (advance == -2)

                     goto trunc;
                     goto trunc;

-                else
-                    ND_PRINT("\n\t      %s", buf);

                 break;
                 break;

-            case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
-            case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
-            case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_UNICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_MULTICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_UNIMULTICAST):

                 if (add_path6) {
                     path_id = GET_BE_U_4(tptr);
                     tptr += 4;
                 }
                 if (add_path6) {
                     path_id = GET_BE_U_4(tptr);
                     tptr += 4;
                 }

-                advance = decode_prefix6(ndo, tptr, len, buf, buflen);
+                advance = decode_prefix6(ndo, tptr, len, buf, sizeof(buf));

                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
                 else if (advance == -2)
                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
                 else if (advance == -2)


@@ -1907,55 +1843,33 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
                    advance += 4;
                 }
                 break;
                    advance += 4;
                 }
                 break;

-            case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
-                advance = decode_labeled_prefix6(ndo, tptr, len, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal prefix length)");
-                else if (advance == -2)
+            case (AFNUM_IP6<<8 | SAFNUM_LABUNICAST):
+                advance = print_labeled_prefix6(ndo, tptr, len);
+                if (advance == -2)

                     goto trunc;
                     goto trunc;

-                else if (advance == -3)
-                    break; /* bytes left, but not enough */
-                else
-                    ND_PRINT("\n\t      %s", buf);

                 break;
                 break;

-            case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
-            case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
-            case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
-                advance = decode_labeled_vpn_prefix6(ndo, tptr, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal prefix length)");
-                else
-                    ND_PRINT("\n\t      %s", buf);
+            case (AFNUM_IP6<<8 | SAFNUM_VPNUNICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_VPNMULTICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_VPNUNIMULTICAST):
+                advance = print_labeled_vpn_prefix6(ndo, tptr);

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

-                advance = decode_labeled_vpn_l2(ndo, tptr, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal length)");
-                else if (advance == -2)
+                advance = print_labeled_vpn_l2(ndo, tptr);
+                if (advance == -2)

                     goto trunc;
                     goto trunc;

-                else
-                    ND_PRINT("\n\t      %s", buf);

                 break;
             case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
             case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
             case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
                 break;
             case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
             case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
             case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):

-                advance = decode_clnp_prefix(ndo, tptr, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal prefix length)");
-                else
-                    ND_PRINT("\n\t      %s", buf);
+                advance = print_clnp_prefix(ndo, tptr);

                 break;
             case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
             case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
             case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
                 break;
             case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
             case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
             case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):

-                advance = decode_labeled_vpn_clnp_prefix(ndo, tptr, buf, buflen);
-                if (advance == -1)
-                    ND_PRINT("\n\t    (illegal prefix length)");
-                else
-                    ND_PRINT("\n\t      %s", buf);
+                advance = print_labeled_vpn_clnp_prefix(ndo, tptr);

                 break;
             default:
                /*
                 break;
             default:
                /*


@@ -1992,7 +1906,6 @@ bgp_attr_print(netdissect_options *ndo,
     int advance;
     u_int tlen;
     const u_char *tptr;
     int advance;
     u_int tlen;
     const u_char *tptr;

-    char buf[MAXHOSTNAMELEN + 100];

     u_int as_size;
     int add_path4, add_path6;
     int ret;
     u_int as_size;
     int add_path4, add_path6;
     int ret;


@@ -2185,13 +2098,13 @@ bgp_attr_print(netdissect_options *ndo,
                     ND_PRINT(", " );
                 }
                 switch(af<<8 | safi) {
                     ND_PRINT(", " );
                 }
                 switch(af<<8 | safi) {

-                case (AFNUM_INET<<8 | SAFNUM_UNICAST):
-                case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
-                case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
-                case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
-                case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
-                case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
-                case (AFNUM_INET<<8 | SAFNUM_MDT):
+                case (AFNUM_IP<<8 | SAFNUM_UNICAST):
+                case (AFNUM_IP<<8 | SAFNUM_MULTICAST):
+                case (AFNUM_IP<<8 | SAFNUM_UNIMULTICAST):
+                case (AFNUM_IP<<8 | SAFNUM_LABUNICAST):
+                case (AFNUM_IP<<8 | SAFNUM_RT_ROUTING_INFO):
+                case (AFNUM_IP<<8 | SAFNUM_MULTICAST_VPN):
+                case (AFNUM_IP<<8 | SAFNUM_MDT):

                     if (tnhlen < sizeof(nd_ipv4)) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;
                     if (tnhlen < sizeof(nd_ipv4)) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;


@@ -2204,9 +2117,9 @@ bgp_attr_print(netdissect_options *ndo,
                         tlen -= sizeof(nd_ipv4);
                     }
                     break;
                         tlen -= sizeof(nd_ipv4);
                     }
                     break;

-                case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
-                case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
-                case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+                case (AFNUM_IP<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_IP<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_IP<<8 | SAFNUM_VPNUNIMULTICAST):

                     if (tnhlen < sizeof(nd_ipv4)+BGP_VPN_RD_LEN) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;
                     if (tnhlen < sizeof(nd_ipv4)+BGP_VPN_RD_LEN) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;


@@ -2221,10 +2134,10 @@ bgp_attr_print(netdissect_options *ndo,
                         tnhlen -= (sizeof(nd_ipv4)+BGP_VPN_RD_LEN);
                     }
                     break;
                         tnhlen -= (sizeof(nd_ipv4)+BGP_VPN_RD_LEN);
                     }
                     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_IP6<<8 | SAFNUM_UNICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_MULTICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_UNIMULTICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_LABUNICAST):

                     if (tnhlen < sizeof(nd_ipv6)) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;
                     if (tnhlen < sizeof(nd_ipv6)) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;


@@ -2237,9 +2150,9 @@ bgp_attr_print(netdissect_options *ndo,
                         tnhlen -= sizeof(nd_ipv6);
                     }
                     break;
                         tnhlen -= sizeof(nd_ipv6);
                     }
                     break;

-                case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
-                case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
-                case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_VPNUNIMULTICAST):

                     if (tnhlen < sizeof(nd_ipv6)+BGP_VPN_RD_LEN) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;
                     if (tnhlen < sizeof(nd_ipv6)+BGP_VPN_RD_LEN) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;


@@ -2313,7 +2226,6 @@ bgp_attr_print(netdissect_options *ndo,
                     tlen -= tnhlen;
                     tnhlen = 0;
                     goto done;
                     tlen -= tnhlen;
                     tnhlen = 0;
                     goto done;

-                    break;

                 }
             }
         }
                 }
             }
         }


@@ -2330,8 +2242,8 @@ bgp_attr_print(netdissect_options *ndo,
             ND_PRINT("\n\t    %u SNPA", snpa);
             for (/*nothing*/; snpa != 0; snpa--) {
                 uint8_t snpalen;
             ND_PRINT("\n\t    %u SNPA", snpa);
             for (/*nothing*/; snpa != 0; snpa--) {
                 uint8_t snpalen;

-               if (tlen < 1)
-                   goto trunc;
+               if (tlen < 1)
+                   goto trunc;

                 snpalen = GET_U_1(tptr);
                 ND_PRINT("\n\t      %u bytes", snpalen);
                 tptr++;
                 snpalen = GET_U_1(tptr);
                 ND_PRINT("\n\t      %u bytes", snpalen);
                 tptr++;


@@ -2346,11 +2258,13 @@ bgp_attr_print(netdissect_options *ndo,
             ND_PRINT(", no SNPA");
         }
 
             ND_PRINT(", no SNPA");
         }
 

-        add_path4 = check_add_path(ndo, tptr, (len-ND_BYTES_BETWEEN(tptr, pptr)), 32);
-        add_path6 = check_add_path(ndo, tptr, (len-ND_BYTES_BETWEEN(tptr, pptr)), 128);
+        add_path4 = check_add_path(ndo, tptr,
+                                   (len-ND_BYTES_BETWEEN(pptr, tptr)), 32);
+        add_path6 = check_add_path(ndo, tptr,
+                                   (len-ND_BYTES_BETWEEN(pptr, tptr)), 128);

 
         while (tptr < pptr + len) {
 
         while (tptr < pptr + len) {

-            advance = bgp_nlri_print(ndo, af, safi, tptr, len, buf, sizeof(buf),
+            advance = bgp_nlri_print(ndo, af, safi, tptr, len,

                     add_path4, add_path6);
             if (advance == -2)
                 goto trunc;
                     add_path4, add_path6);
             if (advance == -2)
                 goto trunc;


@@ -2373,11 +2287,13 @@ bgp_attr_print(netdissect_options *ndo,
 
         tptr += 3;
 
 
         tptr += 3;
 

-        add_path4 = check_add_path(ndo, tptr, (len-ND_BYTES_BETWEEN(tptr, pptr)), 32);
-        add_path6 = check_add_path(ndo, tptr, (len-ND_BYTES_BETWEEN(tptr, pptr)), 128);
+        add_path4 = check_add_path(ndo, tptr,
+                                   (len-ND_BYTES_BETWEEN(pptr, tptr)), 32);
+        add_path6 = check_add_path(ndo, tptr,
+                                   (len-ND_BYTES_BETWEEN(pptr, tptr)), 128);

 
         while (tptr < pptr + len) {
 
         while (tptr < pptr + len) {

-            advance = bgp_nlri_print(ndo, af, safi, tptr, len, buf, sizeof(buf),
+            advance = bgp_nlri_print(ndo, af, safi, tptr, len,

                     add_path4, add_path6);
             if (advance == -2)
                 goto trunc;
                     add_path4, add_path6);
             if (advance == -2)
                 goto trunc;


@@ -2651,7 +2567,7 @@ bgp_attr_print(netdissect_options *ndo,
         tptr += 3;
         sblen -= 3;
         /* Parse signature segments */
         tptr += 3;
         sblen -= 3;
         /* Parse signature segments */

-        while (sblen > 0) {
+        while (sblen != 0) {

             uint16_t siglen;
 
             ND_PRINT("\n\t      Signature Segment:\n\t        SKI: ");
             uint16_t siglen;
 
             ND_PRINT("\n\t      Signature Segment:\n\t        SKI: ");


@@ -2956,7 +2872,7 @@ bgp_update_print(netdissect_options *ndo,
 {
     const u_char *p;
     u_int withdrawn_routes_len;
 {
     const u_char *p;
     u_int withdrawn_routes_len;

-    char buf[MAXHOSTNAMELEN + 100];
+    char buf[512];

     int wpfx;
     u_int len;
     int i;
     int wpfx;
     u_int len;
     int i;


@@ -3171,9 +3087,9 @@ bgp_notification_print_code(netdissect_options *ndo,
                           bgpn_minor),
                   bgpn_minor);
         break;
                           bgpn_minor),
                   bgpn_minor);
         break;

-    case BGP_NOTIFY_MAJOR_CAP:
+    case BGP_NOTIFY_MAJOR_ROUTEREFRESH:

         ND_PRINT(" subcode %s (%u)",
         ND_PRINT(" subcode %s (%u)",

-                  tok2str(bgp_notify_minor_cap_values, "Unknown",
+                  tok2str(bgp_notify_minor_routerefresh_values, "Unknown",

                           bgpn_minor),
                   bgpn_minor);
         break;
                           bgpn_minor),
                   bgpn_minor);
         break;


@@ -3206,8 +3122,7 @@ bgp_notification_print_code(netdissect_options *ndo,
             /* garbage, hexdump it all */
             if (shutdown_comm_length > length - 1) {
                 ND_PRINT(", invalid Shutdown Communication length");
             /* garbage, hexdump it all */
             if (shutdown_comm_length > length - 1) {
                 ND_PRINT(", invalid Shutdown Communication length");

-            }
-            else if (shutdown_comm_length == 0) {
+            } else if (shutdown_comm_length == 0) {

                 ND_PRINT(", empty Shutdown Communication");
                 remainder_offset += 1;
             }
                 ND_PRINT(", empty Shutdown Communication");
                 remainder_offset += 1;
             }