X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f6fa6a40d4156cdf5dea882024beb7b10d2412f1..464c44fbd1394ac006d8d99f16e80ead423c1c47:/print-igrp.c

diff --git a/print-igrp.c b/print-igrp.c
index 3eaa40ef..2580ca5e 100644
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -23,7 +23,11 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.9 1999-10-17 21:37:12 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.16 2001-06-15 22:17:32 fenner Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <sys/param.h>
@@ -31,9 +35,6 @@ static const char rcsid[] =
 #include <sys/socket.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/udp.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -41,6 +42,7 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 #include "igrp.h"
+#include "ip.h"
 #include "extract.h"			/* must come after interface.h */
 
 static void
@@ -90,9 +92,7 @@ igrp_print(register const u_char *bp, u_int length, register const u_char *bp2)
 	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));
+        (void)printf("igrp:");
 
 	/* Header */
 	TCHECK(*hdr);
@@ -101,8 +101,8 @@ igrp_print(register const u_char *bp, u_int length, register const u_char *bp2)
 	next = EXTRACT_16BITS(&hdr->ig_nx);
 
 	(void)printf(" %s V%d edit=%d AS=%d (%d/%d/%d)",
-	    tok2str(op2str, "op-#%d", hdr->ig_op),
-	    hdr->ig_v,
+	    tok2str(op2str, "op-#%d", IGRP_OP(hdr->ig_vop)),
+	    IGRP_V(hdr->ig_vop),
 	    hdr->ig_ed,
 	    EXTRACT_16BITS(&hdr->ig_as),
 	    nint,
@@ -124,7 +124,7 @@ igrp_print(register const u_char *bp, u_int length, register const u_char *bp2)
 			igrp_entry_print((struct igrprte *)cp, 0, 1);
 			--next;
 		} else {
-			(void)printf("[extra bytes %d]", length);
+			(void)printf(" [extra bytes %d]", length);
 			break;
 		}
 		cp += IGRP_RTE_SIZE;
@@ -133,5 +133,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:
-	fputs("[|igrp]", stdout);
+	fputs(" [|igrp]", stdout);
 }