X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1fe6e66ecec3fb7a7cc729038012cbb264542331..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-igrp.c

diff --git a/print-igrp.c b/print-igrp.c
index 794f0c52..6cd4f69e 100644
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -21,30 +21,31 @@
  * Initial contribution from Francis Dupont (francis.dupont@inria.fr)
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Interior Gateway Routing Protocol (IGRP) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#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 {
-	u_int8_t ig_vop;	/* protocol version number / opcode */
+	uint8_t ig_vop;	/* protocol version number / opcode */
 #define IGRP_V(x)	(((x) & 0xf0) >> 4)
 #define IGRP_OP(x)	((x) & 0x0f)
-	u_int8_t ig_ed;		/* edition number */
-	u_int16_t ig_as;	/* autonomous system number */
-	u_int16_t ig_ni;	/* number of subnet in local net */
-	u_int16_t ig_ns;	/* number of networks in AS */
-	u_int16_t ig_nx;	/* number of networks ouside AS */
-	u_int16_t ig_sum;	/* checksum of IGRP header & data */
+	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
@@ -53,19 +54,19 @@ struct igrphdr {
 /* IGRP routing entry */
 
 struct igrprte {
-	u_int8_t igr_net[3];	/* 3 significant octets of IP address */
-	u_int8_t igr_dly[3];	/* delay in tens of microseconds */
-	u_int8_t igr_bw[3];	/* bandwidth in units of 1 kb/s */
-	u_int8_t igr_mtu[2];	/* MTU in octets */
-	u_int8_t igr_rel;	/* percent packets successfully tx/rx */
-	u_int8_t igr_ld;	/* percent of channel occupied */
-	u_int8_t igr_hct;	/* hop count */
+	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(netdissect_options *ndo, register struct igrprte *igr,
+igrp_entry_print(netdissect_options *ndo, register const struct igrprte *igr,
     register int is_interior, register int is_exterior)
 {
 	register u_int delay, bandwidth;
@@ -81,12 +82,12 @@ igrp_entry_print(netdissect_options *ndo, register struct igrprte *igr,
 		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);
+	delay = EXTRACT_BE_U_3(igr->igr_dly);
+	bandwidth = EXTRACT_BE_U_3(igr->igr_bw);
 	metric = bandwidth + delay;
 	if (metric > 0xffffff)
 		metric = 0xffffff;
-	mtu = EXTRACT_16BITS(igr->igr_mtu);
+	mtu = EXTRACT_BE_U_2(igr->igr_mtu);
 
 	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,
@@ -103,25 +104,25 @@ static const struct tok op2str[] = {
 void
 igrp_print(netdissect_options *ndo, register const u_char *bp, u_int length)
 {
-	register struct igrphdr *hdr;
-	register u_char *cp;
+	register const struct igrphdr *hdr;
+	register const u_char *cp;
 	u_int nint, nsys, next;
 
-	hdr = (struct igrphdr *)bp;
-	cp = (u_char *)(hdr + 1);
+	hdr = (const struct igrphdr *)bp;
+	cp = (const u_char *)(hdr + 1);
 	ND_PRINT((ndo, "igrp:"));
 
 	/* Header */
 	ND_TCHECK(*hdr);
-	nint = EXTRACT_16BITS(&hdr->ig_ni);
-	nsys = EXTRACT_16BITS(&hdr->ig_ns);
-	next = EXTRACT_16BITS(&hdr->ig_nx);
+	nint = EXTRACT_BE_U_2(&hdr->ig_ni);
+	nsys = EXTRACT_BE_U_2(&hdr->ig_ns);
+	next = EXTRACT_BE_U_2(&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),
+	    EXTRACT_BE_U_2(&hdr->ig_as),
 	    nint,
 	    nsys,
 	    next));
@@ -130,15 +131,15 @@ igrp_print(netdissect_options *ndo, register const u_char *bp, u_int length)
 	while (length >= IGRP_RTE_SIZE) {
 		if (nint > 0) {
 			ND_TCHECK2(*cp, IGRP_RTE_SIZE);
-			igrp_entry_print(ndo, (struct igrprte *)cp, 1, 0);
+			igrp_entry_print(ndo, (const struct igrprte *)cp, 1, 0);
 			--nint;
 		} else if (nsys > 0) {
 			ND_TCHECK2(*cp, IGRP_RTE_SIZE);
-			igrp_entry_print(ndo, (struct igrprte *)cp, 0, 0);
+			igrp_entry_print(ndo, (const struct igrprte *)cp, 0, 0);
 			--nsys;
 		} else if (next > 0) {
 			ND_TCHECK2(*cp, IGRP_RTE_SIZE);
-			igrp_entry_print(ndo, (struct igrprte *)cp, 0, 1);
+			igrp_entry_print(ndo, (const struct igrprte *)cp, 0, 1);
 			--next;
 		} else {
 			ND_PRINT((ndo, " [extra bytes %d]", length));