icmp: clean up the extension code and comments.

[tcpdump] / print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index a385d7a1bfde05009150a4f25a4058e264a7a118..e6bebed374f820a1db57ba3bcd69b8c1ab4119a0 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -59,8 +59,10 @@ static const struct tok ospf_authtype_values[] = {
 static const struct tok ospf_rla_flag_values[] = {
        { RLA_FLAG_B,           "ABR" },
        { RLA_FLAG_E,           "ASBR" },
-       { RLA_FLAG_W1,          "Virtual" },
-       { RLA_FLAG_W2,          "W2" },
+       { RLA_FLAG_V,           "Virtual" },
+       { RLA_FLAG_W,           "Wildcard" },
+       { RLA_FLAG_NT,          "Nt" },
+       { RLA_FLAG_H,           "Host" },
        { 0,                    NULL }
 };
 
@@ -533,11 +535,11 @@ ospf_print_lshdr(netdissect_options *ndo,
                     sizeof(struct lsa_hdr));
                 return(-1);
         }
-        ND_PRINT("\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
+        ND_PRINT("\n\t  Advertising Router %s, seq 0x%08x, age %us, length %zu",
                   GET_IPADDR_STRING(lshp->ls_router),
                   GET_BE_U_4(lshp->ls_seq),
                   GET_BE_U_2(lshp->ls_age),
-                  ls_length - (u_int)sizeof(struct lsa_hdr));
+                  ls_length - sizeof(struct lsa_hdr));
         ls_type = GET_U_1(lshp->ls_type);
         switch (ls_type) {
         /* the LSA header for opaque LSAs was slightly changed */
@@ -696,8 +698,7 @@ ospf_print_lsa(netdissect_options *ndo,
                    GET_IPADDR_STRING(lsap->lsa_un.un_nla.nla_mask));
                ap = lsap->lsa_un.un_nla.nla_router;
                while ((const u_char *)ap < ls_end) {
-                       ND_TCHECK_SIZE(ap);
-                       ND_PRINT("\n\t      %s", GET_IPADDR_STRING(*ap));
+                       ND_PRINT("\n\t      %s", GET_IPADDR_STRING(ap));
                        ++ap;
                }
                break;
@@ -999,8 +1000,7 @@ ospf_decode_v2(netdissect_options *ndo,
                if ((const u_char *)ap < dataend)
                        ND_PRINT("\n\t  Neighbor List:");
                while ((const u_char *)ap < dataend) {
-                       ND_TCHECK_SIZE(ap);
-                       ND_PRINT("\n\t    %s", GET_IPADDR_STRING(*ap));
+                       ND_PRINT("\n\t    %s", GET_IPADDR_STRING(ap));
                        ++ap;
                }
                break;  /* HELLO */
@@ -1142,7 +1142,7 @@ ospf_print(netdissect_options *ndo,
 
                case OSPF_AUTH_SIMPLE:
                        ND_PRINT("\n\tSimple text password: ");
-                       (void)nd_printzp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN, NULL);
+                       nd_printjnp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);
                        break;
 
                case OSPF_AUTH_MD5: