Upgrade to tcpdump 4.7.4.
Bug: http://b/24902618
Change-Id: I7c3605015d90453b0a8c339b1774e285796f8775
diff --git a/print-igrp.c b/print-igrp.c
index 90694b3..fbb3134 100644
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -21,41 +21,65 @@
* Initial contribution from Francis Dupont (francis.dupont@inria.fr)
*/
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.21 2005-04-20 21:01:56 guy Exp $ (LBL)";
-#endif
-
+#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <tcpdump-stdinc.h>
-#include <stdio.h>
-
#include "interface.h"
-#include "addrtoname.h"
-#include "igrp.h"
-#include "ip.h"
#include "extract.h" /* must come after interface.h */
+/* Cisco IGRP definitions */
+
+/* IGRP Header */
+
+struct igrphdr {
+ 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 */
+};
+
+#define IGRP_UPDATE 1
+#define IGRP_REQUEST 2
+
+/* 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 */
+};
+
+#define IGRP_RTE_SIZE 14 /* don't believe sizeof ! */
+
static void
-igrp_entry_print(register struct igrprte *igr, register int is_interior,
- register int is_exterior)
+igrp_entry_print(netdissect_options *ndo, register struct igrprte *igr,
+ register int is_interior, register int is_exterior)
{
register u_int delay, bandwidth;
u_int metric, mtu;
if (is_interior)
- printf(" *.%d.%d.%d", igr->igr_net[0],
- igr->igr_net[1], igr->igr_net[2]);
+ ND_PRINT((ndo, " *.%d.%d.%d", igr->igr_net[0],
+ igr->igr_net[1], igr->igr_net[2]));
else if (is_exterior)
- printf(" X%d.%d.%d.0", igr->igr_net[0],
- igr->igr_net[1], igr->igr_net[2]);
+ ND_PRINT((ndo, " X%d.%d.%d.0", igr->igr_net[0],
+ igr->igr_net[1], igr->igr_net[2]));
else
- printf(" %d.%d.%d.0", igr->igr_net[0],
- igr->igr_net[1], igr->igr_net[2]);
+ ND_PRINT((ndo, " %d.%d.%d.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);
@@ -64,10 +88,10 @@
metric = 0xffffff;
mtu = EXTRACT_16BITS(igr->igr_mtu);
- printf(" d=%d b=%d r=%d l=%d M=%d mtu=%d in %d hops",
+ ND_PRINT((ndo, " d=%d b=%d r=%d l=%d M=%d mtu=%d in %d hops",
10 * delay, bandwidth == 0 ? 0 : 10000000 / bandwidth,
igr->igr_rel, igr->igr_ld, metric,
- mtu, igr->igr_hct);
+ mtu, igr->igr_hct));
}
static const struct tok op2str[] = {
@@ -77,7 +101,7 @@
};
void
-igrp_print(register const u_char *bp, u_int length, const u_char *bp2 _U_)
+igrp_print(netdissect_options *ndo, register const u_char *bp, u_int length)
{
register struct igrphdr *hdr;
register u_char *cp;
@@ -85,39 +109,39 @@
hdr = (struct igrphdr *)bp;
cp = (u_char *)(hdr + 1);
- (void)printf("igrp:");
+ ND_PRINT((ndo, "igrp:"));
/* Header */
- TCHECK(*hdr);
+ ND_TCHECK(*hdr);
nint = EXTRACT_16BITS(&hdr->ig_ni);
nsys = EXTRACT_16BITS(&hdr->ig_ns);
next = EXTRACT_16BITS(&hdr->ig_nx);
- (void)printf(" %s V%d edit=%d AS=%d (%d/%d/%d)",
+ 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),
nint,
nsys,
- next);
+ next));
length -= sizeof(*hdr);
while (length >= IGRP_RTE_SIZE) {
if (nint > 0) {
- TCHECK2(*cp, IGRP_RTE_SIZE);
- igrp_entry_print((struct igrprte *)cp, 1, 0);
+ ND_TCHECK2(*cp, IGRP_RTE_SIZE);
+ igrp_entry_print(ndo, (struct igrprte *)cp, 1, 0);
--nint;
} else if (nsys > 0) {
- TCHECK2(*cp, IGRP_RTE_SIZE);
- igrp_entry_print((struct igrprte *)cp, 0, 0);
+ ND_TCHECK2(*cp, IGRP_RTE_SIZE);
+ igrp_entry_print(ndo, (struct igrprte *)cp, 0, 0);
--nsys;
} else if (next > 0) {
- TCHECK2(*cp, IGRP_RTE_SIZE);
- igrp_entry_print((struct igrprte *)cp, 0, 1);
+ ND_TCHECK2(*cp, IGRP_RTE_SIZE);
+ igrp_entry_print(ndo, (struct igrprte *)cp, 0, 1);
--next;
} else {
- (void)printf(" [extra bytes %d]", length);
+ ND_PRINT((ndo, " [extra bytes %d]", length));
break;
}
cp += IGRP_RTE_SIZE;
@@ -126,5 +150,5 @@
if (nint == 0 && nsys == 0 && next == 0)
return;
trunc:
- fputs(" [|igrp]", stdout);
+ ND_PRINT((ndo, " [|igrp]"));
}