X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2b753f80585fd13b547c3b6797806301d9cef5d6..refs/pull/482/head:/print-ospf.c diff --git a/print-ospf.c b/print-ospf.c index a6bd6c31..6024c640 100644 --- a/print-ospf.c +++ b/print-ospf.c @@ -21,14 +21,13 @@ * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu) */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" #include "gmpls.h" @@ -181,8 +180,8 @@ static const struct tok ospf_lls_eo_options[] = { int ospf_print_grace_lsa(netdissect_options *ndo, - const u_int8_t *tptr, u_int ls_length) { - + const uint8_t *tptr, u_int ls_length) +{ u_int tlv_type, tlv_length; @@ -239,7 +238,7 @@ ospf_print_grace_lsa(netdissect_options *ndo, ND_PRINT((ndo, "\n\t Bogus length %u != 4", tlv_length)); return -1; } - ND_PRINT((ndo, "%s", ipaddr_string(tptr))); + ND_PRINT((ndo, "%s", ipaddr_string(ndo, tptr))); break; default: @@ -264,13 +263,13 @@ trunc: int ospf_print_te_lsa(netdissect_options *ndo, - const u_int8_t *tptr, u_int ls_length) { - + const uint8_t *tptr, u_int ls_length) +{ u_int tlv_type, tlv_length, subtlv_type, subtlv_length; u_int priority_level, te_class, count_srlg; union { /* int to float conversion buffer for several subTLVs */ float f; - u_int32_t i; + uint32_t i; } bw; while (ls_length != 0) { @@ -327,16 +326,16 @@ ospf_print_te_lsa(netdissect_options *ndo, case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID: case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID: ND_PRINT((ndo, ", %s (0x%08x)", - ipaddr_string(tptr), + ipaddr_string(ndo, tptr), EXTRACT_32BITS(tptr))); if (subtlv_length == 8) /* rfc4203 */ ND_PRINT((ndo, ", %s (0x%08x)", - ipaddr_string(tptr+4), + ipaddr_string(ndo, tptr+4), EXTRACT_32BITS(tptr + 4))); break; case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP: case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP: - ND_PRINT((ndo, ", %s", ipaddr_string(tptr))); + ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr))); break; case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW: case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW: @@ -426,7 +425,7 @@ ospf_print_te_lsa(netdissect_options *ndo, return -1; } ND_TCHECK2(*tptr, 4); - ND_PRINT((ndo, ", %s", ipaddr_string(tptr))); + ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr))); break; default: @@ -463,7 +462,7 @@ ospf_print_lshdr(netdissect_options *ndo, ND_TCHECK(lshp->ls_seq); /* XXX - ls_length check checked this */ ND_PRINT((ndo, "\n\t Advertising Router %s, seq 0x%08x, age %us, length %u", - ipaddr_string(&lshp->ls_router), + ipaddr_string(ndo, &lshp->ls_router), EXTRACT_32BITS(&lshp->ls_seq), EXTRACT_16BITS(&lshp->ls_age), ls_length - (u_int)sizeof(struct lsa_hdr))); @@ -492,7 +491,7 @@ ospf_print_lshdr(netdissect_options *ndo, ND_PRINT((ndo, "\n\t %s LSA (%d), LSA-ID: %s", tok2str(lsa_values,"unknown",lshp->ls_type), lshp->ls_type, - ipaddr_string(&lshp->un_lsa_id.lsa_id))); + ipaddr_string(ndo, &lshp->un_lsa_id.lsa_id))); break; } @@ -545,25 +544,25 @@ ospf_print_tos_metrics(netdissect_options *ndo, * field is less than the length of the LSA header, return NULl, else * return pointer to data past end of LSA. */ -static const u_int8_t * +static const uint8_t * ospf_print_lsa(netdissect_options *ndo, register const struct lsa *lsap) { - register const u_int8_t *ls_end; + register const uint8_t *ls_end; register const struct rlalink *rlp; register const struct in_addr *ap; register const struct aslametric *almp; register const struct mcla *mcp; - register const u_int32_t *lp; + register const uint32_t *lp; register int j, tlv_type, tlv_length, topology; register int ls_length; - const u_int8_t *tptr; + const uint8_t *tptr; - tptr = (u_int8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */ + tptr = (const uint8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */ ls_length = ospf_print_lshdr(ndo, &lsap->ls_hdr); if (ls_length == -1) return(NULL); - ls_end = (u_int8_t *)lsap + ls_length; + ls_end = (const uint8_t *)lsap + ls_length; ls_length -= sizeof(struct lsa_hdr); switch (lsap->ls_hdr.ls_type) { @@ -583,26 +582,26 @@ ospf_print_lsa(netdissect_options *ndo, case RLA_TYPE_VIRTUAL: ND_PRINT((ndo, "\n\t Virtual Link: Neighbor Router-ID: %s, Interface Address: %s", - ipaddr_string(&rlp->link_id), - ipaddr_string(&rlp->link_data))); + ipaddr_string(ndo, &rlp->link_id), + ipaddr_string(ndo, &rlp->link_data))); break; case RLA_TYPE_ROUTER: ND_PRINT((ndo, "\n\t Neighbor Router-ID: %s, Interface Address: %s", - ipaddr_string(&rlp->link_id), - ipaddr_string(&rlp->link_data))); + ipaddr_string(ndo, &rlp->link_id), + ipaddr_string(ndo, &rlp->link_data))); break; case RLA_TYPE_TRANSIT: ND_PRINT((ndo, "\n\t Neighbor Network-ID: %s, Interface Address: %s", - ipaddr_string(&rlp->link_id), - ipaddr_string(&rlp->link_data))); + ipaddr_string(ndo, &rlp->link_id), + ipaddr_string(ndo, &rlp->link_data))); break; case RLA_TYPE_STUB: ND_PRINT((ndo, "\n\t Stub Network: %s, Mask: %s", - ipaddr_string(&rlp->link_id), - ipaddr_string(&rlp->link_data))); + ipaddr_string(ndo, &rlp->link_id), + ipaddr_string(ndo, &rlp->link_data))); break; default: @@ -613,7 +612,7 @@ ospf_print_lsa(netdissect_options *ndo, ospf_print_tos_metrics(ndo, &rlp->un_tos); - rlp = (struct rlalink *)((u_char *)(rlp + 1) + + rlp = (const struct rlalink *)((const u_char *)(rlp + 1) + ((rlp->un_tos.link.link_tos_count) * sizeof(union un_tos))); } break; @@ -621,11 +620,11 @@ ospf_print_lsa(netdissect_options *ndo, case LS_TYPE_NETWORK: ND_TCHECK(lsap->lsa_un.un_nla.nla_mask); ND_PRINT((ndo, "\n\t Mask %s\n\t Connected Routers:", - ipaddr_string(&lsap->lsa_un.un_nla.nla_mask))); + ipaddr_string(ndo, &lsap->lsa_un.un_nla.nla_mask))); ap = lsap->lsa_un.un_nla.nla_router; - while ((u_char *)ap < ls_end) { + while ((const u_char *)ap < ls_end) { ND_TCHECK(*ap); - ND_PRINT((ndo, "\n\t %s", ipaddr_string(ap))); + ND_PRINT((ndo, "\n\t %s", ipaddr_string(ndo, ap))); ++ap; } break; @@ -633,11 +632,11 @@ ospf_print_lsa(netdissect_options *ndo, case LS_TYPE_SUM_IP: ND_TCHECK(lsap->lsa_un.un_nla.nla_mask); ND_PRINT((ndo, "\n\t Mask %s", - ipaddr_string(&lsap->lsa_un.un_sla.sla_mask))); + ipaddr_string(ndo, &lsap->lsa_un.un_sla.sla_mask))); ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric); lp = lsap->lsa_un.un_sla.sla_tosmetric; - while ((u_char *)lp < ls_end) { - register u_int32_t ul; + while ((const u_char *)lp < ls_end) { + register uint32_t ul; ND_TCHECK(*lp); ul = EXTRACT_32BITS(lp); @@ -653,8 +652,8 @@ ospf_print_lsa(netdissect_options *ndo, case LS_TYPE_SUM_ABR: ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric); lp = lsap->lsa_un.un_sla.sla_tosmetric; - while ((u_char *)lp < ls_end) { - register u_int32_t ul; + while ((const u_char *)lp < ls_end) { + register uint32_t ul; ND_TCHECK(*lp); ul = EXTRACT_32BITS(lp); @@ -671,12 +670,12 @@ ospf_print_lsa(netdissect_options *ndo, case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */ ND_TCHECK(lsap->lsa_un.un_nla.nla_mask); ND_PRINT((ndo, "\n\t Mask %s", - ipaddr_string(&lsap->lsa_un.un_asla.asla_mask))); + ipaddr_string(ndo, &lsap->lsa_un.un_asla.asla_mask))); ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric); almp = lsap->lsa_un.un_asla.asla_metric; - while ((u_char *)almp < ls_end) { - register u_int32_t ul; + while ((const u_char *)almp < ls_end) { + register uint32_t ul; ND_TCHECK(almp->asla_tosmetric); ul = EXTRACT_32BITS(&almp->asla_tosmetric); @@ -692,11 +691,11 @@ ospf_print_lsa(netdissect_options *ndo, ND_TCHECK(almp->asla_forward); if (almp->asla_forward.s_addr) { - ND_PRINT((ndo, ", forward %s", ipaddr_string(&almp->asla_forward))); + ND_PRINT((ndo, ", forward %s", ipaddr_string(ndo, &almp->asla_forward))); } ND_TCHECK(almp->asla_tag); if (almp->asla_tag.s_addr) { - ND_PRINT((ndo, ", tag %s", ipaddr_string(&almp->asla_tag))); + ND_PRINT((ndo, ", tag %s", ipaddr_string(ndo, &almp->asla_tag))); } ++almp; } @@ -705,18 +704,18 @@ ospf_print_lsa(netdissect_options *ndo, case LS_TYPE_GROUP: /* Multicast extensions as of 23 July 1991 */ mcp = lsap->lsa_un.un_mcla; - while ((u_char *)mcp < ls_end) { + while ((const u_char *)mcp < ls_end) { ND_TCHECK(mcp->mcla_vid); switch (EXTRACT_32BITS(&mcp->mcla_vtype)) { case MCLA_VERTEX_ROUTER: ND_PRINT((ndo, "\n\t Router Router-ID %s", - ipaddr_string(&mcp->mcla_vid))); + ipaddr_string(ndo, &mcp->mcla_vid))); break; case MCLA_VERTEX_NETWORK: ND_PRINT((ndo, "\n\t Network Designated Router %s", - ipaddr_string(&mcp->mcla_vid))); + ipaddr_string(ndo, &mcp->mcla_vid))); break; default: @@ -734,7 +733,7 @@ ospf_print_lsa(netdissect_options *ndo, switch (*(&lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) { case LS_OPAQUE_TYPE_RI: - tptr = (u_int8_t *)(&lsap->lsa_un.un_ri_tlv.type); + tptr = (const uint8_t *)(&lsap->lsa_un.un_ri_tlv.type); while (ls_length != 0) { ND_TCHECK2(*tptr, 4); @@ -782,14 +781,14 @@ ospf_print_lsa(netdissect_options *ndo, break; case LS_OPAQUE_TYPE_GRACE: - if (ospf_print_grace_lsa(ndo, (u_int8_t *)(&lsap->lsa_un.un_grace_tlv.type), + if (ospf_print_grace_lsa(ndo, (const uint8_t *)(&lsap->lsa_un.un_grace_tlv.type), ls_length) == -1) { return(ls_end); } break; case LS_OPAQUE_TYPE_TE: - if (ospf_print_te_lsa(ndo, (u_int8_t *)(&lsap->lsa_un.un_te_lsa_tlv.type), + if (ospf_print_te_lsa(ndo, (const uint8_t *)(&lsap->lsa_un.un_te_lsa_tlv.type), ls_length) == -1) { return(ls_end); } @@ -797,7 +796,7 @@ ospf_print_lsa(netdissect_options *ndo, default: if (ndo->ndo_vflag <= 1) { - if (!print_unknown_data(ndo, (u_int8_t *)lsap->lsa_un.un_unknown, + if (!print_unknown_data(ndo, (const uint8_t *)lsap->lsa_un.un_unknown, "\n\t ", ls_length)) return(ls_end); } @@ -807,7 +806,7 @@ ospf_print_lsa(netdissect_options *ndo, /* do we want to see an additionally hexdump ? */ if (ndo->ndo_vflag> 1) - if (!print_unknown_data(ndo, (u_int8_t *)lsap->lsa_un.un_unknown, + if (!print_unknown_data(ndo, (const uint8_t *)lsap->lsa_un.un_unknown, "\n\t ", ls_length)) { return(ls_end); } @@ -824,8 +823,8 @@ ospf_decode_lls(netdissect_options *ndo, register const u_char *dptr; register const u_char *dataend; register u_int length2; - register u_int16_t lls_type, lls_len; - register u_int32_t lls_flags; + register uint16_t lls_type, lls_len; + register uint32_t lls_flags; switch (op->ospf_type) { @@ -845,8 +844,8 @@ ospf_decode_lls(netdissect_options *ndo, /* dig deeper if LLS data is available; see RFC4813 */ length2 = EXTRACT_16BITS(&op->ospf_len); - dptr = (u_char *)op + length2; - dataend = (u_char *)op + length; + dptr = (const u_char *)op + length2; + dataend = (const u_char *)op + length; if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) { dptr = dptr + op->ospf_authdata[3]; @@ -917,7 +916,7 @@ ospf_decode_v2(netdissect_options *ndo, register const struct lsr *lsrp; register const struct lsa_hdr *lshp; register const struct lsa *lsap; - register u_int32_t lsa_count,lsa_count_max; + register uint32_t lsa_count,lsa_count_max; switch (op->ospf_type) { @@ -936,25 +935,25 @@ ospf_decode_v2(netdissect_options *ndo, ND_PRINT((ndo, "\n\t Hello Timer %us, Dead Timer %us, Mask %s, Priority %u", EXTRACT_16BITS(&op->ospf_hello.hello_helloint), EXTRACT_32BITS(&op->ospf_hello.hello_deadint), - ipaddr_string(&op->ospf_hello.hello_mask), + ipaddr_string(ndo, &op->ospf_hello.hello_mask), op->ospf_hello.hello_priority)); ND_TCHECK(op->ospf_hello.hello_dr); if (op->ospf_hello.hello_dr.s_addr != 0) ND_PRINT((ndo, "\n\t Designated Router %s", - ipaddr_string(&op->ospf_hello.hello_dr))); + ipaddr_string(ndo, &op->ospf_hello.hello_dr))); ND_TCHECK(op->ospf_hello.hello_bdr); if (op->ospf_hello.hello_bdr.s_addr != 0) ND_PRINT((ndo, ", Backup Designated Router %s", - ipaddr_string(&op->ospf_hello.hello_bdr))); + ipaddr_string(ndo, &op->ospf_hello.hello_bdr))); ap = op->ospf_hello.hello_neighbor; - if ((u_char *)ap < dataend) + if ((const u_char *)ap < dataend) ND_PRINT((ndo, "\n\t Neighbor List:")); - while ((u_char *)ap < dataend) { + while ((const u_char *)ap < dataend) { ND_TCHECK(*ap); - ND_PRINT((ndo, "\n\t %s", ipaddr_string(ap))); + ND_PRINT((ndo, "\n\t %s", ipaddr_string(ndo, ap))); ++ap; } break; /* HELLO */ @@ -975,18 +974,18 @@ ospf_decode_v2(netdissect_options *ndo, /* Print all the LS adv's */ lshp = op->ospf_db.db_lshdr; - while (((u_char *)lshp < dataend) && ospf_print_lshdr(ndo, lshp) != -1) { + while (((const u_char *)lshp < dataend) && ospf_print_lshdr(ndo, lshp) != -1) { ++lshp; } break; case OSPF_TYPE_LS_REQ: lsrp = op->ospf_lsr; - while ((u_char *)lsrp < dataend) { + while ((const u_char *)lsrp < dataend) { ND_TCHECK(*lsrp); ND_PRINT((ndo, "\n\t Advertising Router: %s, %s LSA (%u)", - ipaddr_string(&lsrp->ls_router), + ipaddr_string(ndo, &lsrp->ls_router), tok2str(lsa_values,"unknown",EXTRACT_32BITS(lsrp->ls_type)), EXTRACT_32BITS(&lsrp->ls_type))); @@ -1002,7 +1001,7 @@ ospf_decode_v2(netdissect_options *ndo, break; default: ND_PRINT((ndo, ", LSA-ID: %s", - ipaddr_string(&lsrp->un_ls_stateid.ls_stateid))); + ipaddr_string(ndo, &lsrp->un_ls_stateid.ls_stateid))); break; } @@ -1047,7 +1046,7 @@ ospf_print(netdissect_options *ndo, register const u_char *dataend; register const char *cp; - op = (struct ospfhdr *)bp; + op = (const struct ospfhdr *)bp; /* XXX Before we do anything else, strip off the MD5 trailer */ ND_TCHECK(op->ospf_authtype); @@ -1080,11 +1079,11 @@ ospf_print(netdissect_options *ndo, } ND_TCHECK(op->ospf_routerid); - ND_PRINT((ndo, "\n\tRouter-ID %s", ipaddr_string(&op->ospf_routerid))); + ND_PRINT((ndo, "\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf_routerid))); ND_TCHECK(op->ospf_areaid); if (op->ospf_areaid.s_addr != 0) - ND_PRINT((ndo, ", Area %s", ipaddr_string(&op->ospf_areaid))); + ND_PRINT((ndo, ", Area %s", ipaddr_string(ndo, &op->ospf_areaid))); else ND_PRINT((ndo, ", Backbone Area"));