From 2c844803e5250ed636556517273a0a343f6db40d Mon Sep 17 00:00:00 2001 From: itojun Date: Fri, 22 Mar 2002 03:48:18 +0000 Subject: upgrade netramet to 4.4 (version is 4.4.20 to prevent version skew) PR 15799 NeTraMet Version History ======================== v4.4 20 Feb 02 In examples/ directory, moved old rules.* examples to non_srl. The srl examples are now in the examples/ directory. SNMP security issues. I've tested NeTraMet's SNMP code using the PROTOS test suite. A test for negative lengths in the ASN.1 parsing code has been added - that was the only change needed. The SNMP routines (in snmplib/) perform a lot of parameter checks, and calls on an ERROR() define. By default ERROR does nothing. If you're tesing an SNMP manager against NeTraMet, you can turn those messages on by adding -DDEBUG to the CFLAGS= line in snmplib/Makefile and rebuilding the snmp library. Change 'interface number' attributes to use 16-bit integers instead of 8-bit. This can be useful when using NetFlowMet. v4.4b11 25 Nov 01 Implement -C option for nm_rc, exactly as in NeMaC. This allows you to use nm_rc to test rulesets against trace files being read by crl_ntm or dd_ntm. Sample commands to do this are: ./crl_ntm -T5 -m1234 -Strace_file -wW~com ./nm_rc -C -m1234 -rpeers.rules localhost W~com Note: you need CoralReef version 3.5 to build crl_ntm! Speed improvements in flowhash: - move code which doesn't need to be executed on every call outside blocks in match() - implement list of running rulesets, instead of doing serial searches of ri[] table - use 32-bit hash values for flow and stream hash tables, use table size specified by user (rather than trying to pick a prime above it - that doesn't help, since we use a set of distinct primes for hashing) Use long long integers (8 bytes) for counter64 if the host supports them. Newer Pentiums do, this provides a useful speedup. Change 'shutdown' request character. It was a single ESC, but it's too easy to hit a key which sends an escape sequence! Now you have to type ESC ESC Return to shut down the meter. Fix little problems which gave warning messages when building NeTraMet on an alpha running Digital Unix. The configure script wasn't recognising the OS correctly; this didn't cause problems because none of the programs have defines testing this any more. MinPDUs gave compilation errors on alpha, fixed by adding c64geint() define. Linux kernel reset promiscuous mode when forking a NeTraMet daemon. Changed meter_ux.c to fork first, then open the interfaces. NeTraMet, NetFlowMet, LfapMet, crl_ntm, dd_ntm (i.e. all the meters) write error messages and summary information to a log file using log_msg(), in the same way as NeMaC. The name of the log file is meter.log, it will be written in the directory where the meter starts running. v4.4b10 23 May 01 LfapMet: RTFM meter for LFAP, code contributed by Remco Poortinga, Added files in src/meter - README_LfapMet Notes about LfapMet - lfapmet.h LfapMet globals - lfapmet.c LfapMet support routines Added two new MIB variables to reader row, MinPDUs (default 0) and TimeMark. A flow must have at least MinPDUs either to or from before it will be read by a meter reader. TimeMark is needed to associate an SNMP getnext request with a particular reader. MinPDUs can be set using the -M option. nifty default is -M20, NeMaC default is -M0 Improved save.sav so that it only saves the files we really need in the NeTraMet distribution. v4.4b9 11 Apr 01 Fixed bug in NeMaC include statement. getarg() no longer allows semicolon in an argument. Fixed srl compiler bug; optimise 3 wasn't recognising the end of AND expressions properly. NeMaC could fail to open a flow data file (e.g. because it already existed with no write access); it now reports this and doesn't try to run that meter/ruleset. NeTraMet Coral interface improved to handle two Dag cards properly. Reads blocks of cells from each then merges them by timestamp. NeTraMet uses -Siii to specify a Coral source (instead of -C'source iii' *****). --- security/netramet/Makefile | 15 ++++++------ security/netramet/PLIST | 60 +++++++++++++++++++++++----------------------- security/netramet/distinfo | 6 ++--- 3 files changed, 40 insertions(+), 41 deletions(-) (limited to 'security/netramet') diff --git a/security/netramet/Makefile b/security/netramet/Makefile index bd0d336ebc7..a110ef1a2c0 100644 --- a/security/netramet/Makefile +++ b/security/netramet/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.2 2001/05/02 10:14:02 zuntum Exp $ +# $NetBSD: Makefile,v 1.3 2002/03/22 03:48:18 itojun Exp $ # -DISTNAME= NeTraMet44b8 -PKGNAME= netramet-4.4.8 +DISTNAME= NeTraMet44 +PKGNAME= netramet-4.4.20 CATEGORIES= security net -MASTER_SITES= http://foobar.cit.buffalo.edu/nms/NeTraMet/beta-versions/ +MASTER_SITES= http://foobar.cit.buffalo.edu/nms/NeTraMet/ MAINTAINER= burgess@neonramp.com -HOMEPAGE= http://www.auckland.ac.nz/net/Accounting/ COMMENT= NEtwork TRaffic METer GNU_CONFIGURE= YES @@ -15,9 +14,9 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+=--without-x post-patch: - for i in `${FIND} ${WRKSRC} -name Makefile.in`; do \ - ${SED} "s,CFLAGS=,CFLAGS+=,g" $$i > $$i.done; \ - ${MV} $$i.done $$i; \ + for i in `${FIND} ${WRKSRC} -name Makefile.in`; do \ + ${SED} "s,CFLAGS=,CFLAGS+=,g" $$i > $$i.done; \ + ${MV} $$i.done $$i; \ done .include "../../mk/bsd.pkg.mk" diff --git a/security/netramet/PLIST b/security/netramet/PLIST index 79c9557cabd..61e35bee9cd 100644 --- a/security/netramet/PLIST +++ b/security/netramet/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:02 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/22 03:48:18 itojun Exp $ +bin/LfapMet bin/NeMaC bin/NeTraMet bin/NetFlowMet @@ -9,33 +10,33 @@ bin/nm_rc bin/nm_rr bin/nm_st bin/srl -share/NeTraMet/examples/rules/rules.broadcast -share/NeTraMet/examples/rules/rules.default -share/NeTraMet/examples/rules/rules.gateway -share/NeTraMet/examples/rules/rules.ipport -share/NeTraMet/examples/rules/rules.lan -share/NeTraMet/examples/rules/rules.manage -share/NeTraMet/examples/rules/rules.nifty -share/NeTraMet/examples/rules/rules.other -share/NeTraMet/examples/rules/rules.rc.ip -share/NeTraMet/examples/rules/rules.rc.ip.new -share/NeTraMet/examples/rules/rules.rc.ipx -share/NeTraMet/examples/rules/rules.rc.ports -share/NeTraMet/examples/rules/rules.rc.ports.new -share/NeTraMet/examples/rules/rules.sample -share/NeTraMet/examples/rules/rules.two-adj-routers -share/NeTraMet/examples/rules/rules.two-ip-groups -share/NeTraMet/examples/rules/rules.x_ip -share/NeTraMet/examples/srl/2ip8.srl -share/NeTraMet/examples/srl/broadcast.srl -share/NeTraMet/examples/srl/cs2.srl -share/NeTraMet/examples/srl/icmp.srl -share/NeTraMet/examples/srl/k1.srl -share/NeTraMet/examples/srl/k8.srl -share/NeTraMet/examples/srl/n-ports.srl -share/NeTraMet/examples/srl/nifty.srl -share/NeTraMet/examples/srl/other.srl -share/NeTraMet/examples/srl/pr+bc.srl +share/NeTraMet/examples/2ip8.srl +share/NeTraMet/examples/broadcast.srl +share/NeTraMet/examples/cs2.srl +share/NeTraMet/examples/icmp.srl +share/NeTraMet/examples/k1.srl +share/NeTraMet/examples/k8.srl +share/NeTraMet/examples/n-ports.srl +share/NeTraMet/examples/nifty.srl +share/NeTraMet/examples/non-srl/rules.broadcast +share/NeTraMet/examples/non-srl/rules.default +share/NeTraMet/examples/non-srl/rules.gateway +share/NeTraMet/examples/non-srl/rules.ipport +share/NeTraMet/examples/non-srl/rules.lan +share/NeTraMet/examples/non-srl/rules.manage +share/NeTraMet/examples/non-srl/rules.nifty +share/NeTraMet/examples/non-srl/rules.other +share/NeTraMet/examples/non-srl/rules.rc.ip +share/NeTraMet/examples/non-srl/rules.rc.ip.new +share/NeTraMet/examples/non-srl/rules.rc.ipx +share/NeTraMet/examples/non-srl/rules.rc.ports +share/NeTraMet/examples/non-srl/rules.rc.ports.new +share/NeTraMet/examples/non-srl/rules.sample +share/NeTraMet/examples/non-srl/rules.two-adj-routers +share/NeTraMet/examples/non-srl/rules.two-ip-groups +share/NeTraMet/examples/non-srl/rules.x_ip +share/NeTraMet/examples/other.srl +share/NeTraMet/examples/pr+bc.srl share/NeTraMet/mibs/meter-mib-31.txt share/NeTraMet/mibs/meter-mib-32.txt share/NeTraMet/mibs/mib-1.txt @@ -44,7 +45,6 @@ share/NeTraMet/mibs/mib.auckland share/NeTraMet/mibs/mib.txt share/NeTraMet/mibs/rtm-text.txt @dirrm share/NeTraMet/mibs -@dirrm share/NeTraMet/examples/srl -@dirrm share/NeTraMet/examples/rules +@dirrm share/NeTraMet/examples/non-srl @dirrm share/NeTraMet/examples @dirrm share/NeTraMet diff --git a/security/netramet/distinfo b/security/netramet/distinfo index 23cfc6565b8..874c1a5948c 100644 --- a/security/netramet/distinfo +++ b/security/netramet/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/04/27 11:54:14 zuntum Exp $ +$NetBSD: distinfo,v 1.2 2002/03/22 03:48:18 itojun Exp $ -SHA1 (NeTraMet44b8.tar.gz) = 56df62610285730379876ff6f823872053df70df -Size (NeTraMet44b8.tar.gz) = 828077 bytes +SHA1 (NeTraMet44.tar.gz) = 7848d6aa81b29966127fc78afcd9375c60441a91 +Size (NeTraMet44.tar.gz) = 634714 bytes -- cgit v1.2.3