bugfix: don't forget to increment the tlv header size, misc. display cosmetics

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index a0bd3c17af5e9d644d5da7497f5870141476fd7a..bfdf3e41958e79608f737a22b37ae65eb32f5757 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.48 2003-02-05 02:28:45 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.53 2005-04-06 21:32:41 mcr Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -125,7 +125,7 @@ null_print(u_int family, u_int length)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether header of the packet, 'h->ts' is the timestamp,
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether header of the packet, 'h->ts' is the timestamp,

- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'

  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int


@@ -163,7 +163,7 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
        switch (family) {
 
        case BSD_AF_INET:
        switch (family) {
 
        case BSD_AF_INET:

-               ip_print(p, length);
+               ip_print(gndo, p, length);

                break;
 
 #ifdef INET6
                break;
 
 #ifdef INET6


@@ -175,7 +175,7 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
 #endif
 
        case BSD_AF_ISO:
 #endif
 
        case BSD_AF_ISO:

-               isoclns_print(p, length, caplen, NULL, NULL);
+               isoclns_print(p, length, caplen);

                break;
 
        case BSD_AF_APPLETALK:
                break;
 
        case BSD_AF_APPLETALK:


@@ -197,3 +197,9 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
        return (NULL_HDRLEN);
 }
 
        return (NULL_HDRLEN);
 }
 

+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */