X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ca0cfa4f8e014198ad9e1f64b24762ce7366d5b2..dcae3b01d76f9a040f2a6e3d2c861c25c2d60a73:/print-ospf.c?ds=sidebyside diff --git a/print-ospf.c b/print-ospf.c index a385d7a1..668506e9 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 } }; @@ -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 */ @@ -1142,7 +1144,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: