Add ./tarball_archive/mon-2.1.tar.gz

mon/Makefile

@@ -1,7 +1,7 @@
 # $Id: Makefile,v 1.4 2002/08/16 13:55:42 dijkstra Exp $
 
 SUBDIR=	lib mon monmux 
-V=2.0
+V=2.1
 
 .if make(clean)
 SUBDIR+= ports/mon

mon/lib/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2002/07/20 14:28:29 dijkstra Exp $
+# $Id: Makefile,v 1.7 2002/08/29 05:59:34 dijkstra Exp $
 .include "../Makefile.inc"
 
 SRCS=   error.c lex.c xmalloc.c net.c data.c

mon/lib/data.c

@@ -1,4 +1,4 @@
-/* $Id: data.c,v 1.12 2002/07/25 09:51:42 dijkstra Exp $ */
+/* $Id: data.c,v 1.13 2002/08/29 05:59:34 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra
@@ -346,7 +346,7 @@ sunpack(char *buf, struct packedstream *ps)
     while (streamform[type].form[i] != '\0') {
 	switch (streamform[type].form[i]) {
 	case 'c':
-	    c = *((u_int16_t *)in);
+	    bcopy((void *)in, &c, sizeof(u_int16_t));
 	    c = ntohs(c);
 	    bcopy(&c, (void *)out, sizeof(u_int16_t));
 	    in  += sizeof(u_int16_t);
@@ -354,7 +354,7 @@ sunpack(char *buf, struct packedstream *ps)
 	    break;
 
 	case 'l': 
-	    l = *((u_int32_t *)in);
+	    bcopy((void *)in, &l, sizeof(u_int32_t));
 	    l = ntohl(l);
 	    bcopy(&l, (void *)out, sizeof(u_int32_t));
 	    in  += sizeof(u_int32_t);
@@ -362,7 +362,7 @@ sunpack(char *buf, struct packedstream *ps)
 	    break;
 
 	case 'L': 
-	    q = *((u_int64_t *)in);
+	    bcopy((void *)in, &q, sizeof(u_int64_t));
 	    q = ntohq(q);
 	    bcopy(&q, (void *)out, sizeof(u_int64_t));
 	    in  += sizeof(u_int64_t);

mon/lib/error.c

@@ -34,6 +34,7 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 #include <syslog.h>
 
 #include "error.h"

mon/lib/net.c

@@ -98,7 +98,7 @@ lookup(char *name)
 	    snprintf(lookup_hostname, (_POSIX2_LINE_MAX - 1), "%s", chostname);
 	
 	if (*host->h_addr_list) {
-	    lookup_ip = ntohl(*(unsigned long *) *(char **) host->h_addr_list);
+	    lookup_ip = ntohl(*(u_int32_t *) *(char **) host->h_addr_list);
 
 	    snprintf(lookup_address, (_POSIX2_LINE_MAX - 1),"%u.%u.%u.%u", 
 		    (lookup_ip >> 24), (lookup_ip >> 16) & 0xff,

mon/monmux/c_monrrds.sh

@@ -57,7 +57,7 @@ RRA_SETUP=" RRA:AVERAGE:0.5:1:34560
 # --- user configuration ends here
 
 # All interfaces and disks
-INTERFACES="an|awi|bge|bridge|cnw|dc|de|ec|ef|eg|el|enc|ep|ex|faith|fea|fpa|fxp|gif|gre|ie|lc|le|le|lge|lmc|lo|ne|ne|nge|ray|rl|ppp|sf|sis|sk|skc|sl|sm|sppp|ste|stge|strip|ti|tl|tr|tun|tx|txp|vlan|vr|wb|we|wi|wx|xe|xl"
+INTERFACES="an|awi|be|bge|bm|bridge|cnw|dc|de|ec|ef|eg|el|enc|ep|ex|faith|fea|fpa|fxp|gem|gif|gm|gre|hme|ie|kue|lc|le|lge|lmc|lo|ne|ne|nge|ray|rl|ppp|qe|qec|sf|sis|sk|skc|sl|sm|siop|sppp|ste|stge|strip|ti|tl|tr|tun|tx|txp|vlan|vme|vr|wb|we|wi|wx|xe|xl"
 DISKS="sd|cd|ch|rd|raid|ss|uk|vnc|wd"
 
 # addsuffix adds a suffix to each entry of a list (item|item|...)

mon/monmux/monmux.8

@@ -36,6 +36,7 @@
 .Sh SYNOPSIS
 .Nm 
 .Op Fl vd
+.Op Fl f Ar filename
 .Pp
 .Sh DESCRIPTION
 .Xr mon 8
@@ -68,7 +69,7 @@ needs no specific priviledges besides being able to open it's ports and the rrd
 .Lp
 The options:
 .Bl -tag -width Ds
-.It Fl a
+.It Fl v
 Show version information.
 .It Fl d
 Stop 

mon/monmux/share.c

@@ -1,4 +1,4 @@
-/* $Id: share.c,v 1.6 2002/07/11 15:27:33 dijkstra Exp $ */
+/* $Id: share.c,v 1.7 2002/08/29 05:38:39 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra
@@ -159,11 +159,15 @@ check_master()
 void 
 master_resetsem()
 {
+    union semun semarg;
+
+    semarg.val = 0;
+
     check_sem();
     check_master();
 
-    if ((semctl(semid, SEM_WAIT, SETVAL, 0) != 0) ||
-	(semctl(semid, SEM_READ, SETVAL, 0) != 0))
+    if ((semctl(semid, SEM_WAIT, SETVAL, semarg) != 0) ||
+	(semctl(semid, SEM_READ, SETVAL, semarg) != 0))
 	fatal("%s:%d: Internal error: Cannot reset semaphores",
 	      __FILE__, __LINE__);
 }
@@ -172,12 +176,14 @@ void
 master_forbidread()
 {
     int clientsread;
+    union semun semarg;
 
     check_sem();
     check_master();
     
     /* prepare for a new read */
