Move stuff from igrp.h to print-igrp.c.

diff --git a/Makefile.in b/Makefile.in
index fb46c63bf662a4865f9d8dd3b766eba7698dd96d..bedbfdacbc5ec516a35d89b955771556d2372904 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,7 +130,6 @@ HDR = \
        extract.h \
        gmpls.h \
        gmt2local.h \
-       igrp.h \
        interface.h \
        interface.h \
        ip.h \

diff --git a/igrp.h b/igrp.h
deleted file mode 100644 (file)
index b5f133b..0000000
--- a/igrp.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/igrp.h,v 1.6 2002-12-11 07:13:52 guy Exp $ (LBL) */
-/* Cisco IGRP definitions */
-
-/* IGRP Header */
-
-struct igrphdr {
-       u_int8_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 */
-};
-
-#define IGRP_UPDATE    1
-#define IGRP_REQUEST   2
-
-/* 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 */
-};
-
-#define IGRP_RTE_SIZE  14      /* don't believe sizeof ! */

diff --git a/print-igrp.c b/print-igrp.c
index 90694b3a012a906c05ae7fc5659e9a7ba50ab6ce..221d43fb74540004d3615968eb459314f0f49192 100644 (file)
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -36,10 +36,42 @@ static const char rcsid[] _U_ =
 
 #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 {
+       u_int8_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 */
+};
+
+#define IGRP_UPDATE    1
+#define IGRP_REQUEST   2
+
+/* 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 */
+};
+
+#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)