bgp: Parse BGP extended message support capability

[tcpdump] / print-hncp.c

diff --git a/print-hncp.c b/print-hncp.c
index 06c8c1a563e69835f8a5c0cf3b5d0016aadb6c2a..b288160d6efcb8d8ea44c92141b69c7891b5b2f9 100644 (file)
--- a/print-hncp.c
+++ b/print-hncp.c
@@ -34,7 +34,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "netdissect.h"
@@ -197,9 +196,9 @@ static const char *
 format_ip6addr(netdissect_options *ndo, const u_char *cp)
 {
     if (is_ipv4_mapped_address(cp))
-        return ipaddr_string(ndo, cp + IPV4_MAPPED_HEADING_LEN);
+        return GET_IPADDR_STRING(cp + IPV4_MAPPED_HEADING_LEN);
     else
-        return ip6addr_string(ndo, cp);
+        return GET_IP6ADDR_STRING(cp);
 }
 
 static int
@@ -253,11 +252,11 @@ print_dns_label(netdissect_options *ndo,
             ND_PRINT(".");
         if (length+lab_length > max_length) {
             if (print)
-                (void)nd_printzp(ndo, cp+length, max_length-length, NULL);
+                nd_printjnp(ndo, cp+length, max_length-length);
             break;
         }
         if (print)
-            (void)nd_printzp(ndo, cp+length, lab_length, NULL);
+            nd_printjnp(ndo, cp+length, lab_length);
         length += lab_length;
     }
     if (print)
@@ -298,7 +297,7 @@ dhcpv4_print(netdissect_options *ndo,
                 return -1;
             }
             for (t = 0; t < optlen; t += 4)
-                ND_PRINT(" %s", ipaddr_string(ndo, value + t));
+                ND_PRINT(" %s", GET_IPADDR_STRING(value + t));
         }
             break;
         case DH4OPT_DOMAIN_SEARCH: {
@@ -351,7 +350,7 @@ dhcpv6_print(netdissect_options *ndo,
                     return -1;
                 }
                 for (t = 0; t < optlen; t += 16)
-                    ND_PRINT(" %s", ip6addr_string(ndo, value + t));
+                    ND_PRINT(" %s", GET_IP6ADDR_STRING(value + t));
             }
                 break;
             case DH6OPT_DOMAIN_LIST: {
@@ -587,7 +586,7 @@ hncp_print_rec(netdissect_options *ndo,
             ND_PRINT(" Verdict: %u Fingerprint: %s Common Name: ",
                 GET_U_1(value),
                 format_256(ndo, value + 4));
-            (void)nd_printzp(ndo, value + 36, bodylen - 36, NULL);
+            nd_printjnp(ndo, value + 36, bodylen - 36);
         }
             break;
 
@@ -606,7 +605,7 @@ hncp_print_rec(netdissect_options *ndo,
             ND_PRINT(" M: %u P: %u H: %u L: %u User-agent: ",
                 M, P, H, L
             );
-            (void)nd_printzp(ndo, value + 4, bodylen - 4, NULL);
+            nd_printjnp(ndo, value + 4, bodylen - 4);
         }
             break;
 
@@ -691,7 +690,7 @@ hncp_print_rec(netdissect_options *ndo,
                 print_dns_label(ndo, value+1, bodylen-1, 1);
             } else if (policy == 130) {
                 ND_PRINT("Opaque UTF-8: ");
-                (void)nd_printzp(ndo, value + 1, bodylen - 1, NULL);
+                nd_printjnp(ndo, value + 1, bodylen - 1);
             } else if (policy == 131) {
                 if (bodylen != 1) {
                     nd_print_invalid(ndo);
@@ -821,7 +820,7 @@ hncp_print_rec(netdissect_options *ndo,
             );
             if (l < 64) {
                 ND_PRINT("\"");
-                (void)nd_printzp(ndo, value + 17, l, NULL);
+                nd_printjnp(ndo, value + 17, l);
                 ND_PRINT("\"");
             } else {
                 nd_print_invalid(ndo);
@@ -864,5 +863,4 @@ hncp_print_rec(netdissect_options *ndo,
 
  invalid:
     nd_print_invalid(ndo);
-    return;
 }