X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/69cb46af9119e8b5554bcc4bf1bf36f39cb82131..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-igrp.c diff --git a/print-igrp.c b/print-igrp.c index 9b59dc5a..fedc561f 100644 --- a/print-igrp.c +++ b/print-igrp.c @@ -21,29 +21,31 @@ * Initial contribution from Francis Dupont (francis.dupont@inria.fr) */ +/* \summary: Interior Gateway Routing Protocol (IGRP) printer */ + #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" -#include "interface.h" -#include "extract.h" /* must come after interface.h */ +#include "netdissect.h" +#include "extract.h" /* Cisco IGRP definitions */ /* IGRP Header */ struct igrphdr { - uint8_t ig_vop; /* protocol version number / opcode */ + nd_uint8_t ig_vop; /* protocol version number / opcode */ #define IGRP_V(x) (((x) & 0xf0) >> 4) #define IGRP_OP(x) ((x) & 0x0f) - uint8_t ig_ed; /* edition number */ - uint16_t ig_as; /* autonomous system number */ - uint16_t ig_ni; /* number of subnet in local net */ - uint16_t ig_ns; /* number of networks in AS */ - uint16_t ig_nx; /* number of networks ouside AS */ - uint16_t ig_sum; /* checksum of IGRP header & data */ + nd_uint8_t ig_ed; /* edition number */ + nd_uint16_t ig_as; /* autonomous system number */ + nd_uint16_t ig_ni; /* number of subnet in local net */ + nd_uint16_t ig_ns; /* number of networks in AS */ + nd_uint16_t ig_nx; /* number of networks ouside AS */ + nd_uint16_t ig_sum; /* checksum of IGRP header & data */ }; #define IGRP_UPDATE 1 @@ -52,45 +54,45 @@ struct igrphdr { /* IGRP routing entry */ struct igrprte { - uint8_t igr_net[3]; /* 3 significant octets of IP address */ - uint8_t igr_dly[3]; /* delay in tens of microseconds */ - uint8_t igr_bw[3]; /* bandwidth in units of 1 kb/s */ - uint8_t igr_mtu[2]; /* MTU in octets */ - uint8_t igr_rel; /* percent packets successfully tx/rx */ - uint8_t igr_ld; /* percent of channel occupied */ - uint8_t igr_hct; /* hop count */ + nd_byte igr_net[3]; /* 3 significant octets of IP address */ + nd_uint24_t igr_dly; /* delay in tens of microseconds */ + nd_uint24_t igr_bw; /* bandwidth in units of 1 kb/s */ + nd_uint16_t igr_mtu; /* MTU in octets */ + nd_uint8_t igr_rel; /* percent packets successfully tx/rx */ + nd_uint8_t igr_ld; /* percent of channel occupied */ + nd_uint8_t igr_hct; /* hop count */ }; #define IGRP_RTE_SIZE 14 /* don't believe sizeof ! */ static void -igrp_entry_print(netdissect_options *ndo, register const struct igrprte *igr, - register int is_interior, register int is_exterior) +igrp_entry_print(netdissect_options *ndo, const struct igrprte *igr, + int is_interior, int is_exterior) { - register u_int delay, bandwidth; + u_int delay, bandwidth; u_int metric, mtu; if (is_interior) - ND_PRINT((ndo, " *.%d.%d.%d", igr->igr_net[0], - igr->igr_net[1], igr->igr_net[2])); + ND_PRINT(" *.%u.%u.%u", igr->igr_net[0], + igr->igr_net[1], igr->igr_net[2]); else if (is_exterior) - ND_PRINT((ndo, " X%d.%d.%d.0", igr->igr_net[0], - igr->igr_net[1], igr->igr_net[2])); + ND_PRINT(" X%u.%u.%u.0", igr->igr_net[0], + igr->igr_net[1], igr->igr_net[2]); else - ND_PRINT((ndo, " %d.%d.%d.0", igr->igr_net[0], - igr->igr_net[1], igr->igr_net[2])); + ND_PRINT(" %u.%u.%u.0", igr->igr_net[0], + igr->igr_net[1], igr->igr_net[2]); - delay = EXTRACT_24BITS(igr->igr_dly); - bandwidth = EXTRACT_24BITS(igr->igr_bw); + delay = GET_BE_U_3(igr->igr_dly); + bandwidth = GET_BE_U_3(igr->igr_bw); metric = bandwidth + delay; if (metric > 0xffffff) metric = 0xffffff; - mtu = EXTRACT_16BITS(igr->igr_mtu); + mtu = GET_BE_U_2(igr->igr_mtu); - ND_PRINT((ndo, " d=%d b=%d r=%d l=%d M=%d mtu=%d in %d hops", + ND_PRINT(" d=%u b=%u r=%u l=%u M=%u mtu=%u in %u hops", 10 * delay, bandwidth == 0 ? 0 : 10000000 / bandwidth, - igr->igr_rel, igr->igr_ld, metric, - mtu, igr->igr_hct)); + GET_U_1(igr->igr_rel), GET_U_1(igr->igr_ld), metric, + mtu, GET_U_1(igr->igr_hct)); } static const struct tok op2str[] = { @@ -100,47 +102,48 @@ static const struct tok op2str[] = { }; void -igrp_print(netdissect_options *ndo, register const u_char *bp, u_int length) +igrp_print(netdissect_options *ndo, const u_char *bp, u_int length) { - register const struct igrphdr *hdr; - register const u_char *cp; + const struct igrphdr *hdr; + const u_char *cp; u_int nint, nsys, next; + ndo->ndo_protocol = "igrp"; hdr = (const struct igrphdr *)bp; cp = (const u_char *)(hdr + 1); - ND_PRINT((ndo, "igrp:")); + ND_PRINT("igrp:"); /* Header */ - ND_TCHECK(*hdr); - nint = EXTRACT_16BITS(&hdr->ig_ni); - nsys = EXTRACT_16BITS(&hdr->ig_ns); - next = EXTRACT_16BITS(&hdr->ig_nx); - - ND_PRINT((ndo, " %s V%d edit=%d AS=%d (%d/%d/%d)", - tok2str(op2str, "op-#%d", IGRP_OP(hdr->ig_vop)), - IGRP_V(hdr->ig_vop), - hdr->ig_ed, - EXTRACT_16BITS(&hdr->ig_as), + ND_TCHECK_SIZE(hdr); + nint = GET_BE_U_2(hdr->ig_ni); + nsys = GET_BE_U_2(hdr->ig_ns); + next = GET_BE_U_2(hdr->ig_nx); + + ND_PRINT(" %s V%u edit=%u AS=%u (%u/%u/%u)", + tok2str(op2str, "op-#%u", IGRP_OP(GET_U_1(hdr->ig_vop))), + IGRP_V(GET_U_1(hdr->ig_vop)), + GET_U_1(hdr->ig_ed), + GET_BE_U_2(hdr->ig_as), nint, nsys, - next)); + next); length -= sizeof(*hdr); while (length >= IGRP_RTE_SIZE) { if (nint > 0) { - ND_TCHECK2(*cp, IGRP_RTE_SIZE); + ND_TCHECK_LEN(cp, IGRP_RTE_SIZE); igrp_entry_print(ndo, (const struct igrprte *)cp, 1, 0); --nint; } else if (nsys > 0) { - ND_TCHECK2(*cp, IGRP_RTE_SIZE); + ND_TCHECK_LEN(cp, IGRP_RTE_SIZE); igrp_entry_print(ndo, (const struct igrprte *)cp, 0, 0); --nsys; } else if (next > 0) { - ND_TCHECK2(*cp, IGRP_RTE_SIZE); + ND_TCHECK_LEN(cp, IGRP_RTE_SIZE); igrp_entry_print(ndo, (const struct igrprte *)cp, 0, 1); --next; } else { - ND_PRINT((ndo, " [extra bytes %d]", length)); + ND_PRINT(" [extra bytes %u]", length); break; } cp += IGRP_RTE_SIZE; @@ -149,5 +152,5 @@ igrp_print(netdissect_options *ndo, register const u_char *bp, u_int length) if (nint == 0 && nsys == 0 && next == 0) return; trunc: - ND_PRINT((ndo, " [|igrp]")); + nd_print_trunc(ndo); }