-    if ((clientsread = semctl(semid, SEM_READ, GETVAL, 0)) < 0)
+    semarg.val = 0;
+    if ((clientsread = semctl(semid, SEM_READ, GETVAL, semarg)) < 0)
 	fatal("%s:%d: Internal error: Cannot read semaphore",
 	      __FILE__, __LINE__);
 
@@ -193,9 +199,13 @@ master_forbidread()
 void
 master_permitread()
 {
+    union semun semarg;
+
     shm->seqnr++;
 
-    if (semctl(semid, SEM_WAIT, SETVAL, realclients) != 0)
+    semarg.val = realclients;
+
+    if (semctl(semid, SEM_WAIT, SETVAL, semarg) != 0)
 	fatal("%s:%d: Internal error: Cannot reset semaphores",
 	      __FILE__, __LINE__);
 }
@@ -327,6 +337,8 @@ reap_clients()
 void 
 exitmaster() 
 {
+    union semun semarg;
+
     if (master == 0)
 	return;
 	
@@ -352,7 +364,8 @@ exitmaster()
 
     switch (semstat) {
     case SIPC_KEYED:
-	if (semctl(semid, 0, IPC_RMID, 0) != 0) 
+	semarg.val = 0;
+	if (semctl(semid, 0, IPC_RMID, semarg) != 0) 
 	    warning("%s:%d: Internal error: could not remove semaphore %d",
 		    __FILE__, __LINE__, semid);
 	/* no break */

mon/ports/mon/Makefile

@@ -2,8 +2,8 @@
 
 COMMENT=		"active monitoring tool"
 
-DISTNAME=		mon-2.0
-PKGNAME=		mon-2.0
+DISTNAME=		mon-2.1
+PKGNAME=		mon-2.1
 CATEGORIES=		net sysutils
 NEED_VERSION=		1.502