travis: try removing the matrix: clause and putting back the Coverity stuff.

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index f2e6bab7eb1ecc389f9ca3480b1912b94103987e..78646b5847664bcda7c0338f461eb40e3a6ace7f 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -90,6 +90,8 @@
 
 #include <string.h>
 
+#include "netdissect-ctype.h"
+
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -674,7 +676,7 @@ print_attr_string(netdissect_options *ndo,
    }
 
    for (i=0; i < length && GET_U_1(data); i++, data++)
-       ND_PRINT("%c", ND_ISPRINT(GET_U_1(data)) ? GET_U_1(data) : '.');
+       ND_PRINT("%c", ND_ASCII_ISPRINT(GET_U_1(data)) ? GET_U_1(data) : '.');
 
    return;
 
@@ -734,7 +736,7 @@ print_vendor_attr(netdissect_options *ndo,
                vendor_type,
                vendor_length);
         for (idx = 0; idx < vendor_length ; idx++, data++)
-            ND_PRINT("%c", ND_ISPRINT(GET_U_1(data)) ? GET_U_1(data) : '.');
+            ND_PRINT("%c", ND_ASCII_ISPRINT(GET_U_1(data)) ? GET_U_1(data) : '.');
         length-=vendor_length;
     }
     return;
@@ -895,11 +897,11 @@ print_attr_address(netdissect_options *ndo,
               if (GET_BE_U_4(data) == 0xFFFFFFFE )
                  ND_PRINT("NAS Select");
               else
-                 ND_PRINT("%s",ipaddr_string(ndo, data));
+                 ND_PRINT("%s",GET_IPADDR_STRING(data));
       break;
 
       default:
-          ND_PRINT("%s", ipaddr_string(ndo, data));
+          ND_PRINT("%s", GET_IPADDR_STRING(data));
       break;
    }
 
@@ -928,7 +930,7 @@ print_attr_address6(netdissect_options *ndo,
 
    ND_TCHECK_16(data);
 
-   ND_PRINT("%s", ip6addr_string(ndo, data));
+   ND_PRINT("%s", GET_IP6ADDR_STRING(data));
 
    return;
 
@@ -985,7 +987,7 @@ print_attr_mip6_home_link_prefix(netdissect_options *ndo,
       return;
    }
 
-   ND_PRINT("%s/%u", ip6addr_string(ndo, data + 1), GET_U_1(data));
+   ND_PRINT("%s/%u", GET_IP6ADDR_STRING(data + 1), GET_U_1(data));
 
    return;
 
@@ -1041,7 +1043,6 @@ print_attr_vector64(netdissect_options *ndo,
    }
 
    ND_PRINT("[");
-   ND_TCHECK_8(data[0]);
 
    data_value = GET_BE_U_8(data);
    /* Print the 64-bit field in a format similar to bittok2str(), less
@@ -1058,9 +1059,6 @@ print_attr_vector64(netdissect_options *ndo,
    ND_PRINT("]");
 
    return;
-
-   trunc:
-     nd_print_trunc(ndo);
 }
 
 /***********************************/