Print truncations with nd_print_trunc() instead of tstr[] strings

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 27e8e4dcd75a41c1f7d2a8aef87bf933aebdddba..e7daacd42b86a265b4346d1193569421a72f0b64 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -22,16 +22,18 @@
 /* \summary: BSD loopback device printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: BSD loopback device printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <string.h>
 
 #include "netdissect.h"
 
 #include <string.h>
 
 #include "netdissect.h"

+#include "extract.h"

 #include "af.h"
 
 #include "af.h"
 

+

 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
  * 32-bit integer that specifies the family, e.g. AF_INET.
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
  * 32-bit integer that specifies the family, e.g. AF_INET.


@@ -52,7 +54,7 @@
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 

-static inline void
+static void

 null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
 {
        if (!ndo->ndo_qflag) {
 null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
 {
        if (!ndo->ndo_qflag) {


@@ -77,13 +79,13 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 {
        u_int length = h->len;
        u_int caplen = h->caplen;
 {
        u_int length = h->len;
        u_int caplen = h->caplen;

-       u_int family;
+       uint32_t family;

 
 

-       if (caplen < NULL_HDRLEN) {
-               ND_PRINT("[|null]");
-               return (NULL_HDRLEN);
-       }
+       ndo->ndo_protocol = "null_if";
+       if (caplen < NULL_HDRLEN)
+               goto trunc;

 
 

+       ND_TCHECK_4(p);

        memcpy((char *)&family, (const char *)p, sizeof(family));
 
        /*
        memcpy((char *)&family, (const char *)p, sizeof(family));
 
        /*


@@ -136,12 +138,8 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                        ND_DEFAULTPRINT(p, caplen);
        }
 
                        ND_DEFAULTPRINT(p, caplen);
        }
 

+       return (NULL_HDRLEN);
+trunc:
+       nd_print_trunc(ndo);

        return (NULL_HDRLEN);
 }
        return (NULL_HDRLEN);
 }

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