NDOize safeputs() and safeputchar()

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 8eabe5dd994a8c8cf3e9411f394de14d1483a296..47df451ee7803d4771da099a3ff7a88d5afba7e2 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,28 +19,16 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.57 2006-03-23 14:58:44 hannes Exp $ (LBL)";
-#endif
-
+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <pcap.h>
-#include <stdio.h>

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

-#include "addrtoname.h"
-
-#include "ip.h"
-#ifdef INET6
-#include "ip6.h"
-#endif

 #include "af.h"
 
 /*
 #include "af.h"
 
 /*


@@ -64,17 +52,17 @@ static const char rcsid[] _U_ =
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
 static inline void
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
 static inline void

-null_hdr_print(u_int family, u_int length)
+null_hdr_print(netdissect_options *ndo, u_int family, u_int length)

 {
 {

-       if (!qflag) {
-               (void)printf("AF %s (%u)",
-                       tok2str(bsd_af_values,"Unknown",family),family);
+       if (!ndo->ndo_qflag) {
+               ND_PRINT((ndo, "AF %s (%u)",
+                       tok2str(bsd_af_values,"Unknown",family),family));

        } else {
        } else {

-               (void)printf("%s",
-                       tok2str(bsd_af_values,"Unknown AF %u",family));
+               ND_PRINT((ndo, "%s",
+                       tok2str(bsd_af_values,"Unknown AF %u",family)));

        }
 
        }
 

-       (void)printf(", length %u: ", length);
+       ND_PRINT((ndo, ", length %u: ", length));

 }
 
 /*
 }
 
 /*


@@ -84,14 +72,14 @@ null_hdr_print(u_int family, u_int length)
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-null_if_print(const struct pcap_pkthdr *h, const u_char *p)
+null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int length = h->len;
        u_int caplen = h->caplen;
        u_int family;
 
        if (caplen < NULL_HDRLEN) {
 {
        u_int length = h->len;
        u_int caplen = h->caplen;
        u_int family;
 
        if (caplen < NULL_HDRLEN) {

-               printf("[|null]");
+               ND_PRINT((ndo, "[|null]"));

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


@@ -108,8 +96,8 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
        if ((family & 0xFFFF0000) != 0)
                family = SWAPLONG(family);
 
        if ((family & 0xFFFF0000) != 0)
                family = SWAPLONG(family);
 

-       if (eflag)
-               null_hdr_print(family, length);
+       if (ndo->ndo_eflag)
+               null_hdr_print(ndo, family, length);

 
        length -= NULL_HDRLEN;
        caplen -= NULL_HDRLEN;
 
        length -= NULL_HDRLEN;
        caplen -= NULL_HDRLEN;


@@ -118,35 +106,35 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
        switch (family) {
 
        case BSD_AFNUM_INET:
        switch (family) {
 
        case BSD_AFNUM_INET:

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

                break;
 
 #ifdef INET6
        case BSD_AFNUM_INET6_BSD:
        case BSD_AFNUM_INET6_FREEBSD:
        case BSD_AFNUM_INET6_DARWIN:
                break;
 
 #ifdef INET6
        case BSD_AFNUM_INET6_BSD:
        case BSD_AFNUM_INET6_FREEBSD:
        case BSD_AFNUM_INET6_DARWIN:

-               ip6_print(gndo, p, length);
+               ip6_print(ndo, p, length);

                break;
 #endif
 
        case BSD_AFNUM_ISO:
                break;
 #endif
 
        case BSD_AFNUM_ISO:

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

                break;
 
        case BSD_AFNUM_APPLETALK:
                break;
 
        case BSD_AFNUM_APPLETALK:

-               atalk_print(p, length);
+               atalk_print(ndo, p, length);

                break;
 
        case BSD_AFNUM_IPX:
                break;
 
        case BSD_AFNUM_IPX:

-               ipx_print(p, length);
+               ipx_print(ndo, p, length);

                break;
 
        default:
                /* unknown AF_ value */
                break;
 
        default:
                /* unknown AF_ value */

-               if (!eflag)
-                       null_hdr_print(family, length + NULL_HDRLEN);
-               if (!suppress_default_print)
-                       default_print(p, caplen);
+               if (!ndo->ndo_eflag)
+                       null_hdr_print(ndo, family, length + NULL_HDRLEN);
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);

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