Add ./tarball_archive/symon-2.60.tar.gz

symon/CHANGELOG

@@ -1,3 +1,11 @@
+23/03/2003 - 2.60
+
+   - sm_io was broken on sparc64
+   - ntohq functions were not detected for big endian machines
+   - c_config.sh broke on nfs mounts and pfsync
+   
+   All: thanks to Henning Brauer
+
 26/02/2003 - 2.59
 
    - mbuf probe (Daniel Hartmeier; depends on 3.2)

symon/Makefile.inc

@@ -1,6 +1,6 @@
 # $Id: Makefile.inc,v 1.15 2003/01/24 13:33:50 dijkstra Exp $
 
-V=2.59
+V=2.60
 
 AR=	ar
 CC=	cc

symon/lib/data.h

@@ -51,11 +51,11 @@
 /* Polynominal to use for CRC generation */
 #define SYMON_CRCPOLY  0x04c11db7
 
+#ifndef ntohq
 #if BYTE_ORDER == BIG_ENDIAN
 #define htonq(n) (n)
 #define ntohq(n) (n)
 #else
-#ifndef ntohq
 static inline u_int64_t
        htonq(u_int64_t v)
 {
@@ -66,8 +66,8 @@ static inline u_int64_t
 {
     return (u_int64_t) ntohl(v) << 32 | ntohl(v >> 32);
 }
-#endif /* ntohq */
 #endif /* BYTE_ORDER */
+#endif /* ntohq */
 
 /* Symon packet version
  * version 1:

symon/ports/symon/Makefile

@@ -1,11 +1,9 @@
 # $OpenBSD: Makefile,v 1.1 2002/10/08 07:56:42 dhartmei Exp $
 
 COMMENT=		"active monitoring tool"
-V=			2.59
+V=			2.60
 DISTNAME=		symon-${V}
-CATEGORIES=		net sysutils
-
-MASTER_SITES=		http://www.xs4all.nl/~wpd/symon/
+CATEGORIES=		sysutils net 
 
 HOMEPAGE=		http://www.xs4all.nl/~wpd/symon/
 MAINTAINER=		Willem Dijkstra <wpd@xs4all.nl>
@@ -16,6 +14,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=		${HOMEPAGE}
+
 SUBPACKAGE?=
 
 # client only package

symon/ports/symon/pkg/DESCR

@@ -4,7 +4,7 @@ then spooled over "the network" to symux for further processing.
 
 The port will yield 4 packages: 
 symon-mon-${V}.tgz : symon daemon and manual
-symon-mux-${V}.tgz : symux daemon, manual and auxilliary scripts
+symon-mux-${V}.tgz : symux daemon, manual and auxiliary scripts
 symon-web-${V}.tgz : web frontend
 symon-${V}.tgz     : all of the above rolled into a single package
 

symon/symon/c_config.sh

@@ -18,7 +18,7 @@ fi
 interfaces=`netstat -ni | sed '1,1d;s/^\([a-z]*[0-9]\).*$/\1/g' | uniq`
 for i in $interfaces; do
 case $i in
-bridge*|enc*|gif*|gre*|lo*|pflog*|ppp*|sl*|tun*|vlan*)
+bridge*|enc*|gif*|gre*|lo*|pflog*|pfsync*|ppp*|sl*|tun*|vlan*)
 	# ignore this interface
 	;;
 *)
@@ -26,7 +26,7 @@ bridge*|enc*|gif*|gre*|lo*|pflog*|ppp*|sl*|tun*|vlan*)
 	;;
 esac
 done
-io=`mount | grep -v ' type mfs ' | sed '1,1d;s/^\/dev\/\([a-z]*[0-9]\).*$/io(\1), /g' | uniq | tr -d \\\n`
+io=`mount | egrep -v ' type mfs | type nfs ' | sed '1,1d;s/^\/dev\/\([a-z]*[0-9]\).*$/io(\1), /g' | uniq | tr -d \\\n`
 host=${1:-127.0.0.1}
 port=${2:-2100}
 cat <<EOF

symon/symon/sm_io.c

@@ -55,7 +55,7 @@ static struct diskstats *io_dkstats = NULL;
 static char **io_dknames = NULL;
 static int io_dks = 0;
 static int io_maxdks = 0;
-static int io_maxstr = 0;
+static size_t io_maxstr = 0;
 
 void 
 gets_io()

symon/symon/symon.c

@@ -93,7 +93,7 @@ huphandler(int s)
 /*
  * Symon is a system measurement utility.
  *
- * The main goals symon hopes to accomplish is:
+ * The main goals symon hopes to accomplish are:
  * - to take fine grained measurements of system parameters
  * - with minimal performance impact
  * - in a secure way.

symon/symux/Makefile

@@ -3,7 +3,7 @@
 
 SRCS=	symux.c readconf.c symuxnet.c share.c
 OBJS+=	${SRCS:R:S/$/.o/g}
-LIBS=  -L../lib -L/usr/local/lib -lrrd -lsymon
+LIBS=  -L../lib -L/usr/local/lib -lsymon -lrrd
 CFLAGS+=-I../lib -I/usr/local/include
 
 all: symux symux.cat8

symon/symux/c_smrrds.sh

@@ -264,6 +264,7 @@ io_*.rrd)
     ;;
 *)
     # Default match
+    echo $i - unknown
     cat <<EOF
 Usage: $0 [oneday] all
        $0 [oneday] cpu0|mem|pf|mbuf|debug|proc|<if>|<io>