[packages/trafshow.git] / trafshow-2.0-pcap.patch

diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/Makefile trafshow-2.0/Makefile
--- trafshow-2.0.orig/Makefile	Tue Jan 16 14:28:26 1996
+++ trafshow-2.0/Makefile	Sun Apr 13 17:25:39 1997
@@ -3,17 +3,19 @@
 #
 
 # This options intended for BSD/OS V2
-CC	= shlicc2
+CC	= gcc
+ifndef FLAGS
 FLAGS	= -O2
+endif
 DEFINE	=
-LIB	= ../lib/libbpft.a -lcurses -ltermcap -ll
+LIB	= ../lib/libbpft.a -L../libpcap -lncurses -ltermcap -lpcap
 
 BINDIR	= /usr/local/bin
 MANDIR	= /usr/local/man/man1
 MODE	= 750
 GROUP	= wheel
 
-INCLUDE	= -I../include
+INCLUDE	= -I../include -I../linux-include -I../libpcap/linux-include -I../libpcap -I../libpcap/bpf -I/usr/include/bsd
 CFLAGS	= $(FLAGS) $(INCLUDE) $(DEFINE)
 DEPFLAGS= $(INCLUDE) $(DEFINE)
 ARFLAGS	= rc
diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/include/interface.h trafshow-2.0/include/interface.h
--- trafshow-2.0.orig/include/interface.h	Fri Jun  9 19:25:48 1995
+++ trafshow-2.0/include/interface.h	Sun Apr 13 17:33:18 1997
@@ -20,6 +20,7 @@
  */
 
 #include <machine/endian.h>
+#include <pcap.h>
 
 #ifdef __GNUC__
 #define inline __inline
@@ -39,8 +40,8 @@
 extern char *program_name;	/* used to generate self-identifying messages */
 
 extern int link_type;
-extern unsigned long netmask;
-extern unsigned long localnet;
+extern bpf_u_int32 netmask;
+extern bpf_u_int32 localnet;
 extern int snaplen;
 /* global pointers to beginning and end of current packet */
 extern unsigned char *packetp;
diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/lib/Makefile trafshow-2.0/lib/Makefile
--- trafshow-2.0.orig/lib/Makefile	Wed Jan 10 15:51:15 1996
+++ trafshow-2.0/lib/Makefile	Sun Apr 13 17:25:39 1997
@@ -3,21 +3,23 @@
 #
 
 LIB	= libbpft.a
-SRC	= addrtoname.c bpf.c bpf_dump.c bpf_filter.c bpf_image.c etherent.c \
-	gencode.c inet.c interfaces.c nametoaddr.c optimize.c util.c \
-	version.c tcpgram.y tcplex.l
-OBJ	= addrtoname.o bpf.o bpf_dump.o bpf_filter.o bpf_image.o etherent.o \
-	gencode.o inet.o interfaces.o nametoaddr.o optimize.o util.o \
-	version.o tcpgram.o tcplex.o
+#SRC	= addrtoname.c bpf.c bpf_dump.c bpf_filter.c bpf_image.c etherent.c \
+#	gencode.c inet.c interfaces.c nametoaddr.c optimize.c util.c \
+#	version.c tcpgram.y tcplex.l
+#OBJ	= addrtoname.o bpf.o bpf_dump.o bpf_filter.o bpf_image.o etherent.o \
+#	gencode.o inet.o interfaces.o nametoaddr.o optimize.o util.o \
+#	version.o tcpgram.o tcplex.o
+SRC	= addrtoname.c bpf_dump.c etherent.c util.c
+OBJ	= $(SRC:.c=.o)
 
-CC	= gcc
-FLAGS	= -g
-DEFINE	=
-
-INCLUDE	= -I../include
-CFLAGS	= $(FLAGS) $(INCLUDE) $(DEFINE)
-DEPFLAGS= $(INCLUDE) $(DEFINE)
-ARFLAGS	= rc
+#CC	= gcc
+#FLAGS	= -g
+#DEFINE	=
+#
+#INCLUDE	= -I../include
+#CFLAGS	= $(FLAGS) $(INCLUDE) $(DEFINE)
+#DEPFLAGS= $(INCLUDE) $(DEFINE)
+#ARFLAGS	= rc
 
 $(LIB): $(OBJ)
 	rm -f $(LIB)
diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/lib/addrtoname.c trafshow-2.0/lib/addrtoname.c
--- trafshow-2.0.orig/lib/addrtoname.c	Fri Jan 12 12:42:37 1996
+++ trafshow-2.0/lib/addrtoname.c	Sun Apr 13 17:26:02 1997
@@ -468,8 +468,10 @@
 	char *device;
 	int fflag;
 {
+#if 0 /* netmask MUST be initialized */
 	if (netmask == 0) /* if was not initialized */
 		lookup_net(device);
+#endif
 
 	if (fflag) {
 		f_localnet = localnet;
diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/trafshow/Makefile trafshow-2.0/trafshow/Makefile
--- trafshow-2.0.orig/trafshow/Makefile	Mon Jan 15 11:44:09 1996
+++ trafshow-2.0/trafshow/Makefile	Sun Apr 13 17:25:39 1997
@@ -5,14 +5,14 @@
 PROG	= trafshow
 SRC	= main.c show.c keyb.c
 OBJ	= $(SRC:.c=.o)
-LIB	= ../lib/libbpft.a -lcurses -ltermcap -ll
-CC	= gcc
-FLAGS	= -g
-DEFINE	=
-
-INCLUDE	= -I../include
-CFLAGS	= $(FLAGS) $(INCLUDE) $(DEFINE)
-DEPFLAGS= $(INCLUDE) $(DEFINE)
+#LIB	= ../lib/libbpft.a -lcurses -ltermcap -ll
+#CC	= gcc
+#FLAGS	= -g
+#DEFINE	=
+#
+#INCLUDE	= -I../include
+#CFLAGS	= $(FLAGS) $(INCLUDE) $(DEFINE)
+#DEPFLAGS= $(INCLUDE) $(DEFINE)
 
 $(PROG): $(OBJ)
 	$(CC) $(OBJ) $(LIB) -o $(PROG)
diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/trafshow/main.c trafshow-2.0/trafshow/main.c
--- trafshow-2.0.orig/trafshow/main.c	Mon Jan 15 17:10:42 1996
+++ trafshow-2.0/trafshow/main.c	Sun Apr 13 17:37:29 1997
@@ -11,6 +11,8 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' WITHOUT ANY WARRANTIES OF ANY KIND.
  */
 
+char *version = "2.0s";
+
 #include <curses.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -37,20 +39,24 @@
 int scr_interval = DEFAULT_SCR;	/* screen refresh interval in seconds */
 int snaplen = DEFAULT_SNAPLEN;	/* length of saved portion of packet */
 
+bpf_u_int32 localnet, netmask;
+
 void
 main(argc, argv)
 	int argc;
 	char **argv;
 {
-	struct bpf_program *parse();
-	void bpf_dump(), usage(), onterm(), onalarm();
-
-	int op, cnt = -1, fflag = 0, if_fd = -1;
-	struct bpf_program *fcode;
-	char *infile = 0;
+	int op, cnt = -1, fflag = 0;
+	struct bpf_program fcode;
+	char *infile = NULL;
 	char *cmdbuf;
 	extern char *optarg;
 	extern int optind, opterr;
+	char errbuf[PCAP_ERRBUF_SIZE];
+	pcap_t *pcap;
+	void usage(), onterm(), onalarm();
+	void show_callback(u_char *, const struct pcap_pkthdr *,
+		const u_char *);
 
 	program_name = stripdir(argv[0]);
 
@@ -101,25 +107,55 @@
 		}
 
 	/* Find network interface */
-	if (device_name == 0)
-		if ((device_name = getenv("IFF_LISTEN")) == NULL)
-			if ((device_name = lookup_device()) == 0)
-				error("can't find any interfaces");
-
-	/* Attach bpf interface to the network interface */
-	if_fd = bpf_init(device_name, pflag);
+	if (device_name == NULL) {
+		device_name = pcap_lookupdev(errbuf);
+		if (device_name == NULL) {
+			fputs(errbuf, stderr);
+			exit(10);
+		}
+	}
 
-	if (infile) 
+	if (infile != NULL) {
+		pcap = pcap_open_offline(infile, errbuf);
+		localnet = 0;
+		netmask = 0;
+		if (fflag != 0) {
+			fputs("-f and -r options are incompatible", stderr);
+			exit(14);
+		}
+	}else {
+		pcap = pcap_open_live(device_name, snaplen, !pflag, 1000, errbuf);
+	}
+	if (pcap == NULL) {
+		fputs(errbuf, stderr);
+		exit(11);
+	}
+	if (pcap_lookupnet(device_name, &localnet, &netmask, errbuf) < 0) {
+		fputs(errbuf, stderr);
+		exit(12);
+	}
+	
+	if (infile != NULL)
 		cmdbuf = read_infile(infile);
 	else
 		cmdbuf = copy_argv(&argv[optind]);
 
-	fcode = parse(cmdbuf, Oflag);
+	if (pcap_compile(pcap, &fcode, cmdbuf, Oflag, netmask) < 0) {
+		fputs(pcap_geterr(pcap), stderr);
+		exit(13);
+	}
+	init_addrtoname(device_name, fflag);
+
 	if (dflag) {
-		bpf_dump(fcode, dflag);
+		bpf_dump(&fcode, dflag);
 		exit(0);
 	}
 
+	if (pcap_setfilter(pcap, &fcode) < 0) {
+		fputs(pcap_geterr(pcap), stderr);
+		exit(15);
+	}
+
 	initterm();
 	signal(SIGHUP, onterm);
 	signal(SIGINT, onterm);
@@ -128,7 +164,8 @@
 	signal(SIGTSTP, SIG_IGN);
 	signal(SIGALRM, onalarm);
 	traf_init(fflag);
-	bpf_readloop(cnt, if_fd, fcode);
+	if (pcap_loop(pcap, cnt, &show_callback, NULL) < 0)
+		pcap_perror(pcap, argv[0]);
 	onterm();
 }
 
@@ -161,7 +198,7 @@
 {
 	puts(NICECOLOR);
 	COLS = 80;
-	if (initscr() == ERR) exit(1);
+	initscr();
 	if (LINES < 20) {
 		addstr("Must more LINES on term");
 		onterm();
@@ -189,8 +226,6 @@
 void
 usage()
 {
-	extern char version[];
-
 	fprintf(stderr, "trafshow v%s - full screen show network traffic\n", version);
 	fprintf(stderr,
 "Usage: %s [-dfknNOp -c num -i name -r sec -t sec] [-F file | expr]\n\
diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/trafshow/show.c trafshow-2.0/trafshow/show.c
--- trafshow-2.0.orig/trafshow/show.c	Mon Jan 15 17:00:25 1996
+++ trafshow-2.0/trafshow/show.c	Sun Apr 13 17:25:39 1997
@@ -27,7 +27,9 @@
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
+#include <netinet/if_ether.h>
 
+#include <pcap.h>
 #include "addrtoname.h"
 #include "trafshow.h"
 
@@ -56,6 +58,8 @@
 int page_size;
 int l_nflag;
 
+u_char *snapend;
+
 extern void onterm();
 
 traf_init(fflag)
@@ -361,6 +365,20 @@
 
 	return;
 }
+
+
+void show_callback(u_char *dummy, const struct pcap_pkthdr *pkt,
+	const u_char *data)
+{
+	const struct ether_header *p;
+	if (pkt->caplen < sizeof(struct ether_header)) return;
+	p = (struct ether_header *)data;
+	snapend = (u_char *) (data + pkt->caplen);
+	if (ntohs(p->ether_type) != ETHERTYPE_IP) return;
+	processing_ip((struct ip *) (data + sizeof(struct ether_header)),
+	    pkt->len - sizeof(struct ether_header));
+}
+                             
 
 int
 inputchar()
Commit	Line	Data
a5fd0114	1	diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/Makefile trafshow-2.0/Makefile
	2	--- trafshow-2.0.orig/Makefile Tue Jan 16 14:28:26 1996
	3	+++ trafshow-2.0/Makefile Sun Apr 13 17:25:39 1997
	4	@@ -3,17 +3,19 @@
	5	#
	6
	7	# This options intended for BSD/OS V2
	8	-CC = shlicc2
	9	+CC = gcc
	10	+ifndef FLAGS
	11	FLAGS = -O2
	12	+endif
	13	DEFINE =
	14	-LIB = ../lib/libbpft.a -lcurses -ltermcap -ll
	15	+LIB = ../lib/libbpft.a -L../libpcap -lncurses -ltermcap -lpcap
	16
	17	BINDIR = /usr/local/bin
	18	MANDIR = /usr/local/man/man1
	19	MODE = 750
	20	GROUP = wheel
	21
	22	-INCLUDE = -I../include
	23	+INCLUDE = -I../include -I../linux-include -I../libpcap/linux-include -I../libpcap -I../libpcap/bpf -I/usr/include/bsd
	24	CFLAGS = $(FLAGS) $(INCLUDE) $(DEFINE)
	25	DEPFLAGS= $(INCLUDE) $(DEFINE)
	26	ARFLAGS = rc
	27	diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/include/interface.h trafshow-2.0/include/interface.h
	28	--- trafshow-2.0.orig/include/interface.h Fri Jun 9 19:25:48 1995
	29	+++ trafshow-2.0/include/interface.h Sun Apr 13 17:33:18 1997
	30	@@ -20,6 +20,7 @@
	31	*/
	32
	33	#include <machine/endian.h>
	34	+#include <pcap.h>
	35
	36	#ifdef __GNUC__
	37	#define inline __inline
	38	@@ -39,8 +40,8 @@
	39	extern char program_name; / used to generate self-identifying messages */
	40
	41	extern int link_type;
	42	-extern unsigned long netmask;
	43	-extern unsigned long localnet;
	44	+extern bpf_u_int32 netmask;
	45	+extern bpf_u_int32 localnet;
	46	extern int snaplen;
	47	/* global pointers to beginning and end of current packet */
	48	extern unsigned char *packetp;
	49	diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/lib/Makefile trafshow-2.0/lib/Makefile
	50	--- trafshow-2.0.orig/lib/Makefile Wed Jan 10 15:51:15 1996
	51	+++ trafshow-2.0/lib/Makefile Sun Apr 13 17:25:39 1997
	52	@@ -3,21 +3,23 @@
	53	#
	54
	55	LIB = libbpft.a
	56	-SRC = addrtoname.c bpf.c bpf_dump.c bpf_filter.c bpf_image.c etherent.c \
	57	- gencode.c inet.c interfaces.c nametoaddr.c optimize.c util.c \
	58	- version.c tcpgram.y tcplex.l
	59	-OBJ = addrtoname.o bpf.o bpf_dump.o bpf_filter.o bpf_image.o etherent.o \
	60	- gencode.o inet.o interfaces.o nametoaddr.o optimize.o util.o \
	61	- version.o tcpgram.o tcplex.o
	62	+#SRC = addrtoname.c bpf.c bpf_dump.c bpf_filter.c bpf_image.c etherent.c \
	63	+# gencode.c inet.c interfaces.c nametoaddr.c optimize.c util.c \
	64	+# version.c tcpgram.y tcplex.l
65	+#OBJ = addrtoname.o bpf.o bpf_dump.o bpf_filter.o bpf_image.o etherent.o \
66	+# gencode.o inet.o interfaces.o nametoaddr.o optimize.o util.o \
67	+# version.o tcpgram.o tcplex.o
68	+SRC = addrtoname.c bpf_dump.c etherent.c util.c
69	+OBJ = $(SRC:.c=.o)
70
71	-CC = gcc
72	-FLAGS = -g
73	-DEFINE =
74	-
75	-INCLUDE = -I../include
76	-CFLAGS = $(FLAGS) $(INCLUDE) $(DEFINE)
77	-DEPFLAGS= $(INCLUDE) $(DEFINE)
78	-ARFLAGS = rc
79	+#CC = gcc
80	+#FLAGS = -g
81	+#DEFINE =
82	+#
83	+#INCLUDE = -I../include
84	+#CFLAGS = $(FLAGS) $(INCLUDE) $(DEFINE)
85	+#DEPFLAGS= $(INCLUDE) $(DEFINE)
86	+#ARFLAGS = rc
87
88	$(LIB): $(OBJ)
89	rm -f $(LIB)
90	diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/lib/addrtoname.c trafshow-2.0/lib/addrtoname.c
91	--- trafshow-2.0.orig/lib/addrtoname.c Fri Jan 12 12:42:37 1996
92	+++ trafshow-2.0/lib/addrtoname.c Sun Apr 13 17:26:02 1997
93	@@ -468,8 +468,10 @@
94	char *device;
95	int fflag;
96	{
97	+#if 0 /* netmask MUST be initialized */
98	if (netmask == 0) /* if was not initialized */
99	lookup_net(device);
100	+#endif
101
102	if (fflag) {
103	f_localnet = localnet;
104	diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/trafshow/Makefile trafshow-2.0/trafshow/Makefile
105	--- trafshow-2.0.orig/trafshow/Makefile Mon Jan 15 11:44:09 1996
106	+++ trafshow-2.0/trafshow/Makefile Sun Apr 13 17:25:39 1997
107	@@ -5,14 +5,14 @@
108	PROG = trafshow
109	SRC = main.c show.c keyb.c
110	OBJ = $(SRC:.c=.o)
111	-LIB = ../lib/libbpft.a -lcurses -ltermcap -ll
112	-CC = gcc
113	-FLAGS = -g
114	-DEFINE =
115	-
116	-INCLUDE = -I../include
117	-CFLAGS = $(FLAGS) $(INCLUDE) $(DEFINE)
118	-DEPFLAGS= $(INCLUDE) $(DEFINE)
119	+#LIB = ../lib/libbpft.a -lcurses -ltermcap -ll
120	+#CC = gcc
121	+#FLAGS = -g
122	+#DEFINE =
123	+#
124	+#INCLUDE = -I../include
125	+#CFLAGS = $(FLAGS) $(INCLUDE) $(DEFINE)
126	+#DEPFLAGS= $(INCLUDE) $(DEFINE)
127
128	$(PROG): $(OBJ)
129	$(CC) $(OBJ) $(LIB) -o $(PROG)
130	diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/trafshow/main.c trafshow-2.0/trafshow/main.c
131	--- trafshow-2.0.orig/trafshow/main.c Mon Jan 15 17:10:42 1996
132	+++ trafshow-2.0/trafshow/main.c Sun Apr 13 17:37:29 1997
133	@@ -11,6 +11,8 @@
134	* THIS SOFTWARE IS PROVIDED ``AS IS'' WITHOUT ANY WARRANTIES OF ANY KIND.
135	*/
136
137	+char *version = "2.0s";
138	+
139	#include <curses.h>
140	#include <stdlib.h>
141	#include <signal.h>
142	@@ -37,20 +39,24 @@
143	int scr_interval = DEFAULT_SCR; /* screen refresh interval in seconds */
144	int snaplen = DEFAULT_SNAPLEN; /* length of saved portion of packet */
145
146	+bpf_u_int32 localnet, netmask;
147	+
148	void
149	main(argc, argv)
150	int argc;
151	char **argv;
152	{
153	- struct bpf_program *parse();
154	- void bpf_dump(), usage(), onterm(), onalarm();
155	-
156	- int op, cnt = -1, fflag = 0, if_fd = -1;
157	- struct bpf_program *fcode;
158	- char *infile = 0;
159	+ int op, cnt = -1, fflag = 0;
160	+ struct bpf_program fcode;
161	+ char *infile = NULL;
162	char *cmdbuf;
163	extern char *optarg;
164	extern int optind, opterr;
165	+ char errbuf[PCAP_ERRBUF_SIZE];
166	+ pcap_t *pcap;
167	+ void usage(), onterm(), onalarm();
168	+ void show_callback(u_char , const struct pcap_pkthdr ,
169	+ const u_char *);
170
171	program_name = stripdir(argv[0]);
172
173	@@ -101,25 +107,55 @@
174	}
175
176	/* Find network interface */
177	- if (device_name == 0)
178	- if ((device_name = getenv("IFF_LISTEN")) == NULL)
179	- if ((device_name = lookup_device()) == 0)
180	- error("can't find any interfaces");
181	-
182	- /* Attach bpf interface to the network interface */
183	- if_fd = bpf_init(device_name, pflag);
184	+ if (device_name == NULL) {
185	+ device_name = pcap_lookupdev(errbuf);
186	+ if (device_name == NULL) {
187	+ fputs(errbuf, stderr);
188	+ exit(10);
189	+ }
190	+ }
191
192	- if (infile)
193	+ if (infile != NULL) {
194	+ pcap = pcap_open_offline(infile, errbuf);
195	+ localnet = 0;
196	+ netmask = 0;
197	+ if (fflag != 0) {
198	+ fputs("-f and -r options are incompatible", stderr);
199	+ exit(14);
200	+ }
201	+ }else {
202	+ pcap = pcap_open_live(device_name, snaplen, !pflag, 1000, errbuf);
203	+ }
204	+ if (pcap == NULL) {
205	+ fputs(errbuf, stderr);
206	+ exit(11);
207	+ }
208	+ if (pcap_lookupnet(device_name, &localnet, &netmask, errbuf) < 0) {
209	+ fputs(errbuf, stderr);
210	+ exit(12);
211	+ }
212	+
213	+ if (infile != NULL)
214	cmdbuf = read_infile(infile);
215	else
216	cmdbuf = copy_argv(&argv[optind]);
217
218	- fcode = parse(cmdbuf, Oflag);
219	+ if (pcap_compile(pcap, &fcode, cmdbuf, Oflag, netmask) < 0) {
220	+ fputs(pcap_geterr(pcap), stderr);
221	+ exit(13);
222	+ }
223	+ init_addrtoname(device_name, fflag);
224	+
225	if (dflag) {
226	- bpf_dump(fcode, dflag);
227	+ bpf_dump(&fcode, dflag);
228	exit(0);
229	}
230
231	+ if (pcap_setfilter(pcap, &fcode) < 0) {
232	+ fputs(pcap_geterr(pcap), stderr);
233	+ exit(15);
234	+ }
235	+
236	initterm();
237	signal(SIGHUP, onterm);
238	signal(SIGINT, onterm);
239	@@ -128,7 +164,8 @@
240	signal(SIGTSTP, SIG_IGN);
241	signal(SIGALRM, onalarm);
242	traf_init(fflag);
243	- bpf_readloop(cnt, if_fd, fcode);
244	+ if (pcap_loop(pcap, cnt, &show_callback, NULL) < 0)
245	+ pcap_perror(pcap, argv[0]);
246	onterm();
247	}
248
249	@@ -161,7 +198,7 @@
250	{
251	puts(NICECOLOR);
252	COLS = 80;
253	- if (initscr() == ERR) exit(1);
254	+ initscr();
255	if (LINES < 20) {
256	addstr("Must more LINES on term");
257	onterm();
258	@@ -189,8 +226,6 @@
259	void
260	usage()
261	{
262	- extern char version[];
263	-
264	fprintf(stderr, "trafshow v%s - full screen show network traffic\n", version);
265	fprintf(stderr,
266	"Usage: %s [-dfknNOp -c num -i name -r sec -t sec] [-F file \| expr]\n\
267	diff -ru -x trafshow-2.0/libpcap* trafshow-2.0.orig/trafshow/show.c trafshow-2.0/trafshow/show.c
268	--- trafshow-2.0.orig/trafshow/show.c Mon Jan 15 17:00:25 1996
269	+++ trafshow-2.0/trafshow/show.c Sun Apr 13 17:25:39 1997
270	@@ -27,7 +27,9 @@
271	#include <netinet/udp_var.h>
272	#include <netinet/tcp.h>
273	#include <netinet/tcpip.h>
274	+#include <netinet/if_ether.h>
275
276	+#include <pcap.h>
277	#include "addrtoname.h"
278	#include "trafshow.h"
279
280	@@ -56,6 +58,8 @@
281	int page_size;
282	int l_nflag;
283
284	+u_char *snapend;
285	+
286	extern void onterm();
287
288	traf_init(fflag)
289	@@ -361,6 +365,20 @@
290
291	return;
292	}
293	+
294	+
295	+void show_callback(u_char dummy, const struct pcap_pkthdr pkt,
296	+ const u_char *data)
297	+{
298	+ const struct ether_header *p;
299	+ if (pkt->caplen < sizeof(struct ether_header)) return;
300	+ p = (struct ether_header *)data;
301	+ snapend = (u_char *) (data + pkt->caplen);
302	+ if (ntohs(p->ether_type) != ETHERTYPE_IP) return;
303	+ processing_ip((struct ip *) (data + sizeof(struct ether_header)),
304	+ pkt->len - sizeof(struct ether_header));
305	+}
306	+
307
308	int
309	inputchar()