Index: print-ip.c
===================================================================
RCS file: /tcpdump/master/tcpdump/print-ip.c,v
retrieving revision 1.120
diff -u -r1.120 print-ip.c
--- print-ip.c	5 Feb 2003 02:30:39 -0000	1.120
+++ print-ip.c	22 Apr 2003 13:55:12 -0000
@@ -339,6 +339,19 @@
 	return shouldbe;
 }
 
+#ifndef IP_MF
+#define IP_MF 0x2000
+#endif /* IP_MF */
+#ifndef IP_DF
+#define IP_DF 0x4000
+#endif /* IP_DF */
+
+static struct tok ip_frag_values[] = {
+        { IP_MF,        "+" },
+        { IP_DF,        "DF" },
+        { 0,            NULL }
+};
+
 /*
  * print an IP datagram.
  */
@@ -351,6 +364,8 @@
 	u_char nh;
 	int advance;
 	struct protoent *proto;
+	u_int16_t sum, ip_sum;
+	const char *sep = "";
 
 	ip = (const struct ip *)bp;
 	if ((u_char *)(ip + 1) > snapend) {
@@ -395,8 +410,16 @@
             if (ip->ip_ttl >= 1)
                 (void)printf(", ttl %u", ip->ip_ttl);    
 
-            if ((off & 0x3fff) != 0)
-                (void)printf(", id %u", EXTRACT_16BITS(&ip->ip_id));
+	    /*
+	     * for the firewall guys, print id, offset.  On all
+	     * but the last stick a "+" in the flags portion.
+	     * For unfragmented datagrams, note the don't fragment flag.
+	     */
+
+	    (void)printf(", id %u, offset %u, flags [%s]",
+			     EXTRACT_16BITS(&ip->ip_id),
+			     (off & 0x1fff) * 8,
+			     bittok2str(ip_frag_values, "", off & 0xe000 ));
 
             (void)printf(", length: %u", EXTRACT_16BITS(&ip->ip_len));
 
@@ -405,6 +428,18 @@
                 ip_optprint((u_char *)(ip + 1), hlen - sizeof(struct ip));
                 printf(" )");
             }
+
+	    if ((u_char *)ip + hlen <= snapend) {
+	        sum = in_cksum((const u_short *)ip, hlen, 0);
+		if (sum != 0) {
+		    ip_sum = EXTRACT_16BITS(&ip->ip_sum);
+		    (void)printf("%sbad cksum %x (->%x)!", sep,
+			     ip_sum,
+			     in_cksum_shouldbe(ip_sum, sum));
+		    sep = ", ";
+		}
+	    }
+
             printf(") ");
 	}
 
@@ -575,60 +610,23 @@
 			printf(" %d", len);
 			break;
 		}
-	}
-
-	/* Ultra quiet now means that all this stuff should be suppressed */
-	/* res 3-Nov-98 */
-	if (qflag > 1) return;
-
-
-	/*
-	 * for fragmented datagrams, print id:size@offset.  On all
-	 * but the last stick a "+".  For unfragmented datagrams, note
-	 * the don't fragment flag.
-	 */
-	len = len0;	/* get the original length */
-	if (off & 0x3fff) {
-		/*
-		 * if this isn't the first frag, we're missing the
-		 * next level protocol header.  print the ip addr
-		 * and the protocol.
-		 */
-		if (off & 0x1fff) {
-			(void)printf("%s > %s:", ipaddr_string(&ip->ip_src),
-				      ipaddr_string(&ip->ip_dst));
-			if ((proto = getprotobynumber(ip->ip_p)) != NULL)
-				(void)printf(" %s", proto->p_name);
-			else
-				(void)printf(" ip-proto-%d", ip->ip_p);
-		}
-#ifndef IP_MF
-#define IP_MF 0x2000
-#endif /* IP_MF */
-#ifndef IP_DF
-#define IP_DF 0x4000
-#endif /* IP_DF */
-		(void)printf(" (frag %u:%u@%u%s)", EXTRACT_16BITS(&ip->ip_id), len,
-			(off & 0x1fff) * 8,
-			(off & IP_MF)? "+" : "");
-
-	} else if (off & IP_DF)
-		(void)printf(" (DF)");
-
-	if (vflag) {
-		u_int16_t sum, ip_sum;
-		const char *sep = "";
-
-		if ((u_char *)ip + hlen <= snapend) {
-			sum = in_cksum((const u_short *)ip, hlen, 0);
-			if (sum != 0) {
-				ip_sum = EXTRACT_16BITS(&ip->ip_sum);
-				(void)printf("%sbad cksum %x (->%x)!", sep,
-					     ip_sum,
-					     in_cksum_shouldbe(ip_sum, sum));
-				sep = ", ";
-			}
-		}
+	} else {
+	    /* Ultra quiet now means that all this stuff should be suppressed */
+	    if (qflag > 1) return;
+
+	    /*
+	     * if this isn't the first frag, we're missing the
+	     * next level protocol header.  print the ip addr
+	     * and the protocol.
+	     */
+	    if (off & 0x1fff) {
+	        (void)printf("%s > %s:", ipaddr_string(&ip->ip_src),
+			     ipaddr_string(&ip->ip_dst));
+		if ((proto = getprotobynumber(ip->ip_p)) != NULL)
+		    (void)printf(" %s", proto->p_name);
+		else
+		    (void)printf(" ip-proto-%d", ip->ip_p);
+	    } 
 	}
 }