X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1bcd37991fa57d9e966a6f96e7cbff59b16c28bd..d2777156522f139a858bd6b5b51e364826bc95a7:/print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index 8e6a003f..e6bebed3 100644
--- 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 }
 };
 
@@ -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: