Patch sent to Debian by Roderick Schertler <[email protected]> to print

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 86686d22b0e7148a38b314aded6a9ef99be0b091..505cf847b665b9f5b9c6969aa44357ef7cf93dc2 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.87 2000-09-23 08:54:31 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.89 2000-10-03 02:54:58 itojun Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -33,7 +33,6 @@ static const char rcsid[] =
 #include <sys/socket.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -444,7 +443,7 @@ ip_print(register const u_char *bp, register u_int length)
                (void)printf("truncated-ip %d", length);
                return;
        }
-       hlen = ip->ip_hl * 4;
+       hlen = IP_HL(ip) * 4;
        if (hlen < sizeof (struct ip)) {
                (void)printf("bad-hlen %d", hlen);
                return;
@@ -737,7 +736,7 @@ ipN_print(register const u_char *bp, register u_int length)
                return;
        }
        memcpy (&hdr, (char *)ip, 4);
-       switch (hdr.ip_v) {
+       switch (IP_V(&hdr)) {
        case 4:
            ip_print (bp, length);
            return;
@@ -747,7 +746,7 @@ ipN_print(register const u_char *bp, register u_int length)
            return;
 #endif
        default:
-           (void)printf("unknown ip %d", hdr.ip_v);
+           (void)printf("unknown ip %d", IP_V(&hdr));
            return;
        }
 }