Fixed some warnings, added print-zep.c to CMakeLists

[tcpdump] / print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index 8e2bcfaeead6d8988b35ea1329db89ae2457c8d0..2a502a6c8c4d26fb435b4c7aeaa9697e8d809852 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -36,7 +36,6 @@
 
 #include "ospf.h"
 
-static const char tstr[] = " [|ospf2]";
 
 static const struct tok ospf_option_values[] = {
         { OSPF_OPTION_T,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
@@ -504,7 +503,7 @@ ospf_te_lsa_print(netdissect_options *ndo,
 trunc:
     return -1;
 invalid:
-    ND_PRINT("%s", istr);
+    nd_print_invalid(ndo);
     return -1;
 }
 
@@ -1111,6 +1110,7 @@ ospf_print(netdissect_options *ndo,
        const u_char *dataend;
        const char *cp;
 
+       ndo->ndo_protocol = "ospf2";
        op = (const struct ospfhdr *)bp;
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
@@ -1167,7 +1167,7 @@ ospf_print(netdissect_options *ndo,
 
                case OSPF_AUTH_SIMPLE:
                        ND_PRINT("\n\tSimple text password: ");
-                       safeputs(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);
+                       (void)nd_printzp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN, NULL);
                        break;
 
                case OSPF_AUTH_MD5:
@@ -1201,5 +1201,5 @@ ospf_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }