diff options
Diffstat (limited to 'usr.sbin/tcpdump/tcpdump/print-null.c')
| -rw-r--r-- | usr.sbin/tcpdump/tcpdump/print-null.c | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/usr.sbin/tcpdump/tcpdump/print-null.c b/usr.sbin/tcpdump/tcpdump/print-null.c index b1860685b84d..8e7f3b7faa54 100644 --- a/usr.sbin/tcpdump/tcpdump/print-null.c +++ b/usr.sbin/tcpdump/tcpdump/print-null.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1991, 1993, 1994 + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that: (1) source code distributions @@ -21,20 +21,17 @@ #ifndef lint static char rcsid[] = - "@(#)$Header: print-null.c,v 1.3 91/10/07 20:19:11 leres Exp $ (LBL)"; + "@(#)$Header: print-null.c,v 1.14 94/06/10 17:01:35 mccanne Exp $ (LBL)"; #endif -#include <stdio.h> -#include <sys/types.h> #include <sys/param.h> #include <sys/time.h> -#include <sys/timeb.h> #include <sys/socket.h> #include <sys/file.h> -#include <sys/mbuf.h> #include <sys/ioctl.h> #include <net/if.h> + #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -45,20 +42,19 @@ static char rcsid[] = #include <netinet/tcp.h> #include <netinet/tcpip.h> -#include <net/bpf.h> + +#include <stdio.h> #include "interface.h" #include "addrtoname.h" +#include "pcap.h" #define NULL_HDRLEN 4 static void -null_print(p, ip, length) - u_char *p; - struct ip *ip; - int length; +null_print(const u_char *p, const struct ip *ip, int length) { - u_int family; + u_int family; bcopy(p, &family, sizeof(family)); @@ -83,23 +79,21 @@ null_print(p, ip, length) } void -null_if_print(p, tvp, length, caplen) - u_char *p; - struct timeval *tvp; - int length; - int caplen; +null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) { - struct ip *ip; + int length = h->len; + int caplen = h->caplen; + const struct ip *ip; - ts_print(tvp); + ts_print(&h->ts); /* * Some printers want to get back at the link level addresses, * and/or check that they're not walking off the end of the packet. * Rather than pass them all the way down, we set these globals. */ - packetp = (u_char *)p; - snapend = (u_char *)p + caplen; + packetp = p; + snapend = p + caplen; length -= NULL_HDRLEN; @@ -108,10 +102,10 @@ null_if_print(p, tvp, length, caplen) if (eflag) null_print(p, ip, length); - ip_print(ip, length); + ip_print((const u_char *)ip, length); if (xflag) - default_print((u_short *)ip, caplen - NULL_HDRLEN); + default_print((const u_char *)ip, caplen - NULL_HDRLEN); putchar('\n'); } |