Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-igrp.c

diff --git a/print-igrp.c b/print-igrp.c
index be87dba250c65f2203ee50fddb8f35d20eb9af8a..6cd4f69e8c6f600499970c8fae6e5e13f298af9b 100644 (file)
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -21,112 +21,128 @@
  * Initial contribution from Francis Dupont ([email protected])
  */
 
  * Initial contribution from Francis Dupont ([email protected])
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.15 2000-09-29 04:58:40 guy Exp $ (LBL)";
-#endif
+/* \summary: Interior Gateway Routing Protocol (IGRP) printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-#include <sys/types.h>                 /* concession to AIX */
-#include <sys/socket.h>
+#include <netdissect-stdinc.h>
+
+#include "netdissect.h"
+#include "extract.h"
+
+/* Cisco IGRP definitions */
+
+/* IGRP Header */

 
 

-#include <netinet/in.h>
+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

 
 

-#include <errno.h>
-#include <stdio.h>
+/* 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 */
+};

 
 

-#include "interface.h"
-#include "addrtoname.h"
-#include "igrp.h"
-#include "ip.h"
-#include "extract.h"                   /* must come after interface.h */
+#define IGRP_RTE_SIZE  14      /* don't believe sizeof ! */

 
 static void
 
 static void

-igrp_entry_print(register struct igrprte *igr, register int is_interior,
-    register int is_exterior)
+igrp_entry_print(netdissect_options *ndo, register const struct igrprte *igr,
+    register int is_interior, register int is_exterior)

 {
        register u_int delay, bandwidth;
        u_int metric, mtu;
 
        if (is_interior)
 {
        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)
        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
        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);
+       delay = EXTRACT_BE_U_3(igr->igr_dly);
+       bandwidth = EXTRACT_BE_U_3(igr->igr_bw);

        metric = bandwidth + delay;
        if (metric > 0xffffff)
                metric = 0xffffff;
        metric = bandwidth + delay;
        if (metric > 0xffffff)
                metric = 0xffffff;

-       mtu = EXTRACT_16BITS(igr->igr_mtu);
+       mtu = EXTRACT_BE_U_2(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,
            10 * delay, bandwidth == 0 ? 0 : 10000000 / bandwidth,
            igr->igr_rel, igr->igr_ld, metric,

-           mtu, igr->igr_hct);
+           mtu, igr->igr_hct));

 }
 
 }
 

-static struct tok op2str[] = {
+static const struct tok op2str[] = {

        { IGRP_UPDATE,          "update" },
        { IGRP_REQUEST,         "request" },
        { 0,                    NULL }
 };
 
 void
        { IGRP_UPDATE,          "update" },
        { IGRP_REQUEST,         "request" },
        { 0,                    NULL }
 };
 
 void

-igrp_print(register const u_char *bp, u_int length, register const u_char *bp2)
+igrp_print(netdissect_options *ndo, register const u_char *bp, u_int length)

 {
 {

-       register struct igrphdr *hdr;
-       register struct ip *ip;
-       register u_char *cp;
+       register const struct igrphdr *hdr;
+       register const u_char *cp;

        u_int nint, nsys, next;
 
        u_int nint, nsys, next;
 

-       hdr = (struct igrphdr *)bp;
-       ip = (struct ip *)bp2;
-       cp = (u_char *)(hdr + 1);
-        (void)printf("%s > %s: igrp: ",
-           ipaddr_string(&ip->ip_src),
-           ipaddr_string(&ip->ip_dst));
+       hdr = (const struct igrphdr *)bp;
+       cp = (const u_char *)(hdr + 1);
+       ND_PRINT((ndo, "igrp:"));

 
        /* Header */
 
        /* Header */

-       TCHECK(*hdr);
-       nint = EXTRACT_16BITS(&hdr->ig_ni);
-       nsys = EXTRACT_16BITS(&hdr->ig_ns);
-       next = EXTRACT_16BITS(&hdr->ig_nx);
+       ND_TCHECK(*hdr);
+       nint = EXTRACT_BE_U_2(&hdr->ig_ni);
+       nsys = EXTRACT_BE_U_2(&hdr->ig_ns);
+       next = EXTRACT_BE_U_2(&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,
            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,
            nint,
            nsys,

-           next);
+           next));

 
        length -= sizeof(*hdr);
        while (length >= IGRP_RTE_SIZE) {
                if (nint > 0) {
 
        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, (const struct igrprte *)cp, 1, 0);

                        --nint;
                } else if (nsys > 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, (const struct igrprte *)cp, 0, 0);

                        --nsys;
                } else if (next > 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, (const struct igrprte *)cp, 0, 1);

                        --next;
                } else {
                        --next;
                } else {

-                       (void)printf("[extra bytes %d]", length);
+                       ND_PRINT((ndo, " [extra bytes %d]", length));

                        break;
                }
                cp += IGRP_RTE_SIZE;
                        break;
                }
                cp += IGRP_RTE_SIZE;


@@ -135,5 +151,5 @@ igrp_print(register const u_char *bp, u_int length, register const u_char *bp2)
        if (nint == 0 && nsys == 0 && next == 0)
                return;
 trunc:
        if (nint == 0 && nsys == 0 && next == 0)
                return;
 trunc:

-       fputs("[|igrp]", stdout);
+       ND_PRINT((ndo, " [|igrp]"));

 }
 }