Default to first interface from pcap_findalldevs()

[tcpdump] / print-igrp.c

diff --git a/print-igrp.c b/print-igrp.c
index 8234a88d6656c11676c68bca1981403fa74d48b4..0f36655c24b8df3d391ab18ea35c0e1fedbfc7a6 100644 (file)
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -25,25 +25,25 @@
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
-#include "extract.h"                   /* must come after interface.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
@@ -52,19 +52,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;
@@ -102,12 +102,12 @@ 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 */
@@ -129,15 +129,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));