Import of bpft version 2.0.

The BPF Traffic Collector.

PR:		10679
Submitted by:	Oddbjorn Steffensen <oddbjorn@tricknology.org>

3 files changed, 144 insertions, 0 deletions

diff --git a/net/bpft/files/patch-aa b/net/bpft/files/patch-aa
new file mode 100644
index 000000000000..944bce74e31f
--- /dev/null
+++ b/net/bpft/files/patch-aa
@@ -0,0 +1,80 @@
+*** Makefile.orig	Wed Oct 30 12:38:00 1996
+--- Makefile	Fri Mar 19 23:42:26 1999
+***************
+*** 11,16 ****
+--- 11,17 ----
+  
+  # Target directory for install execution files.
+  PATH_BINDIR=/usr/local/bin
++ PATH_SBINDIR=/usr/local/sbin
+  
+  # Target directory for install man pages.
+  PATH_MANDIR=/usr/local/man/man1
+***************
+*** 18,24 ****
+  # Trailing slash directory, summary traffic log files will be put there.
+  PATH_TOSAVE=/var/log/
+  
+! # Full pathname where locate tarfstat program.
+  PATH_TRAFSTAT=/usr/local/bin/trafstat
+  
+  # Where locate trafstatd log file, if you want log then file must exist.
+--- 19,25 ----
+  # Trailing slash directory, summary traffic log files will be put there.
+  PATH_TOSAVE=/var/log/
+  
+! # Full pathname where locate trafstat program.
+  PATH_TRAFSTAT=/usr/local/bin/trafstat
+  
+  # Where locate trafstatd log file, if you want log then file must exist.
+***************
+*** 56,79 ****
+  	$(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)')
+  	@(cd trafstatd; echo "Build trafstatd in `pwd`"; \
+  	$(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)')
+! 	@(cd traflog; echo "Build tarflog in `pwd`"; \
+  	$(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)')
+  	@(cd trafshow; echo "Build trafshow in `pwd`"; \
+  	$(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)')
+  	@echo Done.
+  
+  install: all
+! 	install -s -o root -g $(GROUP) -m $(MODE) trafd/trafd $(PATH_BINDIR)
+! 	install -c -o root -g $(GROUP) -m $(MODE) trafd/trafstart $(PATH_BINDIR)
+! 	install -c -o root -g $(GROUP) -m $(MODE) trafd/trafstop $(PATH_BINDIR)
+! 	install -c -o root -g $(GROUP) -m $(MODE) trafd/trafsave $(PATH_BINDIR)
+! 	install -c -o root -g $(GROUP) -m $(MODE) trafd/trafdump $(PATH_BINDIR)
+  	install -s -o root -g $(GROUP) -m $(MODE) trafstat/trafstat $(PATH_BINDIR)
+! 	install -s -o root -g $(GROUP) -m $(MODE) trafstatd/trafstatd $(PATH_BINDIR)
+! 	install -s -o root -g $(GROUP) -m $(MODE) traflog/traflog $(PATH_BINDIR)
+  	install -c -o root -g $(GROUP) -m $(MODE) traflog/traflog.format $(PATH_TRAFLOG_FMT)
+  	install -s -o root -g $(GROUP) -m $(MODE) trafshow/trafshow $(PATH_BINDIR)
+! 	install -c -m 644 trafshow/trafshow.1 $(PATH_MANDIR)
+  	@echo Done.
+  
+  clean:
+--- 57,80 ----
+  	$(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)')
+  	@(cd trafstatd; echo "Build trafstatd in `pwd`"; \
+  	$(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)')
+! 	@(cd traflog; echo "Build traflog in `pwd`"; \
+  	$(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)')
+  	@(cd trafshow; echo "Build trafshow in `pwd`"; \
+  	$(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)')
+  	@echo Done.
+  
+  install: all
+! 	install -s -o root -g $(GROUP) -m $(MODE) trafd/trafd       $(PATH_SBINDIR)
+! 	install -c -o root -g $(GROUP) -m $(MODE) trafd/trafstart   $(PATH_BINDIR)
+! 	install -c -o root -g $(GROUP) -m $(MODE) trafd/trafstop    $(PATH_BINDIR)
+! 	install -c -o root -g $(GROUP) -m $(MODE) trafd/trafsave    $(PATH_BINDIR)
+! 	install -c -o root -g $(GROUP) -m $(MODE) trafd/trafdump    $(PATH_BINDIR)
+  	install -s -o root -g $(GROUP) -m $(MODE) trafstat/trafstat $(PATH_BINDIR)
+! 	install -s -o root -g $(GROUP) -m $(MODE) trafstatd/trafstatd $(PATH_SBINDIR)
+! 	install -s -o root -g $(GROUP) -m $(MODE) traflog/traflog   $(PATH_BINDIR)
+  	install -c -o root -g $(GROUP) -m $(MODE) traflog/traflog.format $(PATH_TRAFLOG_FMT)
+  	install -s -o root -g $(GROUP) -m $(MODE) trafshow/trafshow $(PATH_BINDIR)
+! 	install -c -m 644 trafshow/trafshow.1                       $(PATH_MANDIR)
+  	@echo Done.
+  
+  clean:
diff --git a/net/bpft/files/patch-ab b/net/bpft/files/patch-ab
new file mode 100644
index 000000000000..ceba57fa1e19
--- /dev/null
+++ b/net/bpft/files/patch-ab
@@ -0,0 +1,19 @@
+*** trafd/trafstop.orig	Fri Mar 19 21:03:06 1999
+--- trafd/trafstop	Fri Mar 19 21:04:13 1999
+***************
+*** 6,12 ****
+  #
+  # usage: trafstop interfaces...
+  #
+! PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+  WHERE_PID=/var/run/trafd.
+  LOG_FILE=/var/log/traffic.log
+  
+--- 6,12 ----
+  #
+  # usage: trafstop interfaces...
+  #
+! PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+  WHERE_PID=/var/run/trafd.
+  LOG_FILE=/var/log/traffic.log
+  
diff --git a/net/bpft/files/patch-ac b/net/bpft/files/patch-ac
new file mode 100644
index 000000000000..407d0129f48a
--- /dev/null
+++ b/net/bpft/files/patch-ac
@@ -0,0 +1,45 @@
+--- lib/addrtoname.c	Fri Jan 12 17:42:37 1996
++++ lib/addrtoname.c	Thu Jul 25 07:37:56 1996
+@@ -294,8 +294,8 @@
+ #ifdef ETHER_SERVICE
+ 	if (!nflag) {
+-		cp = ETHER_ntohost(ep);
+-		if (cp) {
+-			tp->e_name = cp;
+-			return cp;
++		char buf[128];
++		if (ether_ntohost(buf, ep) == 0) {
++			tp->e_name =strdup(buf);
++			return tp->e_name;
+ 		}
+ 	}
+--- lib/gencode.c	Wed Jan 10 12:27:13 1996
++++ lib/gencode.c	Thu Jul 25 07:43:16 1996
+@@ -841,4 +841,5 @@
+ 	struct block *b, *tmp;
+ 	int port, real_proto;
++	static char wrk[6];
+ 
+ 	switch (q.addr) {
+@@ -854,6 +855,9 @@
+ 	case Q_HOST:
+ 		if (proto == Q_LINK) {
+ 			/* XXX Should lookup hw addr based on link layer */
+-			eaddr = ETHER_hostton(name);
++			if (ether_hostton(name, wrk) == 0)
++				eaddr = wrk;
++			else
++				eaddr = 0;
+ 			if (eaddr == 0)
+ 				error("unknown ether host '%s'", name);
+@@ -896,5 +901,9 @@
+ 
+ 	case Q_GATEWAY:
+-		eaddr = ETHER_hostton(name);
++		/* XXX Should lookup hw addr based on link layer */
++		if (ether_hostton(name, wrk) == 0)
++			eaddr = wrk;
++		else
++			eaddr = 0;
+ 		if (eaddr == 0)
+ 			error("unknown ether host: %s", name);