diff options
Diffstat (limited to 'freebsd/contrib/tcpdump/print-null.c')
| -rw-r--r-- | freebsd/contrib/tcpdump/print-null.c | 71 |
1 files changed, 31 insertions, 40 deletions
diff --git a/freebsd/contrib/tcpdump/print-null.c b/freebsd/contrib/tcpdump/print-null.c index ac727077..2187d2bd 100644 --- a/freebsd/contrib/tcpdump/print-null.c +++ b/freebsd/contrib/tcpdump/print-null.c @@ -1,5 +1,8 @@ #include <machine/rtems-bsd-user-space.h> - +#ifdef __rtems__ +#include <machine/rtems-bsd-program.h> +#include "rtems-bsd-tcpdump-namespace.h" +#endif /* __rtems__ */ /* * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997 * The Regents of the University of California. All rights reserved. @@ -19,32 +22,19 @@ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - * - * $FreeBSD$ */ -#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 +/* \summary: BSD loopback device printer */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <tcpdump-stdinc.h> +#include <netdissect-stdinc.h> -#include <pcap.h> -#include <stdio.h> #include <string.h> -#include "interface.h" -#include "addrtoname.h" - -#include "ip.h" -#ifdef INET6 -#include "ip6.h" -#endif +#include "netdissect.h" #include "af.h" /* @@ -68,17 +58,17 @@ static const char rcsid[] _U_ = ((((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 { - (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)); } /* @@ -88,18 +78,18 @@ null_hdr_print(u_int family, u_int length) * 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) { - printf("[|null]"); + ND_PRINT((ndo, "[|null]")); return (NULL_HDRLEN); } - memcpy((char *)&family, (char *)p, sizeof(family)); + memcpy((char *)&family, (const char *)p, sizeof(family)); /* * This isn't necessarily in our host byte order; if this is @@ -112,8 +102,8 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p) 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; @@ -122,35 +112,33 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p) 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: - ip6_print(gndo, p, length); + ip6_print(ndo, p, length); break; -#endif case BSD_AFNUM_ISO: - isoclns_print(p, length, caplen); + isoclns_print(ndo, p, length, caplen); break; case BSD_AFNUM_APPLETALK: - atalk_print(p, length); + atalk_print(ndo, p, length); break; case BSD_AFNUM_IPX: - ipx_print(p, length); + ipx_print(ndo, p, length); 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); @@ -162,3 +150,6 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p) * c-basic-offset: 8 * End: */ +#ifdef __rtems__ +#include "rtems-bsd-tcpdump-print-null-data.h" +#endif /* __rtems__ */ |