X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/77ece6d435c77c3bf1ff221e295408ca268444df..refs/heads/mcr-macro-update-1:/print-eigrp.c diff --git a/print-eigrp.c b/print-eigrp.c index 9e0a7669..36158231 100644 --- a/print-eigrp.c +++ b/print-eigrp.c @@ -19,7 +19,7 @@ /* * specification: * - * http://www.rhyshaden.com/eigrp.htm + * https://web.archive.org/web/20190722221712/https://www.rhyshaden.com/eigrp.htm * RFC 7868 */ @@ -35,6 +35,7 @@ #include "extract.h" #include "addrtoname.h" + struct eigrp_common_header { nd_uint8_t version; nd_uint8_t opcode; @@ -226,6 +227,7 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) const struct eigrp_tlv_at_ext_t *eigrp_tlv_at_ext; } tlv_ptr; + ndo->ndo_protocol = "eigrp"; tptr=pptr; eigrp_com_header = (const struct eigrp_common_header *)pptr; ND_TCHECK_SIZE(eigrp_com_header); @@ -233,15 +235,16 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) /* * Sanity checking of the header. */ - if (EXTRACT_U_1(eigrp_com_header->version) != EIGRP_VERSION) { - ND_PRINT("EIGRP version %u packet not supported",EXTRACT_U_1(eigrp_com_header->version)); + if (GET_U_1(eigrp_com_header->version) != EIGRP_VERSION) { + ND_PRINT("EIGRP version %u packet not supported", + GET_U_1(eigrp_com_header->version)); return; } /* in non-verbose mode just lets print the basic Message Type*/ if (ndo->ndo_vflag < 1) { ND_PRINT("EIGRP %s, length: %u", - tok2str(eigrp_opcode_values, "unknown (%u)",EXTRACT_U_1(eigrp_com_header->opcode)), + tok2str(eigrp_opcode_values, "unknown (%u)",GET_U_1(eigrp_com_header->opcode)), len); return; } @@ -250,7 +253,7 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) if (len < sizeof(struct eigrp_common_header)) { ND_PRINT("EIGRP %s, length: %u (too short, < %u)", - tok2str(eigrp_opcode_values, "unknown (%u)",EXTRACT_U_1(eigrp_com_header->opcode)), + tok2str(eigrp_opcode_values, "unknown (%u)",GET_U_1(eigrp_com_header->opcode)), len, (u_int) sizeof(struct eigrp_common_header)); return; } @@ -258,16 +261,16 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) /* FIXME print other header info */ ND_PRINT("\n\tEIGRP v%u, opcode: %s (%u), chksum: 0x%04x, Flags: [%s]\n\tseq: 0x%08x, ack: 0x%08x, AS: %u, length: %u", - EXTRACT_U_1(eigrp_com_header->version), - tok2str(eigrp_opcode_values, "unknown, type: %u",EXTRACT_U_1(eigrp_com_header->opcode)), - EXTRACT_U_1(eigrp_com_header->opcode), - EXTRACT_BE_U_2(eigrp_com_header->checksum), + GET_U_1(eigrp_com_header->version), + tok2str(eigrp_opcode_values, "unknown, type: %u",GET_U_1(eigrp_com_header->opcode)), + GET_U_1(eigrp_com_header->opcode), + GET_BE_U_2(eigrp_com_header->checksum), tok2str(eigrp_common_header_flag_values, "none", - EXTRACT_BE_U_4(eigrp_com_header->flags)), - EXTRACT_BE_U_4(eigrp_com_header->seq), - EXTRACT_BE_U_4(eigrp_com_header->ack), - EXTRACT_BE_U_4(eigrp_com_header->asn), + GET_BE_U_4(eigrp_com_header->flags)), + GET_BE_U_4(eigrp_com_header->seq), + GET_BE_U_4(eigrp_com_header->ack), + GET_BE_U_4(eigrp_com_header->asn), tlen); tptr+=sizeof(struct eigrp_common_header); @@ -277,8 +280,8 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) ND_TCHECK_LEN(tptr, sizeof(struct eigrp_tlv_header)); eigrp_tlv_header = (const struct eigrp_tlv_header *)tptr; - eigrp_tlv_len=EXTRACT_BE_U_2(eigrp_tlv_header->length); - eigrp_tlv_type=EXTRACT_BE_U_2(eigrp_tlv_header->type); + eigrp_tlv_len=GET_BE_U_2(eigrp_tlv_header->length); + eigrp_tlv_type=GET_BE_U_2(eigrp_tlv_header->type); if (eigrp_tlv_len < sizeof(struct eigrp_tlv_header) || @@ -316,12 +319,12 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) } ND_PRINT("\n\t holdtime: %us, k1 %u, k2 %u, k3 %u, k4 %u, k5 %u", - EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_general_parm->holdtime), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k1), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k2), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k3), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k4), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k5)); + GET_BE_U_2(tlv_ptr.eigrp_tlv_general_parm->holdtime), + GET_U_1(tlv_ptr.eigrp_tlv_general_parm->k1), + GET_U_1(tlv_ptr.eigrp_tlv_general_parm->k2), + GET_U_1(tlv_ptr.eigrp_tlv_general_parm->k3), + GET_U_1(tlv_ptr.eigrp_tlv_general_parm->k4), + GET_U_1(tlv_ptr.eigrp_tlv_general_parm->k5)); break; case EIGRP_TLV_SW_VERSION: @@ -333,10 +336,10 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) } ND_PRINT("\n\t IOS version: %u.%u, EIGRP version %u.%u", - EXTRACT_U_1(tlv_ptr.eigrp_tlv_sw_version->ios_major), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_sw_version->ios_minor), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_sw_version->eigrp_major), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_sw_version->eigrp_minor)); + GET_U_1(tlv_ptr.eigrp_tlv_sw_version->ios_major), + GET_U_1(tlv_ptr.eigrp_tlv_sw_version->ios_minor), + GET_U_1(tlv_ptr.eigrp_tlv_sw_version->eigrp_major), + GET_U_1(tlv_ptr.eigrp_tlv_sw_version->eigrp_minor)); break; case EIGRP_TLV_IP_INT: @@ -347,31 +350,31 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) break; } - bit_length = EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->plen); + bit_length = GET_U_1(tlv_ptr.eigrp_tlv_ip_int->plen); if (bit_length > 32) { ND_PRINT("\n\t illegal prefix length %u",bit_length); break; } byte_length = (bit_length + 7) / 8; /* variable length encoding */ memset(prefix, 0, 4); - memcpy(prefix, tlv_ptr.eigrp_tlv_ip_int->destination, byte_length); + GET_CPY_BYTES(prefix, tlv_ptr.eigrp_tlv_ip_int->destination, byte_length); ND_PRINT("\n\t IPv4 prefix: %15s/%u, nexthop: ", - ipaddr_string(ndo, prefix), + ipaddr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IPADDR_STRING() */ bit_length); - if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->nexthop) == 0) + if (GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->nexthop) == 0) ND_PRINT("self"); else ND_PRINT("%s", - ipaddr_string(ndo, tlv_ptr.eigrp_tlv_ip_int->nexthop)); + GET_IPADDR_STRING(tlv_ptr.eigrp_tlv_ip_int->nexthop)); ND_PRINT("\n\t delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u", - (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->delay)/100), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->bandwidth), - EXTRACT_BE_U_3(tlv_ptr.eigrp_tlv_ip_int->mtu), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->hopcount), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->reliability), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->load)); + (GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->delay)/100), + GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->bandwidth), + GET_BE_U_3(tlv_ptr.eigrp_tlv_ip_int->mtu), + GET_U_1(tlv_ptr.eigrp_tlv_ip_int->hopcount), + GET_U_1(tlv_ptr.eigrp_tlv_ip_int->reliability), + GET_U_1(tlv_ptr.eigrp_tlv_ip_int->load)); break; case EIGRP_TLV_IP_EXT: @@ -382,39 +385,39 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) break; } - bit_length = EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->plen); + bit_length = GET_U_1(tlv_ptr.eigrp_tlv_ip_ext->plen); if (bit_length > 32) { ND_PRINT("\n\t illegal prefix length %u",bit_length); break; } byte_length = (bit_length + 7) / 8; /* variable length encoding */ memset(prefix, 0, 4); - memcpy(prefix, tlv_ptr.eigrp_tlv_ip_ext->destination, byte_length); + GET_CPY_BYTES(prefix, tlv_ptr.eigrp_tlv_ip_ext->destination, byte_length); ND_PRINT("\n\t IPv4 prefix: %15s/%u, nexthop: ", - ipaddr_string(ndo, prefix), + ipaddr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IPADDR_STRING() */ bit_length); - if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->nexthop) == 0) + if (GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->nexthop) == 0) ND_PRINT("self"); else ND_PRINT("%s", - ipaddr_string(ndo, tlv_ptr.eigrp_tlv_ip_ext->nexthop)); + GET_IPADDR_STRING(tlv_ptr.eigrp_tlv_ip_ext->nexthop)); ND_PRINT("\n\t origin-router %s, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u", - ipaddr_string(ndo, tlv_ptr.eigrp_tlv_ip_ext->origin_router), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->origin_as), - tok2str(eigrp_ext_proto_id_values,"unknown",EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->proto_id)), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->flags), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->tag), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->metric)); + GET_IPADDR_STRING(tlv_ptr.eigrp_tlv_ip_ext->origin_router), + GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->origin_as), + tok2str(eigrp_ext_proto_id_values,"unknown",GET_U_1(tlv_ptr.eigrp_tlv_ip_ext->proto_id)), + GET_U_1(tlv_ptr.eigrp_tlv_ip_ext->flags), + GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->tag), + GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->metric)); ND_PRINT("\n\t delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u", - (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->delay)/100), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->bandwidth), - EXTRACT_BE_U_3(tlv_ptr.eigrp_tlv_ip_ext->mtu), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->hopcount), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->reliability), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->load)); + (GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->delay)/100), + GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->bandwidth), + GET_BE_U_3(tlv_ptr.eigrp_tlv_ip_ext->mtu), + GET_U_1(tlv_ptr.eigrp_tlv_ip_ext->hopcount), + GET_U_1(tlv_ptr.eigrp_tlv_ip_ext->reliability), + GET_U_1(tlv_ptr.eigrp_tlv_ip_ext->load)); break; case EIGRP_TLV_AT_CABLE_SETUP: @@ -426,9 +429,9 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) } ND_PRINT("\n\t Cable-range: %u-%u, Router-ID %u", - EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_cable_setup->cable_start), - EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_cable_setup->cable_end), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_cable_setup->router_id)); + GET_BE_U_2(tlv_ptr.eigrp_tlv_at_cable_setup->cable_start), + GET_BE_U_2(tlv_ptr.eigrp_tlv_at_cable_setup->cable_end), + GET_BE_U_4(tlv_ptr.eigrp_tlv_at_cable_setup->router_id)); break; case EIGRP_TLV_AT_INT: @@ -440,23 +443,23 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) } ND_PRINT("\n\t Cable-Range: %u-%u, nexthop: ", - EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_start), - EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_end)); + GET_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_start), + GET_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_end)); - if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_int->nexthop) == 0) + if (GET_BE_U_4(tlv_ptr.eigrp_tlv_at_int->nexthop) == 0) ND_PRINT("self"); else ND_PRINT("%u.%u", - EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[0]), - EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[2])); + GET_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[0]), + GET_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[2])); ND_PRINT("\n\t delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u", - (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_int->delay)/100), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_int->bandwidth), - EXTRACT_BE_U_3(tlv_ptr.eigrp_tlv_at_int->mtu), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_int->hopcount), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_int->reliability), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_int->load)); + (GET_BE_U_4(tlv_ptr.eigrp_tlv_at_int->delay)/100), + GET_BE_U_4(tlv_ptr.eigrp_tlv_at_int->bandwidth), + GET_BE_U_3(tlv_ptr.eigrp_tlv_at_int->mtu), + GET_U_1(tlv_ptr.eigrp_tlv_at_int->hopcount), + GET_U_1(tlv_ptr.eigrp_tlv_at_int->reliability), + GET_U_1(tlv_ptr.eigrp_tlv_at_int->load)); break; case EIGRP_TLV_AT_EXT: @@ -468,31 +471,31 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) } ND_PRINT("\n\t Cable-Range: %u-%u, nexthop: ", - EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_start), - EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_end)); + GET_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_start), + GET_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_end)); - if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->nexthop) == 0) + if (GET_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->nexthop) == 0) ND_PRINT("self"); else ND_PRINT("%u.%u", - EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[0]), - EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[2])); + GET_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[0]), + GET_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[2])); ND_PRINT("\n\t origin-router %u, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u", - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->origin_router), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->origin_as), - tok2str(eigrp_ext_proto_id_values,"unknown",EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->proto_id)), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->flags), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->tag), - EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->metric)); + GET_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->origin_router), + GET_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->origin_as), + tok2str(eigrp_ext_proto_id_values,"unknown",GET_U_1(tlv_ptr.eigrp_tlv_at_ext->proto_id)), + GET_U_1(tlv_ptr.eigrp_tlv_at_ext->flags), + GET_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->tag), + GET_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->metric)); ND_PRINT("\n\t delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u", - (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->delay)/100), - EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->bandwidth), - EXTRACT_BE_U_3(tlv_ptr.eigrp_tlv_at_ext->mtu), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->hopcount), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->reliability), - EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->load)); + (GET_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->delay)/100), + GET_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->bandwidth), + GET_BE_U_3(tlv_ptr.eigrp_tlv_at_ext->mtu), + GET_U_1(tlv_ptr.eigrp_tlv_at_ext->hopcount), + GET_U_1(tlv_ptr.eigrp_tlv_at_ext->reliability), + GET_U_1(tlv_ptr.eigrp_tlv_at_ext->load)); break; /* @@ -521,5 +524,5 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) } return; trunc: - ND_PRINT("\n\t\t packet exceeded snapshot"); + nd_print_trunc(ndo); }