benson-commit Mailing List for Benson Distributed Monitoring System (Page 4)

Brought to you by: btribit, rfife

benson-commit — Benson Commit Mailing List

You can subscribe to this list here.

2001	_Jan	_Feb	_Mar	_Apr	_May (1)	_Jun (27)	_Jul (24)	_Aug (64)	_Sep (15)	_Oct (72)	_Nov (28)	_Dec (44)
2002	_Jan (72)	_Feb (58)	_Mar (33)	_Apr (3)	_May (5)	_Jun (4)	_Jul	_Aug	_Sep	_Oct (24)	_Nov (29)	_Dec (12)
2003	_Jan (37)	_Feb (44)	_Mar (13)	_Apr (23)	_May (9)	_Jun (3)	_Jul	_Aug (7)	_Sep (33)	_Oct (30)	_Nov (31)	_Dec (11)
2004	_Jan (4)	_Feb (35)	_Mar (14)	_Apr	_May (2)	_Jun	_Jul	_Aug (5)	_Sep	_Oct	_Nov	_Dec
2005	_Jan	_Feb (2)	_Mar (2)	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 5 6 .. 33 > >> (Page 4 of 33)

[Benson-commit] CVS: benson3/scripts/cgi Makefile.in,1.7,1.8

From: Bob T. <bt...@us...> - 2003-11-30 00:42:18

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv3850

Modified Files:
	Makefile.in 
Log Message:
Added the install line for alertview.cgi

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile.in	26 Nov 2003 22:58:12 -0000	1.7
--- Makefile.in	30 Nov 2003 00:42:15 -0000	1.8
***************
*** 40,43 ****
--- 40,44 ----
  install: $(TARGETS)
  	$(top_srcdir)/mkinstalldirs $(bindir)
+ 	$(INSTALL) -m 0755 alertview.cgi $(bindir)
  	$(INSTALL) -m 0755 alertlist.cgi $(bindir)
  	$(INSTALL) -m 0755 suppress.cgi $(bindir)

[Benson-commit] CVS: benson3/src/network Makefile.in,1.13,1.14

From: Bob T. <bt...@us...> - 2003-11-29 07:19:07

Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv29315/src/network

Modified Files:
	Makefile.in 
Log Message:
Added some stuff

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Makefile.in	26 Nov 2003 00:14:20 -0000	1.13
--- Makefile.in	29 Nov 2003 07:19:04 -0000	1.14
***************
*** 26,30 ****
  $(LIBNETWORK): ../../config.h
  
! libnetclient.a: v31_network_client.o v32_network_client.o
  	$(AR) rv $@ v31_network_client.o v32_network_client.o network_utils.o
  	$(RANLIB) $@
--- 26,30 ----
  $(LIBNETWORK): ../../config.h
  
! libnetclient.a: v31_network_client.o v32_network_client.o network_utils.o
  	$(AR) rv $@ v31_network_client.o v32_network_client.o network_utils.o
  	$(RANLIB) $@

[Benson-commit] CVS: benson3/src Makefile.in,1.47,1.48 stack.h,1.2,1.3

From: Bob T. <bt...@us...> - 2003-11-29 07:19:07

Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29315/src

Modified Files:
	Makefile.in stack.h 
Log Message:
Added some stuff

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** Makefile.in	8 Nov 2003 20:43:19 -0000	1.47
--- Makefile.in	29 Nov 2003 07:19:04 -0000	1.48
***************
*** 80,84 ****
  
  
! install: install-lib install-perl install-bin install-sbin
  
  install-perl: $(PERL_MODULES)
--- 80,87 ----
  
  
! install: install-lib install-network install-perl install-bin install-sbin
! 
! install-network: $(LIBNETWORK)
! 	(cd network && $(MAKE) install)
  
  install-perl: $(PERL_MODULES)

Index: stack.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/stack.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** stack.h	8 Nov 2003 20:43:19 -0000	1.2
--- stack.h	29 Nov 2003 07:19:04 -0000	1.3
***************
*** 16,17 ****
--- 16,19 ----
  int stack_push(stack_ctx *current_ctx, void *item);
  void *stack_pop(stack_ctx *current_ctx);
+ int stack_destroy(stack_ctx *current_ctx);
+

[Benson-commit] CVS: benson3/src/tests Makefile.in,1.11,1.12 btraptest.at,1.1,1.2 btraptest.c,1.4,1.5 stacktest.c,1.1,1.2

From: Bob T. <bt...@us...> - 2003-11-29 07:15:21

Update of /cvsroot/benson/benson3/src/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv28898

Modified Files:
	Makefile.in btraptest.at btraptest.c stacktest.c 
Log Message:
Updating the test suite software

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/tests/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Makefile.in	8 Nov 2003 20:43:20 -0000	1.11
--- Makefile.in	29 Nov 2003 07:15:13 -0000	1.12
***************
*** 1,2 ****
--- 1,3 ----
+ prefix=@prefix@
  sysconfdir=@sysconfdir@
  srcdir=@srcdir@
***************
*** 7,35 ****
  CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/include @CFLAGS@ @PERL_CFLAGS@
  CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=@LIBS@
  AR=@arpath@
  RANLIB=@RANLIB@
  INSTALL=@INSTALL@
! LDFLAGS=-L. @LDFLAGS@
  PERL_LDFLAGS=@PERL_LDFLAGS@
! TESTSUITE=./testsuite
! AUTOTEST=./autom4te --language=autotest
  
! TEST_TARGETS=stacktest
  
  .c.o:
  	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
  
! all: $(TEST_TARGETS)
  
! stacktest: stacktest.o
! 	$(CC) $(CFLAGS) $(CPPFLAGS) -static -o stacktest stacktest.o -L$(top_srcdir)/src -lbenson 
! #-Wl,--rpath -Wl,$(top_srcdir)/src
  
! check: atconfig $(TESTSUITE)
  	$(SHELL) $(TESTSUITE)
  
  clean:
  	test -z stacktest || rm -f stacktest
  	rm -f *.o *.a core
  
--- 8,48 ----
  CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/include @CFLAGS@ @PERL_CFLAGS@
  CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=-lbenson -lnetclient
  AR=@arpath@
  RANLIB=@RANLIB@
  INSTALL=@INSTALL@
! LD_SEARCH_FLAG=@LD_SEARCH_FLAG@
! LDFLAGS=-L$(top_srcdir)/src -L$(top_srcdir)/src/network -Wl,$(LD_SEARCH_FLAG) -Wl,$(prefix)/lib
  PERL_LDFLAGS=@PERL_LDFLAGS@
! TESTSUITE=testsuite
! AUTOTEST=autom4te --language=autotest
  
! TESTS_OBJECTS=stacktest.o btraptest.o
! TARGETS=stacktest btraptest
! 
! 
! all: $(TESTS_OBJECTS) $(TARGETS) testsuite
  
  .c.o:
  	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
  
! testsuite: testsuite.at
! 	$(AUTOTEST) testsuite.at > testsuite
! 
! $(TEST_OBJECTS): ../../config.h
! 
! stacktest: ../libbenson.so stacktest.o
! 	$(CC) -o stacktest stacktest.o $(LDFLAGS) $(LIBS)
  
! btraptest: ../libbenson.so btraptest.o
! 	$(CC) -o btraptest btraptest.o $(LDFLAGS) $(LIBS)
  
! check: atconfig $(prefix)/lib/libbenson.so $(prefix)/lib/libnetclient.so testsuite
  	$(SHELL) $(TESTSUITE)
  
  clean:
+ 	test -z btraptest || rm -f btraptest
  	test -z stacktest || rm -f stacktest
+ 	test -z testsuite || rm -f testsuite
  	rm -f *.o *.a core
  

Index: btraptest.at
===================================================================
RCS file: /cvsroot/benson/benson3/src/tests/btraptest.at,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** btraptest.at	28 Nov 2003 05:24:01 -0000	1.1
--- btraptest.at	29 Nov 2003 07:15:13 -0000	1.2
***************
*** 3,17 ****
  AT_BANNER([Benson Trap Unit Testing])
  
! AT_SETUP([stack creation])
! AT_CHECK([stacktest -c], [0], [2/2], [ignore])
  AT_CLEANUP
! AT_SETUP([stack destruction])
! AT_CHECK([stacktest -d], [0], [5/5], [ignore])
  AT_CLEANUP
! AT_SETUP([stack overflow])
! AT_CHECK([stacktest -o], [0], [6/6], [ignore])
! AT_CLEANUP
! AT_SETUP([stack underflow])
! AT_CHECK([stacktest -u], [0], [9/9], [ignore])
  AT_CLEANUP
  
--- 3,14 ----
  AT_BANNER([Benson Trap Unit Testing])
  
! AT_SETUP([Test sending benson trap])
! AT_CHECK([btraptest -i], [0], [1/1], [ignore])
  AT_CLEANUP
! AT_SETUP([Test benson trap failure])
! AT_CHECK([btraptest -f], [0], [1/1], [ignore])
  AT_CLEANUP
! AT_SETUP([Test sending benson traps of various severity])
! AT_CHECK([btraptest -s], [0], [5/5], [ignore])
  AT_CLEANUP
  

Index: btraptest.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/tests/btraptest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** btraptest.c	26 Feb 2003 18:25:07 -0000	1.4
--- btraptest.c	29 Nov 2003 07:15:13 -0000	1.5
***************
*** 1,86 ****
  #include <benson/benson.h>
  
! int main(void) {
  	short rc = 0;
  	int pid = 0;
- 	int sts3 = 0;
  	char message[128];
  
! 	mtrace();
  
  	pid = getpid();
- 
- 	printf("1) Initial Send Trap Test (test success)\n");
- 	snprintf(message, 126, "%s %i", "STS Test 1\0", pid);
- 	printf("  Executing bn_send_trap(\"localhost\", 9021, \"localhost\",\"warning\",\"btraptest\",\"%s\")\n", message);
- 	rc = 0;
- 	rc = bn_send_trap("localhost", 9021, "localhost", "warning", "testing", message);
- 
- 	printf("  rc = %i\n", rc);
- 	if(rc == 0) {
- 		printf("STS 1: PASS\n\n");
- 	} else {
- 		printf("STS 1: FAIL\n\n");
- 		printf("This needs to be fixed first, make sure benson is running.\n");
- //		exit(EXIT_FAILURE);
- 	}	
- 
- 	printf("2) Initial Send Trap Test (test failure)\n");
  	snprintf(message, 128, "%s %i", "STS Test 2", pid);
  
! 	printf("  Executing bn_send_trap(\"localhost\", 9020, \"localhost\",\"warning\",\"btraptest\",\"%s\")\n", message);
! 	rc = 0;
! 	rc = bn_send_trap("localhost", 9020, "localhost", "warning", "testing", message);
! 
! 	printf("  rc = %i\n", rc);
! 	if(rc != 0) {
! 		printf("STS 2: PASS\n\n");
! 	} else {
! 		printf("STS 2: FAIL\n\n");
! 	}	
! 
! 	
! 	printf("3) Send Trap Severity Test\n");
! 	snprintf(message, 128, "%s %i", "STS Test 3", pid);
! 
! 	printf("  Executing bn_send_trap(\"localhost\", 9021, \"localhost\",\"informational\",\"btraptest\",\"%s\")\n", message);
! 	rc = 0;
! 	rc = bn_send_trap("localhost", 9021, "localhost", "informational", "btraptest", message);
! 	if(rc == 0) {
! 		sts3++;
! 	}
! 	
! 	printf("  Executing bn_send_trap(\"localhost\", 9021, \"localhost\",\"warning\",\"btraptest\",\"%s\")\n", message);
! 	rc = 0;
! 	rc = bn_send_trap("localhost", 9021, "localhost", "warning", "btraptest", message);
! 	if(rc == 0) {
! 		sts3++;
! 	}
! 	
! 	printf("  Executing bn_send_trap(\"localhost\", 9021, \"localhost\",\"serious\",\"btraptest\",\"%s\")\n", message);
! 	rc = 0;
! 	rc = bn_send_trap("localhost", 9021, "localhost", "serious", "btraptest", message);
! 	if(rc == 0) {
! 		sts3++;
  	}
  
! 	printf("  Executing bn_send_trap(\"localhost\", 9021, \"localhost\",\"fatal\",\"btraptest\",\"%s\")\n", message);
! 	rc = 0;
! 	rc = bn_send_trap("localhost", 9021, "localhost", "fatal", "btraptest", message);
! 	if(rc == 0) {
! 		sts3++;
! 	}
! 
! 	printf("  Executing bn_send_trap(\"localhost\", 9021, \"localhost\",\"emergency\",\"btraptest\",\"%s\")\n", message);
! 	rc = 0;
! 	rc = bn_send_trap("localhost", 9021, "localhost", "emergency", "btraptest", message);
! 	if(rc == 0) {
! 		sts3++;
! 	}
! 
! 	if(sts3 == 5) {
! 		printf("STS 3 (5/5): PASS\n\n");
! 	} else {
! 		printf("STS 3 (%i/5): FAIL\n\n", sts3);
! 	}
  }
--- 1,93 ----
+ #include <stdio.h>
+ #include <stdlib.h>
  #include <benson/benson.h>
+ #include "network/network.h"
  
! typedef struct test_context {
! 	int last_test;
! 	int rc[20];
! } test_ctx;
! 
! void test_succeed(test_ctx *tests)
! {
! 	tests->rc[tests->last_test++] = 1;
! }
! 
! int test_status(test_ctx *tests)
! {
! 	int ctr;
! 	int success = 0;
! 	int total_tests = tests->last_test;
! 	for(ctr=0;ctr<=total_tests;ctr++) {
! 		if(tests->rc[ctr] == 1) {
! 			success++;
! 		}
! 	}
! 
! 	printf("%i/%i", success, total_tests);
! 
! 	if(total_tests == success) {
! 		return 0;
! 	}
! 	return 1;
! }
! 
! int main(int argc, char *argv[]) {
! 	test_ctx tests;
! 	int c = 0;
  	short rc = 0;
  	int pid = 0;
  	char message[128];
  
! 	tests.last_test = 0;
  
  	pid = getpid();
  	snprintf(message, 128, "%s %i", "STS Test 2", pid);
  
! 	while((c = getopt(argc, argv, "ifs")) != -1) {
! 		switch(c)
! 		{
! 		case 'i':
! 			rc = 0;
! 			if((rc = bn_send_trap("localhost", 9021, "localhost", "warning", "testing", message)) == 0) {
! 				test_succeed(&tests);
! 			} 
! 			exit(test_status(&tests));
! 			break;
! 		case 'f':
! 			rc = 0;
! 			if((rc = bn_send_trap("localhost", 9020, "localhost", "warning", "testing", message)) != 0) {
! 				test_succeed(&tests);
! 			} 
! 			exit(test_status(&tests));
! 			break;
! 		case 's':
! 			rc = 0;
! 			if((rc = bn_send_trap("localhost", 9021, "localhost", "informational", "btraptest", message)) == 0) {
! 				test_succeed(&tests);
! 			}
! 			rc = 0;
! 			if((rc = bn_send_trap("localhost", 9021, "localhost", "warning", "btraptest", message)) == 0) {
! 				test_succeed(&tests);
! 			}
! 			rc = 0;
! 			if((rc = bn_send_trap("localhost", 9021, "localhost", "serious", "btraptest", message)) == 0) {
! 				test_succeed(&tests);
! 			}
! 			rc = 0;
! 			if((rc = bn_send_trap("localhost", 9021, "localhost", "fatal", "btraptest", message)) == 0) {
! 				test_succeed(&tests);
! 			}
! 			rc = 0;
! 			if((rc = bn_send_trap("localhost", 9021, "localhost", "emergency", "btraptest", message)) == 0) {
! 				test_succeed(&tests);
! 			}
! 			exit(test_status(&tests));
! 			break;
! 		default:
! 			printf("usage statement\n");
! 		}
  	}
  
! 	return 0;
  }

Index: stacktest.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/tests/stacktest.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** stacktest.c	28 Nov 2003 23:18:36 -0000	1.1
--- stacktest.c	29 Nov 2003 07:15:13 -0000	1.2
***************
*** 1,3 ****
--- 1,5 ----
  #include <stdio.h>
+ #include <stdlib.h>
+ #include <getopt.h>
  #include "stack.h"
  
***************
*** 7,16 ****
  } test_ctx;
  
! test_succeed(test_ctx *tests)
  {
  	tests->rc[tests->last_test++] = 1;
  }
  
! test_status(test_ctx *tests)
  {
  	int ctr;
--- 9,18 ----
  } test_ctx;
  
! void test_succeed(test_ctx *tests)
  {
  	tests->rc[tests->last_test++] = 1;
  }
  
! int test_status(test_ctx *tests)
  {
  	int ctr;
***************
*** 36,40 ****
  	test_ctx tests;
  	int rc = 0;
- 	int ctr = 0;
  	int c = 0;
  
--- 38,41 ----

[Benson-commit] CVS: benson3/src/tests stacktest.c,NONE,1.1

From: Bob T. <bt...@us...> - 2003-11-28 23:18:42

Update of /cvsroot/benson/benson3/src/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv22733

Added Files:
	stacktest.c 
Log Message:
Added the stacktest.c dangnabbit

--- NEW FILE: stacktest.c ---
#include <stdio.h>
#include "stack.h"

typedef struct test_context {
	int last_test;
	int rc[20];
} test_ctx;

test_succeed(test_ctx *tests)
{
	tests->rc[tests->last_test++] = 1;
}

test_status(test_ctx *tests)
{
	int ctr;
	int success = 0;
	int total_tests = tests->last_test;
	for(ctr=0;ctr<=total_tests;ctr++) {
		if(tests->rc[ctr] == 1) {
			success++;
		}
	}

	printf("%i/%i", success, total_tests);

	if(total_tests == success) {
		return 0;
	}
	return 1;
}

int main (int argc, char *argv[])
{
	stack_ctx *this;
	test_ctx tests;
	int rc = 0;
	int ctr = 0;
	int c = 0;

	tests.last_test = 0;

	while((c = getopt(argc, argv, "cdou")) != -1) {
		switch(c)
		{
		case 'c':
			if((this = stack_create(50)) != NULL) {
				test_succeed(&tests);
			}
			if((rc = stack_destroy(this)) == 0) {
				test_succeed(&tests);
			}
			exit(test_status(&tests));
			break;
		case 'd':
			if((this = stack_create(50)) != NULL) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing1") == 0) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing2") == 0) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing3") == 0) {
				test_succeed(&tests);
			}
			if((rc = stack_destroy(this)) == 0) {
				test_succeed(&tests);
			}
			exit(test_status(&tests));
			break;
		case 'o':
			if((this = stack_create(3)) != NULL) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing1") == 0) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing2") == 0) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing3") == 0) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing4") == -1) {
				test_succeed(&tests);
			}
			if((rc = stack_destroy(this)) == 0) {
				test_succeed(&tests);
			}
			exit(test_status(&tests));
			break;
		case 'u':
			if((this = stack_create(3)) != NULL) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing1") == 0) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing2") == 0) {
				test_succeed(&tests);
			}
			if(stack_push(this, "testing3") == 0) {
				test_succeed(&tests);
			}
			if(stack_pop(this) != NULL) {
				test_succeed(&tests);
			}
			if(stack_pop(this) != NULL) {
				test_succeed(&tests);
			}
			if(stack_pop(this) != NULL) {
				test_succeed(&tests);
			}
			if(stack_pop(this) == NULL) {
				test_succeed(&tests);
			}
			if((rc = stack_destroy(this)) == 0) {
				test_succeed(&tests);
			}
			exit(test_status(&tests));
			break;
		}
	}

	return 1;
}

[Benson-commit] CVS: benson3/src/tests btraptest.at,NONE,1.1 stacktest.at,NONE,1.1 testsuite.at,NONE,1.1

From: Bob T. <bt...@us...> - 2003-11-28 05:24:04

Update of /cvsroot/benson/benson3/src/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv29448

Added Files:
	btraptest.at stacktest.at testsuite.at 
Log Message:
Added the testsuite packages

--- NEW FILE: btraptest.at ---
# Process with autom4te to create an -*- Autotest -*- test suite.

AT_BANNER([Benson Trap Unit Testing])

AT_SETUP([stack creation])
AT_CHECK([stacktest -c], [0], [2/2], [ignore])
AT_CLEANUP
AT_SETUP([stack destruction])
AT_CHECK([stacktest -d], [0], [5/5], [ignore])
AT_CLEANUP
AT_SETUP([stack overflow])
AT_CHECK([stacktest -o], [0], [6/6], [ignore])
AT_CLEANUP
AT_SETUP([stack underflow])
AT_CHECK([stacktest -u], [0], [9/9], [ignore])
AT_CLEANUP


--- NEW FILE: stacktest.at ---
# Process with autom4te to create an -*- Autotest -*- test suite.


AT_BANNER([Stack API unit testing])

AT_SETUP([stack creation])
AT_CHECK([stacktest -c], [0], [2/2], [ignore])
AT_CLEANUP
AT_SETUP([stack destruction])
AT_CHECK([stacktest -d], [0], [5/5], [ignore])
AT_CLEANUP
AT_SETUP([stack overflow])
AT_CHECK([stacktest -o], [0], [6/6], [ignore])
AT_CLEANUP
AT_SETUP([stack underflow])
AT_CHECK([stacktest -u], [0], [9/9], [ignore])
AT_CLEANUP


--- NEW FILE: testsuite.at ---
# Process with autom4te to create an -*- Autotest -*- test suite.

m4_define([AT_PACKAGE_STRING],    [Benson Unit Testing])
m4_define([AT_PACKAGE_BUGREPORT], [bt...@ne...])

AT_INIT

m4_include([stacktest.at])

m4_include([btraptest.at])

[Benson-commit] CVS: benson3/scripts/cgi alertview.cgi.tmpl,NONE,1.1

From: Bob T. <bt...@us...> - 2003-11-26 23:01:06

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv22120

Added Files:
	alertview.cgi.tmpl 
Log Message:
Now I have added the alertview...

--- NEW FILE: alertview.cgi.tmpl ---
#!/usr/local/bin/perl -I/tmp/benson3/lib/perl/

use CGI;
use Benson;
use POSIX;
use strict;

my %severity;

$severity{"informational"} = { color => "#0000AA", weight => "1"};
$severity{"warning"} = { color => "#AAAA00", weight => "2"};
$severity{"serious"} = { color => "#DDAA00", weight => "3"};
$severity{"fatal"} = { color => "#AA0000", weight => "4"};
$severity{"emergency"} = { color => "#FF00AA", weight => "5"};

my $queue = new Benson;
my $query = new CGI;

my $date_and_time = "null";

my $sort_field = $query->param("sort_field") || "severity";
my $sort_type = $query->param("sort_type") || "ascend";

my $alerts_ref = $queue->sorted_href_alert_list();
my %alertlist = %{$alerts_ref};

sub by_field {
	my ($a_agent, $a_severity, $a_subsystem, $a_message) = split /\:/, $a;
	my ($b_agent, $b_severity, $b_subsystem, $b_message) = split /\:/, $b;
	if($sort_field eq "severity") {
		 $severity{$a_severity}->{weight} <=> $severity{$b_severity}->{weight};
	} elsif($sort_field eq "agent") {
		 $a_agent cmp $b_agent;
	} elsif($sort_field eq "subsystem") {
		 $a_subsystem cmp $b_subsystem;
	} elsif($sort_field eq "message") {
		 $a_message cmp $b_message;
	}
}

my @sorted_rows;
if($sort_type eq "ascend") {
	@sorted_rows = reverse sort by_field keys %alertlist;
} elsif ($sort_type eq "descend") {
	@sorted_rows = sort by_field keys %alertlist;
}

my $severity_img_field = qq{<img border="0" src="/images/not-sorted.gif" usemap="#severity-sorted">};
my $agent_img_field = qq{<img border="0" src="/images/not-sorted.gif" usemap="#agent-sorted">};
my $subsystem_img_field = qq{<img border="0" src="/images/not-sorted.gif" usemap="#subsystem-sorted">};
my $message_img_field = qq{<img border="0" src="/images/not-sorted.gif" usemap="#message-sorted">};

if($sort_field eq "severity") {
	$severity_img_field = qq{<img border="0" src="/images/asc-sorted.gif" usemap="#severity-sorted">};
	if($sort_type eq "descend") {
		$severity_img_field = qq{<img border="0" src="/images/dsc-sorted.gif" usemap="#severity-sorted">};
	}
} elsif ($sort_field eq "agent") {
	$agent_img_field = qq{<img border="0" src="/images/asc-sorted.gif" usemap="#agent-sorted">};
	if($sort_type eq "descend") {
		$agent_img_field = qq{<img border="0" src="/images/dsc-sorted.gif" usemap="#agent-sorted">};
	}
} elsif ($sort_field eq "subsystem") {
	$subsystem_img_field = qq{<img border="0" src="/images/asc-sorted.gif" usemap="#subsystem-sorted">};
	if($sort_type eq "descend") {
		$subsystem_img_field = qq{<img border="0" src="/images/dsc-sorted.gif" usemap="#subsystem-sorted">};
	}
} elsif ($sort_field eq "message") {
	$message_img_field = qq{<img border="0" src="/images/asc-sorted.gif" usemap="#message-sorted">};
	if($sort_type eq "descend") {
		$message_img_field = qq{<img border="0" src="/images/dsc-sorted.gif" usemap="#message-sorted">};
	}
}


print <<EOT;
Content-type: text/html

<html>
<body bgcolor="#FFFFFF">
<map name="severity-sorted">
<area href="/cgi-bin/alertview.cgi?sort_field=severity&sort_type=descend" alt="Descending" coords="0,0,15,15">
<area href="/cgi-bin/alertview.cgi?sort_field=severity&sort_type=ascend" alt="Ascending" coords="15,0,30,15">
</map>
<map name="agent-sorted">
<area href="/cgi-bin/alertview.cgi?sort_field=agent&sort_type=descend" alt="Descending" coords="0,0,15,15">
<area href="/cgi-bin/alertview.cgi?sort_field=agent&sort_type=ascend" alt="Ascending" coords="15,0,30,15">
</map>
<map name="subsystem-sorted">
<area href="/cgi-bin/alertview.cgi?sort_field=subsystem&sort_type=descend" alt="Descending" coords="0,0,15,15">
<area href="/cgi-bin/alertview.cgi?sort_field=subsystem&sort_type=ascend" alt="Ascending" coords="15,0,30,15">
</map>
<map name="message-sorted">
<area href="/cgi-bin/alertview.cgi?sort_field=message&sort_type=descend" alt="Descending" coords="0,0,15,15">
<area href="/cgi-bin/alertview.cgi?sort_field=message&sort_type=ascend" alt="Ascending" coords="15,0,30,15">
</map>
<input type="button" value="Register Host" onclick="openregisterwindow()">
<input type="button" value="Suppress Host" onclick="opensuppresswindow()">
<center>
<form action="/cgi-bin/alertview.cgi" method="post">
<b>Alert View</b><br>
Current Time (as of refresh): <b>$date_and_time</b>
<table border="1" bgcolor="#FFFFF0" width="100%">
 <tr>
  <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>+/-</b></font></td>
  <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>ACK</b><input type="button"
 value="X" onclick="javascript: toggle(this);"></font></td>
  <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>SUP</b></font></td>
  <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>Agent</b>$agent_img_field</font></td>
  <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>Timestamp</b></font></td>
  <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>Severity</b>$severity_img_field</font></td>
  <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>Subsystem</b>$subsystem_img_field</font></td>
  <td background="/images/header.gif" align="left"><font color="#FFFFFF"><b>Message</b>$message_img_field</font></td>
  <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>#</b></font></td>
 </tr>

EOT


foreach my $key (@sorted_rows) {
	my $identity = $alertlist{$key}->{first_id};
	my ($timestamp, $alerthash, $sequence) = split /\./, $identity;
	my $date_str = POSIX::strftime("%Y-%m-%d %H:%M:%S", localtime($timestamp));
	my $agent = $alertlist{$key}->{agent};
	my $sev = $alertlist{$key}->{severity};
	my $subsystem = $alertlist{$key}->{subsystem};
	my $message = $alertlist{$key}->{message};
	print <<EOT;
 <tr>
  <td align="center"><b>(!)</b></td>
  <td align="center"><input type="checkbox" name="id:$identity"></td>
  <td align="center"><input type="checkbox" name="sup:$agent"></td>
  <td align="right">$agent</td>
  <td align="center">$date_str</td>
  <td align="center" bgcolor="$severity{$sev}->{color}"><font color="#FFFFFF"><b>$sev</b></font></td>
  <td align="center">$subsystem</td>
  <td>$message</td>
  <td>-1</td>
 </tr>
EOT
}

print <<EOT;
</table>
EOT

[Benson-commit] CVS: benson3/scripts/cgi Makefile.in,1.6,1.7 Makefile.am,1.6,NONE

From: Bob T. <bt...@us...> - 2003-11-26 22:58:15

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv21396/scripts/cgi

Modified Files:
	Makefile.in 
Removed Files:
	Makefile.am 
Log Message:
Added the alertview.cgi with new field sorting options.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.in	21 Nov 2002 00:50:50 -0000	1.6
--- Makefile.in	26 Nov 2003 22:58:12 -0000	1.7
***************
*** 1,267 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! 
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! # This Makefile.in is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
! 
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! # PARTICULAR PURPOSE.
! 
! 
! SHELL = @SHELL@
! 
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! VPATH = @srcdir@
! prefix = @prefix@
! exec_prefix = @exec_prefix@
! 
! bindir = @bindir@
! sbindir = @sbindir@
! libexecdir = @libexecdir@
! datadir = @datadir@
! sysconfdir = @sysconfdir@
! sharedstatedir = @sharedstatedir@
! localstatedir = @localstatedir@
! libdir = @libdir@
! infodir = @infodir@
! mandir = @mandir@
! includedir = @includedir@
! oldincludedir = /usr/include
! 
! DESTDIR =
! 
! pkgdatadir = $(datadir)/@PACKAGE@
! pkglibdir = $(libdir)/@PACKAGE@
! pkgincludedir = $(includedir)/@PACKAGE@
! 
! top_builddir = ../..
! 
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
! 
! INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
! 
! NORMAL_INSTALL = :
! PRE_INSTALL = :
! POST_INSTALL = :
! NORMAL_UNINSTALL = :
! PRE_UNINSTALL = :
! POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
! AS = @AS@
! CC = @CC@
! DLLTOOL = @DLLTOOL@
! ECHO = @ECHO@
! EXEEXT = @EXEEXT@
! HAVE_X11 = @HAVE_X11@
! LIBTOOL = @LIBTOOL@
! LIBTOOL_DEPS = @LIBTOOL_DEPS@
! LIBTOOL_VERSION = @LIBTOOL_VERSION@
! LN_S = @LN_S@
! MAINT = @MAINT@
! MAKEINFO = @MAKEINFO@
! OBJDUMP = @OBJDUMP@
! OBJEXT = @OBJEXT@
! PACKAGE = @PACKAGE@
! PERL_CFLAGS = @PERL_CFLAGS@
! PERL_LDFLAGS = @PERL_LDFLAGS@
! RANLIB = @RANLIB@
! STRIP = @STRIP@
! VERSION = @VERSION@
! perlpath = @perlpath@
! pythonpath = @pythonpath@
! sedpath = @sedpath@
! sortpath = @sortpath@
! tclpath = @tclpath@
! trpath = @trpath@
! uniqpath = @uniqpath@
! 
! bin_SCRIPTS = alertlist.cgi group.cgi grouplist.cgi suppress.cgi register_host.cgi jump.cgi
! noinst_SCRIPTS = test_suppress
! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../../config.h
! CONFIG_CLEAN_FILES = 
! SCRIPTS =  $(bin_SCRIPTS) $(noinst_SCRIPTS)
! 
! DIST_COMMON =  Makefile.am Makefile.in
! 
! 
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! 
! TAR = tar
! GZIP_ENV = --best
! all: all-redirect
! .SUFFIXES:
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
! 	cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/cgi/Makefile
! 
! Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
! 	cd $(top_builddir) \
! 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
! 
! 
! install-binSCRIPTS: $(bin_SCRIPTS)
! 	@$(NORMAL_INSTALL)
! 	$(mkinstalldirs) $(DESTDIR)$(bindir)
! 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
! 	  if test -f $$p; then \
! 	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
! 	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	  else if test -f $(srcdir)/$$p; then \
! 	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	  else :; fi; fi; \
! 	done
! 
! uninstall-binSCRIPTS:
! 	@$(NORMAL_UNINSTALL)
! 	list='$(bin_SCRIPTS)'; for p in $$list; do \
! 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	done
! tags: TAGS
! TAGS:
! 
! 
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
! 
! subdir = scripts/cgi
! 
! distdir: $(DISTFILES)
! 	here=`cd $(top_builddir) && pwd`; \
! 	top_distdir=`cd $(top_distdir) && pwd`; \
! 	distdir=`cd $(distdir) && pwd`; \
! 	cd $(top_srcdir) \
! 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu scripts/cgi/Makefile
! 	@for file in $(DISTFILES); do \
! 	  d=$(srcdir); \
! 	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
! 	  else \
! 	    test -f $(distdir)/$$file \
! 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
! 	  fi; \
! 	done
! info-am:
! info: info-am
! dvi-am:
! dvi: dvi-am
! check-am: all-am
! check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-binSCRIPTS
! install-exec: install-exec-am
! 
! install-data-am:
! install-data: install-data-am
! 
! install-am: all-am
! 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-am
! uninstall-am: uninstall-binSCRIPTS
! uninstall: uninstall-am
! all-am: Makefile $(SCRIPTS)
! all-redirect: all-am
! install-strip:
! 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs:
! 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
! 
! 
! mostlyclean-generic:
! 
! clean-generic:
! 
! distclean-generic:
! 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
! 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
! 
! maintainer-clean-generic:
! mostlyclean-am:  mostlyclean-generic
! 
! mostlyclean: mostlyclean-am
! 
! clean-am:  clean-generic mostlyclean-am
! 
! clean: clean-am
! 
! distclean-am:  distclean-generic clean-am
! 	-rm -f libtool
! 
! distclean: distclean-am
! 
! maintainer-clean-am:  maintainer-clean-generic distclean-am
! 	@echo "This command is intended for maintainers to use;"
! 	@echo "it deletes files that may require special tools to rebuild."
! 
! maintainer-clean: maintainer-clean-am
! 
! .PHONY: uninstall-binSCRIPTS install-binSCRIPTS tags distdir info-am \
! info dvi-am dvi check check-am installcheck-am installcheck \
! install-exec-am install-exec install-data-am install-data install-am \
! install uninstall-am uninstall all-redirect all-am all installdirs \
! mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
! 
! 
! distclean:
! 	test -z jump.cgi || rm -f jump.cgi; \
! 	test -z register_host.cgi || rm -f register_host.cgi; \
! 	test -z group.cgi || rm -f group.cgi; \
! 	test -z grouplist.cgi || rm -f grouplist.cgi; \
! 	test -z alertlist.cgi || rm -f alertlist.cgi; \
! 	test -z test_suppress || rm -f test_suppress; \
! 	test -z suppress.cgi || rm -f suppress.cgi 
! 
! clean:
! 	test -z jump.cgi || rm -f jump.cgi; \
! 	test -z register_host.cgi || rm -f register_host.cgi; \
! 	test -z group.cgi || rm -f group.cgi; \
! 	test -z grouplist.cgi || rm -f grouplist.cgi; \
! 	test -z alertlist.cgi || rm -f alertlist.cgi; \
! 	test -z test_suppress || rm -f test_suppress; \
! 	test -z suppress.cgi || rm -f suppress.cgi
! 
! jump.cgi: jump.cgi.tmpl
! 	sed -e "s:prefixpath:@prefix@:" jump.cgi.tmpl | sed -e "s:perlpath:@perlpath@:" > jump.cgi; \
! 	chmod 755 jump.cgi
! 
! register_host.cgi: register_host.cgi.tmpl
! 	sed -e "s:prefixpath:@prefix@:" register_host.cgi.tmpl | sed -e "s:perlpath:@perlpath@:" > register_host.cgi; \
! 	chmod 755 register_host.cgi
! 
! group.cgi: group.cgi.tmpl
! 	sed -e "s:prefixpath:@prefix@:" group.cgi.tmpl | sed -e "s:perlpath:@perlpath@:" > group.cgi; \
! 	chmod 755 group.cgi
! 
! grouplist.cgi: grouplist.cgi.tmpl
! 	sed -e "s:prefixpath:@prefix@:" grouplist.cgi.tmpl | sed -e "s:perlpath:@perlpath@:" > grouplist.cgi; \
! 	chmod 755 grouplist.cgi
  
  alertlist.cgi: alertlist.cgi.tmpl
! 	sed -e "s:prefixpath:@prefix@:" alertlist.cgi.tmpl | sed -e "s:perlpath:@perlpath@:" > alertlist.cgi; \
! 	chmod 755 alertlist.cgi
! 
! test_suppress: test_suppress.tmpl
! 	sed -e "s:prefixpath:@prefix@:" test_suppress.tmpl | sed -e "s:perlpath:@perlpath@:" > test_suppress; \
! 	chmod 755 test_suppress
  
  suppress.cgi: suppress.cgi.tmpl
! 	sed -e "s:prefixpath:@prefix@:" suppress.cgi.tmpl | sed -e "s:perlpath:@perlpath@:" > suppress.cgi; \
! 	chmod 755 suppress.cgi
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--- 1,52 ----
! prefix=@prefix@
! perlpath=@perlpath@
! exec_prefix=@exec_prefix@
! bindir=@bindir@
! srcdir=@srcdir@
! top_srcdir=@top_srcdir@
! 
! CC=@CC@
! LD=@LD@
! CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src/perl @CFLAGS@
! PERL_CFLAGS=@PERL_CFLAGS@
! PERL_LDFLAGS=@PERL_LDFLAGS@
! CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=@LIBS@
! AR=@arpath@
! RANLIB=@RANLIB@
! INSTALL=@INSTALL@
! LDFLAGS=-L. @LDFLAGS@
! 
! TARGETS=alertview.cgi alertlist.cgi suppress.cgi
! 
! 
! all: $(TARGETS)
! 
! alertview.cgi: alertview.cgi.tmpl
! 	cat alertview.cgi.tmpl | \
! 		sed -e "s:prefixpath:@prefix@:" | \
! 		sed -e "s:perlpath:@perlpath@:" > alertview.cgi
  
  alertlist.cgi: alertlist.cgi.tmpl
! 	cat alertlist.cgi.tmpl | \
! 		sed -e "s:prefixpath:@prefix@:" | \
! 		sed -e "s:perlpath:@perlpath@:" > alertlist.cgi
  
  suppress.cgi: suppress.cgi.tmpl
! 	cat suppress.cgi.tmpl | \
! 		sed -e "s:prefixpath:@prefix@:" | \
! 		sed -e "s:perlpath:@perlpath@:" > suppress.cgi
! 
! install: $(TARGETS)
! 	$(top_srcdir)/mkinstalldirs $(bindir)
! 	$(INSTALL) -m 0755 alertlist.cgi $(bindir)
! 	$(INSTALL) -m 0755 suppress.cgi $(bindir)
! 
! clean:
! 	rm -f suppress.cgi
! 	rm -f alertlist.cgi
! 	rm -f alertview.cgi
! 
! distclean: clean
! 	rm -f Makefile *~
  

--- Makefile.am DELETED ---

[Benson-commit] CVS: benson3 Makefile.in,1.14,1.15

From: Bob T. <bt...@us...> - 2003-11-26 22:58:15

Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv21396

Modified Files:
	Makefile.in 
Log Message:
Added the alertview.cgi with new field sorting options.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Makefile.in	26 Nov 2003 00:14:20 -0000	1.14
--- Makefile.in	26 Nov 2003 22:58:12 -0000	1.15
***************
*** 11,14 ****
--- 11,15 ----
  make-scripts:
  	(cd scripts && $(MAKE))
+ 	(cd scripts/cgi && $(MAKE))
  
  make-handlers:
***************
*** 19,22 ****
--- 20,24 ----
  	(cd conf && $(MAKE) install)
  	(cd scripts && $(MAKE) install)
+ 	(cd scripts/cgi && $(MAKE) install)
  	(cd handlers && $(MAKE) install)
  
***************
*** 25,28 ****
--- 27,31 ----
  	(cd conf && $(MAKE) clean)
  	(cd scripts && $(MAKE) clean)
+ 	(cd scripts/cgi && $(MAKE) clean)
  	(cd handlers && $(MAKE) clean)
  
***************
*** 32,35 ****
--- 35,39 ----
  	(cd conf && $(MAKE) distclean)
  	(cd scripts && $(MAKE) distclean)
+ 	(cd scripts/cgi && $(MAKE) distclean)
  	(cd handlers && $(MAKE) distclean)

[Benson-commit] CVS: benson3/src/network network_listener.c,1.8,1.9 network_master.c,1.8,1.9 network_utils.c,1.7,1.8

From: Bob T. <bt...@us...> - 2003-11-26 00:25:36

Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv3234

Modified Files:
	network_listener.c network_master.c network_utils.c 
Log Message:
Added copyright information

Index: network_listener.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_listener.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** network_listener.c	26 Nov 2003 00:22:50 -0000	1.8
--- network_listener.c	26 Nov 2003 00:25:33 -0000	1.9
***************
*** 1,2 ****
--- 1,11 ----
+ /*
+  *
+  * src/network/network_listener.c
+  *
+  * Copyright (C) 2003 Bob Tribit <bt...@ne...>
+  */
+ 
+ 
+ 
  #include "network.h"
  
***************
*** 92,95 ****
--- 101,107 ----
  /*
  $Log$
+ Revision 1.9  2003/11/26 00:25:33  btribit
+ Added copyright information
+ 
  Revision 1.8  2003/11/26 00:22:50  btribit
  Added versioning information.

Index: network_master.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_master.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** network_master.c	26 Nov 2003 00:22:50 -0000	1.8
--- network_master.c	26 Nov 2003 00:25:33 -0000	1.9
***************
*** 1,2 ****
--- 1,9 ----
+ /*
+  *
+  * src/network/network_master.c
+  *
+  * Copyright (C) 2003 Bob Tribit <bt...@ne...>
+  */
+ 
  #include "network.h"
  
***************
*** 68,71 ****
--- 75,81 ----
  /*
  $Log$
+ Revision 1.9  2003/11/26 00:25:33  btribit
+ Added copyright information
+ 
  Revision 1.8  2003/11/26 00:22:50  btribit
  Added versioning information.

Index: network_utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_utils.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** network_utils.c	26 Nov 2003 00:22:50 -0000	1.7
--- network_utils.c	26 Nov 2003 00:25:33 -0000	1.8
***************
*** 1,2 ****
--- 1,9 ----
+ /*
+  *
+  * src/network/network_utils.c
+  *
+  * Copyright (C) 2003 Bob Tribit <bt...@ne...
+  */
+ 
  #include "network.h"
  
***************
*** 68,71 ****
--- 75,81 ----
  /*
  $Log$
+ Revision 1.8  2003/11/26 00:25:33  btribit
+ Added copyright information
+ 
  Revision 1.7  2003/11/26 00:22:50  btribit
  Added versioning information.

[Benson-commit] CVS: benson3/src/network network_listener.c,1.7,1.8 network_master.c,1.7,1.8 network_utils.c,1.6,1.7 v32_network_request.c,1.2,1.3

From: Bob T. <bt...@us...> - 2003-11-26 00:22:53

Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv2639/src/network

Modified Files:
	network_listener.c network_master.c network_utils.c 
	v32_network_request.c 
Log Message:
Added versioning information.

Index: network_listener.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_listener.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** network_listener.c	8 Nov 2003 20:43:20 -0000	1.7
--- network_listener.c	26 Nov 2003 00:22:50 -0000	1.8
***************
*** 89,90 ****
--- 89,98 ----
  	return GOOD;
  }
+ 
+ /*
+ $Log$
+ Revision 1.8  2003/11/26 00:22:50  btribit
+ Added versioning information.
+ 
+ 
+ */

Index: network_master.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_master.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** network_master.c	8 Nov 2003 20:43:20 -0000	1.7
--- network_master.c	26 Nov 2003 00:22:50 -0000	1.8
***************
*** 65,66 ****
--- 65,74 ----
  	return GOOD;
  }
+ 
+ /*
+ $Log$
+ Revision 1.8  2003/11/26 00:22:50  btribit
+ Added versioning information.
+ 
+ 
+ */

Index: network_utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** network_utils.c	8 Nov 2003 20:43:20 -0000	1.6
--- network_utils.c	26 Nov 2003 00:22:50 -0000	1.7
***************
*** 65,66 ****
--- 65,74 ----
  	snprintf(dest, current_size, "%s", src);
  }
+ 
+ /*
+ $Log$
+ Revision 1.7  2003/11/26 00:22:50  btribit
+ Added versioning information.
+ 
+ 
+ */

Index: v32_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v32_network_request.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** v32_network_request.c	26 Nov 2003 00:14:20 -0000	1.2
--- v32_network_request.c	26 Nov 2003 00:22:50 -0000	1.3
***************
*** 86,87 ****
--- 86,95 ----
  	return GOOD;
  }
+ 
+ /*
+ $Log$
+ Revision 1.3  2003/11/26 00:22:50  btribit
+ Added versioning information.
+ 
+ 
+ */

[Benson-commit] CVS: benson3/src/network v32_network_client.c,1.1,1.2

From: Bob T. <bt...@us...> - 2003-11-26 00:18:19

Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv1761

Modified Files:
	v32_network_client.c 
Log Message:
Testing something

Index: v32_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v32_network_client.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** v32_network_client.c	8 Nov 2003 21:05:16 -0000	1.1
--- v32_network_client.c	26 Nov 2003 00:18:16 -0000	1.2
***************
*** 74,75 ****
--- 74,83 ----
  	return (int)ntohs(resp_hdr.resp.acknowledge.rc);
  }
+ 
+ /*
+ $Log$
+ Revision 1.2  2003/11/26 00:18:16  btribit
+ Testing something
+ 
+ 
+ */

[Benson-commit] CVS: benson3/src/perl/Benson/lib/Benson/Handlers/Network Update.pm,1.4,1.5

From: Bob T. <bt...@us...> - 2003-11-26 00:14:23

Update of /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network
In directory sc8-pr-cvs1:/tmp/cvs-serv818/src/perl/Benson/lib/Benson/Handlers/Network

Modified Files:
	Update.pm 
Log Message:
More updates to the system.

Index: Update.pm
===================================================================
RCS file: /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network/Update.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Update.pm	6 Feb 2002 20:44:23 -0000	1.4
--- Update.pm	26 Nov 2003 00:14:20 -0000	1.5
***************
*** 17,22 ****
  	my $s = $a->server;
  	my $identity = $a->identity;
  	my $status = $a->status;
! 	$s->trace("Preparing to update alert status ($status) for identity = $identity", 4);
  
  #
--- 17,35 ----
  	my $s = $a->server;
  	my $identity = $a->identity;
+ 	my $agent = $a->agent;
+ 	my $subsystem = $a->subsystem;
  	my $status = $a->status;
! 
! #
! # Determine what track we are updating on... identity or agent/subsystem pair
! #
! 	if(defined $identity) {
! 		$s->trace("Preparing to update alert status ($status) for identity = $identity", 4);
! 	} elsif((defined $agent) && (defined $subsystem)) {
! 		$s->trace("Preparing to update alert status ($status) for agent/subsystem = $agent/$subsystem", 4);
! 	} else {
! 		$s->trace("(param error) update alert status failed. No parameters supplied (identity) or (agent/suppress)",4);
! 		return ERROR;
! 	}
  
  #

[Benson-commit] CVS: benson3/handlers Makefile.in,1.4,1.5

From: Bob T. <bt...@us...> - 2003-11-26 00:14:23

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv818/handlers

Modified Files:
	Makefile.in 
Log Message:
More updates to the system.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in	30 Jan 2002 16:05:32 -0000	1.4
--- Makefile.in	26 Nov 2003 00:14:20 -0000	1.5
***************
*** 1,211 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
- # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
- 
- SHELL = @SHELL@
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- 
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
- 
- DESTDIR =
- 
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- 
- top_builddir = ..
- 
- ACLOCAL = @ACLOCAL@
- AUTOCONF = @AUTOCONF@
- AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_alias = @host_alias@
- host_triplet = @host@
- AMTAR = @AMTAR@
- AS = @AS@
- AWK = @AWK@
- CC = @CC@
- DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
- ECHO = @ECHO@
- EXEEXT = @EXEEXT@
- HAVE_X11 = @HAVE_X11@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
- LIBTOOL_VERSION = @LIBTOOL_VERSION@
- LN_S = @LN_S@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL_CFLAGS = @PERL_CFLAGS@
- PERL_LDFLAGS = @PERL_LDFLAGS@
- RANLIB = @RANLIB@
- STRIP = @STRIP@
- VERSION = @VERSION@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
- perlpath = @perlpath@
- pythonpath = @pythonpath@
- sedpath = @sedpath@
- sortpath = @sortpath@
- tclpath = @tclpath@
- trpath = @trpath@
- uniqpath = @uniqpath@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
- DIST_COMMON =  Makefile.am Makefile.in
- 
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
- TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu handlers/Makefile
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- tags: TAGS
- TAGS:
- 
- 
- distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
- 
- subdir = handlers
- 
- distdir: $(DISTFILES)
- 	here=`cd $(top_builddir) && pwd`; \
- 	top_distdir=`cd $(top_distdir) && pwd`; \
- 	distdir=`cd $(distdir) && pwd`; \
- 	cd $(top_srcdir) \
- 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu handlers/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
- 	    cp -pr $$/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
- info-am:
- info: info-am
- dvi-am:
- dvi: dvi-am
- check-am: all-am
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
- install-exec-am:
- install-exec: install-exec-am
- 
- install-data-am: install-data-local
- install-data: install-data-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-am
- uninstall-am:
- uninstall: uninstall-am
- all-am: Makefile
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- 
- 
- mostlyclean-generic:
- 
- clean-generic:
- 
- distclean-generic:
- 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
- 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 
- maintainer-clean-generic:
- mostlyclean-am:  mostlyclean-generic
- 
- mostlyclean: mostlyclean-am
- 
- clean-am:  clean-generic mostlyclean-am
- 
- clean: clean-am
- 
- distclean-am:  distclean-generic clean-am
- 	-rm -f libtool
- 
- distclean: distclean-am
- 
- maintainer-clean-am:  maintainer-clean-generic distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
- maintainer-clean: maintainer-clean-am
- 
- .PHONY: tags distdir info-am info dvi-am dvi check check-am \
- installcheck-am installcheck install-exec-am install-exec \
- install-data-local install-data-am install-data install-am install \
- uninstall-am uninstall all-redirect all-am all installdirs \
- mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
- 
- install-data-local:
- 	$(mkinstalldirs) $(prefix)/handlers; \
- 	cp A10email.pm $(prefix)/handlers; \
- 	cp M10diskmon.pm $(prefix)/handlers; \
- 	cp R90autoack.pm $(prefix)/handlers; \
- 	cp S05benson.pm $(prefix)/handlers; \
- 	cp S10database.pm $(prefix)/handlers;
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--- 1,38 ----
! prefix=@prefix@
! sysconfdir=@sysconfdir@
! handlersdir=$(prefix)/handlers
! srcdir=@srcdir@
! top_srcdir=@top_srcdir@
! 
! 
! CC=@CC@
! LD=@LD@
! CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src/perl @CFLAGS@
! PERL_CFLAGS=@PERL_CFLAGS@
! PERL_LDFLAGS=@PERL_LDFLAGS@
! CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=@LIBS@
! AR=@arpath@
! RANLIB=@RANLIB@
! INSTALL=@INSTALL@
! LDFLAGS=-L. @LDFLAGS@
! 
! TARGETS=A10email.pm M10diskmon.pm R90autoack.pm S05benson.pm S10database.pm
! 
! all: 
! 	echo "Handler Modules are ready"	
! 
! install: $(TARGETS)
! 	$(top_srcdir)/mkinstalldirs $(handlersdir)
! 	$(INSTALL) -m 0644 A10email.pm $(handlersdir)
! 	$(INSTALL) -m 0644 M10diskmon.pm $(handlersdir)
! 	$(INSTALL) -m 0644 R90autoack.pm $(handlersdir)
! 	$(INSTALL) -m 0644 S05benson.pm $(handlersdir)
! 	$(INSTALL) -m 0644 S10database.pm $(handlersdir)
! 
! clean:
! 	echo "Nothing build, nothing to clean."
! 
! distclean: clean
! 	rm -f Makefile *~

[Benson-commit] CVS: benson3/src/network Makefile.in,1.12,1.13 v31_network_client.c,1.6,1.7 v32_network_request.c,1.1,1.2 v32_request.h,1.1,1.2

From: Bob T. <bt...@us...> - 2003-11-26 00:14:23

Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv818/src/network

Modified Files:
	Makefile.in v31_network_client.c v32_network_request.c 
	v32_request.h 
Log Message:
More updates to the system.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Makefile.in	8 Nov 2003 20:43:20 -0000	1.12
--- Makefile.in	26 Nov 2003 00:14:20 -0000	1.13
***************
*** 2,5 ****
--- 2,8 ----
  srcdir=@srcdir@
  top_srcdir=@top_srcdir@
+ exec_prefix=@exec_prefix@
+ prefix=@prefix@
+ libdir=@libdir@
  
  CC=@CC@
***************
*** 39,42 ****
--- 42,51 ----
  v32_network_request.o:
  	$(CC) $(CFLAGS) $(PERL_CFLAGS) $(CPPFLAGS) -c v32_network_request.c
+ 
+ install: install-lib
+ 
+ install-lib: libnetclient.so
+ 	$(top_srcdir)/mkinstalldirs $(libdir)
+ 	$(INSTALL) -m 0755  libnetclient.so $(libdir)
  
  clean:

Index: v31_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_client.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** v31_network_client.c	8 Nov 2003 20:43:20 -0000	1.6
--- v31_network_client.c	26 Nov 2003 00:14:20 -0000	1.7
***************
*** 203,206 ****
--- 203,210 ----
  	safe_strncpy(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v31);
  
+ 	rc = fwrite(&req_hdr, sizeof(bn_req_hdr), 1, connect_ctx.output);
+ 	if(ferror(connect_ctx.output)) {
+ 		perror("bn_acknowledge(): fwrite() error");
+ 	}
  	rc = fwrite(&req_pkt, sizeof(bnet_req_v31), 1, connect_ctx.output);
  	if(rc < 1) {

Index: v32_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v32_network_request.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** v32_network_request.c	8 Nov 2003 21:05:16 -0000	1.1
--- v32_network_request.c	26 Nov 2003 00:14:20 -0000	1.2
***************
*** 1,4 ****
  #include "network.h"
! #include "v31_request.h"
  #include "benson/perl_util.h"
  
--- 1,4 ----
  #include "network.h"
! #include "v32_request.h"
  #include "benson/perl_util.h"
  
***************
*** 6,15 ****
  process_acknowledge_v32(bnet_req_v32 *req_pkt, SV *server_ref)
  {
! 	char id[ID_MAXSIZE_v31];
! 	char status[STA_MAXSIZE_v31];
  	SV *acknowledge_ref;
  	SV *rc;
  
  	safe_strncpy(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v32);
  	safe_strncpy(status, "acknowledge", STA_MAXSIZE_v32);
  
--- 6,19 ----
  process_acknowledge_v32(bnet_req_v32 *req_pkt, SV *server_ref)
  {
! 	char id[ID_MAXSIZE_v32];
! 	char agent[AGT_MAXSIZE_v32];
! 	char subsystem[SUB_MAXSIZE_v32];
! 	char status[STA_MAXSIZE_v32];
  	SV *acknowledge_ref;
  	SV *rc;
  
  	safe_strncpy(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v32);
+ 	safe_strncpy(agent, req_pkt->data.acknowledge.agent, ID_MAXSIZE_v32);
+ 	safe_strncpy(subsystem, req_pkt->data.acknowledge.subsystem, ID_MAXSIZE_v32);
  	safe_strncpy(status, "acknowledge", STA_MAXSIZE_v32);
  
***************
*** 21,24 ****
--- 25,30 ----
  	acknowledge_ref = sv_2mortal(bn_new_object("Benson::Alert", 0));
  	bn_set_attribute(acknowledge_ref, "identity", newSVpv(id, 0));
+ 	bn_set_attribute(acknowledge_ref, "agent", newSVpv(agent, 0));
+ 	bn_set_attribute(acknowledge_ref, "subsystem", newSVpv(subsystem, 0));
  	bn_set_attribute(acknowledge_ref, "status", newSVpv(status, 0));
  	bn_set_attribute(acknowledge_ref, "server", SvREFCNT_inc(server_ref));

Index: v32_request.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v32_request.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** v32_request.h	8 Nov 2003 21:05:16 -0000	1.1
--- v32_request.h	26 Nov 2003 00:14:20 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  #define BENSON_ACKNOWLEDGE_v32 3
  #define BENSON_UPDATE_STATUS_v32 4
+ #define BENSON_SUPPRESS_LIST_v32 5
  
  #define DST_MAXSIZE_v32 50
***************
*** 56,62 ****
  
  typedef struct benson_alertlist_v32 {
! 	unsigned short max_num_alerts;
  } bn_alertlist_v32;
  
  #define BNH_MAXSIZE_v32 7
  #define VER_MAXSIZE_v32 32
--- 57,68 ----
  
  typedef struct benson_alertlist_v32 {
! 	unsigned long start_time;
! 	unsigned long end_time;
  } bn_alertlist_v32;
  
+ typedef struct benson_suppress_list_v32 {
+ 	unsigned short max_num_alerts;
+ } bn_suppress_list_v32;
+ 
  #define BNH_MAXSIZE_v32 7
  #define VER_MAXSIZE_v32 32
***************
*** 68,71 ****
--- 74,78 ----
  		bn_acknowledge_v32 acknowledge;
  		bn_alertlist_v32 alertlist;
+ 		bn_suppress_list_v32 suppress_list;
  		bn_update_status_v32 update_status;
  	} data;
***************
*** 78,81 ****
--- 85,96 ----
  	bn_status_v32 misc;
  } bn_alertlist_response_v32;
+ 
+ typedef struct benson_suppress_list_response_v32 {
+ 	unsigned char identity[ID_MAXSIZE_v32];
+ 	unsigned char agent[AGT_MAXSIZE_v32];
+ 	unsigned char reason[MSG_MAXSIZE_v32];
+ 	unsigned long start_time;
+ 	unsigned long end_time;
+ } bn_suppress_list_response_v32;
  
  #define RMSG_MAXSIZE_v32 100

[Benson-commit] CVS: benson3 Makefile.in,1.13,1.14

From: Bob T. <bt...@us...> - 2003-11-26 00:14:23

Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv818

Modified Files:
	Makefile.in 
Log Message:
More updates to the system.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Makefile.in	8 Nov 2003 21:12:22 -0000	1.13
--- Makefile.in	26 Nov 2003 00:14:20 -0000	1.14
***************
*** 1,3 ****
! TARGETS=make-src make-conf make-scripts
  
  all: $(TARGETS)
--- 1,3 ----
! TARGETS=make-src make-conf make-scripts make-handlers
  
  all: $(TARGETS)
***************
*** 12,19 ****
--- 12,23 ----
  	(cd scripts && $(MAKE))
  
+ make-handlers:
+ 	(cd handlers && $(MAKE))
+ 
  install:
  	(cd src && $(MAKE) install)
  	(cd conf && $(MAKE) install)
  	(cd scripts && $(MAKE) install)
+ 	(cd handlers && $(MAKE) install)
  
  clean:
***************
*** 21,24 ****
--- 25,29 ----
  	(cd conf && $(MAKE) clean)
  	(cd scripts && $(MAKE) clean)
+ 	(cd handlers && $(MAKE) clean)
  
  distclean: clean
***************
*** 27,29 ****
--- 32,35 ----
  	(cd conf && $(MAKE) distclean)
  	(cd scripts && $(MAKE) distclean)
+ 	(cd handlers && $(MAKE) distclean)

[Benson-commit] CVS: benson3/src/perl/Benson Makefile.PL,1.12,1.13

From: Bob T. <bt...@us...> - 2003-11-11 19:32:58

Update of /cvsroot/benson/benson3/src/perl/Benson
In directory sc8-pr-cvs1:/tmp/cvs-serv8229/src/perl/Benson

Modified Files:
	Makefile.PL 
Log Message:
Added some good suppression logic into S05benson

Index: Makefile.PL
===================================================================
RCS file: /cvsroot/benson/benson3/src/perl/Benson/Makefile.PL,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Makefile.PL	8 Oct 2003 03:15:02 -0000	1.12
--- Makefile.PL	11 Nov 2003 19:32:54 -0000	1.13
***************
*** 23,27 ****
  	'AUTHOR'	=> 'Bob Tribit <bt...@ne...>',
  	'ABSTRACT'	=> 'Benson suite of perl modules',
! 	'LIBS'		=> ["-R$prefix/lib/ -L$prefix/lib/ -lbenson"],
  	'DEFINE'	=> '',
  	'INC'		=> "-I$top_srcdir/include/ -I$top_srcdir/src/",
--- 23,27 ----
  	'AUTHOR'	=> 'Bob Tribit <bt...@ne...>',
  	'ABSTRACT'	=> 'Benson suite of perl modules',
! 	'LIBS'		=> ["-R$prefix/lib/ -L$prefix/lib/ -lbenson -lnetclient"],
  	'DEFINE'	=> '',
  	'INC'		=> "-I$top_srcdir/include/ -I$top_srcdir/src/",

[Benson-commit] CVS: benson3/handlers S05benson.pm,1.7,1.8

From: Bob T. <bt...@us...> - 2003-11-11 19:32:57

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv8229/handlers

Modified Files:
	S05benson.pm 
Log Message:
Added some good suppression logic into S05benson

Index: S05benson.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/S05benson.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** S05benson.pm	26 Jun 2003 20:23:22 -0000	1.7
--- S05benson.pm	11 Nov 2003 19:32:53 -0000	1.8
***************
*** 7,11 ****
  
  sub suppress {
! 	my ($self, $data) = @_;
  	my ($everything, $reason) = split /reason\:/, $data, 2;
  	my @name_value_pairs = split /\s+/, $everything;
--- 7,11 ----
  
  sub suppress {
! 	my ($self, $data, $t) = @_;
  	my ($everything, $reason) = split /reason\:/, $data, 2;
  	my @name_value_pairs = split /\s+/, $everything;
***************
*** 15,21 ****
  		$hash{$name} = $value;
  	}
! 	my $agent = $hash{agent} || "null";
! 	my $starttime = $hash{starttime} || "0000-00-00_00:00:00";
! 	my $endtime = $hash{endtime} || "0000-00-00_00:00:00";
  	if(defined $hash{duration}) {
  		# calculate startime in epoch seconds
--- 15,23 ----
  		$hash{$name} = $value;
  	}
! 	my $current_time = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime(time));
! 	my $default_endtime = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime(time + 1800));
! 	my $agent = $hash{agent} || $t->agent;
! 	my $starttime = $hash{starttime} || $current_time;
! 	my $endtime = $hash{endtime} || $default_endtime;
  	if(defined $hash{duration}) {
  		# calculate startime in epoch seconds
***************
*** 67,72 ****
  	}
  
! 	my $id = $hash{identity};
! 	my $sql_remove = <<EOSQL;
  UPDATE
  	suppress
--- 69,78 ----
  	}
  
! 	my $id = $hash{identity} || "null";
! 	my $agent = $hash{agent} || "null";
! 	my $sql_remove;
! 
! 	if($id ne "null") {
! 		$sql_remove = <<EOSQL;
  UPDATE
  	suppress
***************
*** 76,79 ****
--- 82,97 ----
  	suppress_id = $id
  EOSQL
+ 	} elsif ($agent ne "null") {
+ 		$sql_remove = <<EOSQL;
+ UPDATE
+ 	suppress
+ SET
+ 	remove = 'Y'
+ WHERE
+ 	agent = $agent
+ EOSQL
+ 	} else {
+ 		return;
+ 	}
  
  	my $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword);
***************
*** 124,128 ****
  		if($action eq "suppress") {
  			$s->trace("We have been asked to suppress something.", 4);
! 			$self->suppress($data);
  			return SUPPRESS_LOG;
  		} elsif($action eq "suppress_remove") {
--- 142,146 ----
  		if($action eq "suppress") {
  			$s->trace("We have been asked to suppress something.", 4);
! 			$self->suppress($data, $t);
  			return SUPPRESS_LOG;
  		} elsif($action eq "suppress_remove") {

[Benson-commit] CVS: benson3 Makefile.in,1.12,1.13

From: Bob T. <bt...@us...> - 2003-11-08 21:12:25

Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv16026

Modified Files:
	Makefile.in 
Log Message:
Added the scripts directory into the build process

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Makefile.in	30 Sep 2003 04:32:06 -0000	1.12
--- Makefile.in	8 Nov 2003 21:12:22 -0000	1.13
***************
*** 1,3 ****
! TARGETS=make-src make-conf
  
  all: $(TARGETS)
--- 1,3 ----
! TARGETS=make-src make-conf make-scripts
  
  all: $(TARGETS)
***************
*** 9,19 ****
--- 9,24 ----
  	(cd conf && $(MAKE))
  
+ make-scripts:
+ 	(cd scripts && $(MAKE))
+ 
  install:
  	(cd src && $(MAKE) install)
  	(cd conf && $(MAKE) install)
+ 	(cd scripts && $(MAKE) install)
  
  clean:
  	(cd src && $(MAKE) clean)
  	(cd conf && $(MAKE) clean)
+ 	(cd scripts && $(MAKE) clean)
  
  distclean: clean
***************
*** 21,23 ****
--- 26,29 ----
  	(cd src && $(MAKE) distclean)
  	(cd conf && $(MAKE) distclean)
+ 	(cd scripts && $(MAKE) distclean)

[Benson-commit] CVS: benson3/include/benson utils.h,NONE,1.1

From: Bob T. <bt...@us...> - 2003-11-08 21:08:59

Update of /cvsroot/benson/benson3/include/benson
In directory sc8-pr-cvs1:/tmp/cvs-serv15129

Added Files:
	utils.h 
Log Message:
Added the utils.h file

--- NEW FILE: utils.h ---
/*
 *
 * include/benson/utils.h 
 *
 * Copyright (C) 2002, 2003 Bob Tribit <bt...@ne...>
 */

#ifndef __utils_h
#define __utils_h

#include <stdlib.h>
#include <string.h>

extern void safe_insert(char *d, char *s, int maxsize);
extern void *ibn_malloc(size_t length);
extern void ibn_free(void *);


#endif /* __utils_h */

[Benson-commit] CVS: benson3/autom4te.cache output.0,1.13,1.14 requests,1.19,1.20 traces.0,1.12,1.13

From: Bob T. <bt...@us...> - 2003-11-08 21:05:21

Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv14518/autom4te.cache

Modified Files:
	output.0 requests traces.0 
Log Message:
Added the v32 changes.

Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** output.0	8 Oct 2003 03:53:53 -0000	1.13
--- output.0	8 Nov 2003 21:05:15 -0000	1.14
***************
*** 3241,3248 ****
  
  CONF_LIBNSL=yes
! 
! case $target in
!   *cygwin)
! 	LIBS=-lcygipc
  	;;
    *linux*)
--- 3241,3247 ----
  
  CONF_LIBNSL=yes
! case $host_os in
!   *cyg*)
! 	CONF_LIBS=-lcygipc
  	;;
    *linux*)
***************
*** 5624,5627 ****
--- 5623,5629 ----
  fi
  
+           ac_config_commands="$ac_config_commands src/tests/atconfig"
+ 
+ 
  
  if test X"$unamepath" != "X"; then
***************
*** 5830,5834 ****
--- 5832,5838 ----
  fi
  
+ 
  LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
+ LIBS="$LIBS $CONF_LIBS"
  CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
  CFLAGS=`echo "$CFLAGS" | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
***************
*** 5839,5847 ****
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="$CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="$CFLAGS -pg"
  fi
  
--- 5843,5851 ----
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -pg"
  fi
  
***************
*** 6264,6267 ****
--- 6268,6274 ----
  $config_headers
  
+ Configuration commands:
+ $config_commands
+ 
  Report bugs to <bug...@gn...>."
  _ACEOF
***************
*** 6393,6396 ****
--- 6400,6404 ----
    "doc/htdocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/htdocs/Makefile" ;;
    "doc/htdocs/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/htdocs/images/Makefile" ;;
+   "src/tests/atconfig" ) CONFIG_COMMANDS="$CONFIG_COMMANDS src/tests/atconfig" ;;
    "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
***************
*** 6407,6410 ****
--- 6415,6419 ----
    test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
    test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
  fi
  
***************
*** 6947,6950 ****
--- 6956,7038 ----
      rm -f $tmp/config.h
    fi
+ done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ #
+ # CONFIG_COMMANDS section.
+ #
+ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+ $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_dest" : 'X\(//\)[^/]' \| \
+          X"$ac_dest" : 'X\(//\)$' \| \
+          X"$ac_dest" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dest" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+ 
+   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+ echo "$as_me: executing $ac_dest commands" >&6;}
+   case $ac_dest in
+     src/tests/atconfig ) cat >src/tests/atconfig <<ATEOF
+ @%:@ Configurable variable values for building test suites.
+ @%:@ Generated by $0.
+ @%:@ Copyright 2000, 2001 Free Software Foundation, Inc.
+ 
+ # The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
+ at_testdir='src/tests'
+ abs_builddir='$ac_abs_builddir'
+ at_srcdir='$ac_srcdir'
+ abs_srcdir='$ac_abs_srcdir'
+ at_top_srcdir='$ac_top_srcdir'
+ abs_top_srcdir='$ac_abs_top_srcdir'
+ at_top_builddir='$ac_top_builddir'
+ abs_top_builddir='$ac_abs_top_builddir'
+ 
+ AUTOTEST_PATH='src/tests'
+ 
+ SHELL=\${CONFIG_SHELL-'$SHELL'}
+ ATEOF
+  ;;
+   esac
  done
  _ACEOF

Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** requests	8 Oct 2003 04:16:37 -0000	1.19
--- requests	8 Nov 2003 21:05:15 -0000	1.20
***************
*** 109,113 ****
                      ], 'Request' ),
               bless( [
!                       '1',
                        1,
                        [
--- 109,113 ----
                      ], 'Request' ),
               bless( [
!                       1,
                        1,
                        [

Index: traces.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/traces.0,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** traces.0	8 Oct 2003 03:53:53 -0000	1.12
--- traces.0	8 Nov 2003 21:05:15 -0000	1.13
***************
*** 106,224 ****
  #undef HAVE_LIBM])
  m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
! m4trace:configure.ac:41: -1- AC_SUBST([CONF_PIC])
! m4trace:configure.ac:45: -1- AC_CHECK_LIB([nsl], [open], [], [], [-lsocket])
! m4trace:configure.ac:45: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
  #undef HAVE_LIBNSL])
! m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:58: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:58: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
  #undef BENSON_HOME])
! m4trace:configure.ac:59: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:59: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
  #undef PACKAGE])
! m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:60: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
  #undef VERSION])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
  #undef HAVE_EXPAT_H])
! m4trace:configure.ac:82: -1- AC_HEADER_STDC
! m4trace:configure.ac:82: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:82: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                    inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
  #undef HAVE_SYS_TYPES_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
  #undef HAVE_STDLIB_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
  #undef HAVE_STDINT_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H])
! m4trace:configure.ac:83: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:83: -1- AH_OUTPUT([HAVE_OPENSSL_SSL_H], [/* Define to 1 if you have the <openssl/ssl.h> header file. */
  #undef HAVE_OPENSSL_SSL_H])
! m4trace:configure.ac:84: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
  #undef HAVE_SIGNAL_H])
! m4trace:configure.ac:85: -1- AC_CHECK_HEADERS([sys/sem.h])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
  #undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:86: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:86: -1- AH_OUTPUT([HAVE_SYS_SHM_H], [/* Define to 1 if you have the <sys/shm.h> header file. */
  #undef HAVE_SYS_SHM_H])
! m4trace:configure.ac:87: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:88: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
  #undef HAVE_ERRNO_H])
! m4trace:configure.ac:89: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
  #undef HAVE_DB_H])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
  #undef HAVE_LIBNSL])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
  #undef HAVE_LIBRESOLV])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
  #undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
  #undef HAVE_LIBSOCKET])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
  #undef HAVE_LIBDL])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
  #undef HAVE_LIBDLD])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
  #undef HAVE_LIBLD])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
  #undef HAVE_LIBW])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
  #undef HAVE_LIBRESOLV])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
  #undef HAVE_LIBDB])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:100: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:100: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
  #undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:101: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:101: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
  #undef HAVE_LIBSSL])
! m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:102: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:102: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
  #undef HAVE_LIBEXPAT])
! m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
  m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
  m4trace:configure.ac:107: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
--- 106,224 ----
  #undef HAVE_LIBM])
  m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
! m4trace:configure.ac:40: -1- AC_SUBST([CONF_PIC])
! m4trace:configure.ac:44: -1- AC_CHECK_LIB([nsl], [open], [], [], [-lsocket])
! m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
  #undef HAVE_LIBNSL])
! m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:57: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:57: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
  #undef BENSON_HOME])
! m4trace:configure.ac:58: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:58: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
  #undef PACKAGE])
! m4trace:configure.ac:59: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:59: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
  #undef VERSION])
! m4trace:configure.ac:81: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
  #undef HAVE_EXPAT_H])
! m4trace:configure.ac:81: -1- AC_HEADER_STDC
! m4trace:configure.ac:81: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:81: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:81: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS])
! m4trace:configure.ac:81: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                    inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
  #undef HAVE_SYS_TYPES_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
  #undef HAVE_STDLIB_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
  #undef HAVE_STDINT_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_OPENSSL_SSL_H], [/* Define to 1 if you have the <openssl/ssl.h> header file. */
  #undef HAVE_OPENSSL_SSL_H])
! m4trace:configure.ac:83: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:83: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
  #undef HAVE_SIGNAL_H])
! m4trace:configure.ac:84: -1- AC_CHECK_HEADERS([sys/sem.h])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
  #undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:85: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_SYS_SHM_H], [/* Define to 1 if you have the <sys/shm.h> header file. */
  #undef HAVE_SYS_SHM_H])
! m4trace:configure.ac:86: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:86: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:87: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
  #undef HAVE_ERRNO_H])
! m4trace:configure.ac:88: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
  #undef HAVE_DB_H])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
  #undef HAVE_LIBNSL])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
  #undef HAVE_LIBRESOLV])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
  #undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
  #undef HAVE_LIBSOCKET])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
  #undef HAVE_LIBDL])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
  #undef HAVE_LIBDLD])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
  #undef HAVE_LIBLD])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
  #undef HAVE_LIBW])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
  #undef HAVE_LIBRESOLV])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
  #undef HAVE_LIBDB])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
  #undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:100: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:100: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
  #undef HAVE_LIBSSL])
! m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:101: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:101: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
  #undef HAVE_LIBEXPAT])
! m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
  m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
  m4trace:configure.ac:107: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
***************
*** 238,243 ****
  m4trace:configure.ac:148: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
  m4trace:configure.ac:154: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:177: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:194: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
  include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
  src/network/Makefile src/perl/Makefile src/rules/Makefile \
--- 238,243 ----
  m4trace:configure.ac:148: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
  m4trace:configure.ac:154: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:179: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:196: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
  include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
  src/network/Makefile src/perl/Makefile src/rules/Makefile \
***************
*** 245,248 ****
  src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
  doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:194: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:194: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- 245,248 ----
  src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
  doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:196: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:196: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])

[Benson-commit] CVS: benson3/src/network v32_network_client.c,NONE,1.1 v32_network_request.c,NONE,1.1 v32_request.h,NONE,1.1

From: Bob T. <bt...@us...> - 2003-11-08 21:05:21

Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv14518/src/network

Added Files:
	v32_network_client.c v32_network_request.c v32_request.h 
Log Message:
Added the v32 changes.

--- NEW FILE: v32_network_client.c ---
/*
 *
 * src/network/v31_network_client.c 
 *
 * Copyright (C) 2002, 2003 Bob Tribit <bt...@ne...>
 */

#include <benson/benson.h>
#include "v32_request.h"
#include "network.h"
#include "config.h"

int bn_ack_v32 (char *destination, int port, char *source,
		char *identity, char *agent, char *subsystem)
{
	int rc;
	bn_req_hdr req_hdr;
	bnet_req_v32 req_pkt;
	bnet_resp_v32 resp_hdr;
	bnet_ack_v32 resp_ack;
	bn_netconnect_ctx connect_ctx;

	safe_strncpy(connect_ctx.destination, destination, DST_MAXSIZE_v32);
	connect_ctx.port = port;

	if((ibn_tcp_connect(&connect_ctx)) == ERROR) {
		fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
		return ERROR;
	}

	if((connect_ctx.input = fdopen(connect_ctx.connfd, "r")) == NULL) {
		perror("bn_acknowledge(): fdopen(r) error");
		return ERROR;
	}
	if((connect_ctx.output = fdopen(connect_ctx.connfd, "w")) == NULL) {
		perror("bn_acknowledge(): fdopen(w) error");
		return ERROR;
	}

	req_hdr.function = htons(BENSON_ACKNOWLEDGE_v32);
	safe_strncpy(req_hdr.benson, PACKAGE, BNH_MAXSIZE_v32);
	safe_strncpy(req_hdr.version, "3.2", VER_MAXSIZE_v32);
	safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v32);
	safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v32);
	safe_strncpy(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v32);
	safe_strncpy(req_pkt.data.acknowledge.agent, agent, AGT_MAXSIZE_v32);
	safe_strncpy(req_pkt.data.acknowledge.subsystem, subsystem, SUB_MAXSIZE_v32);

	rc = fwrite(&req_hdr, sizeof(bn_req_hdr), 1, connect_ctx.output);
	if(rc < 1) {
		perror("bn_acknowledge(): fwrite() error");
	}	
	rc = fwrite(&req_pkt, sizeof(bnet_req_v32), 1, connect_ctx.output);
	if(rc < 1) {
		perror("bn_acknowledge(): fwrite() error");
	}	
	fflush(connect_ctx.output);

	rc = fread(&resp_hdr, sizeof(bnet_resp_v32), 1, connect_ctx.input);
	if(rc < 1) {
		perror("bn_acknowledge(): fread() error");
	}

	rc = fwrite(&resp_ack, sizeof(bnet_ack_v32), 1, connect_ctx.output);
	if(rc < 1) {
		perror("bn_acknowledge(): fwrite() error");
	}	
	fflush(connect_ctx.output);

	fclose(connect_ctx.output);
	fclose(connect_ctx.input);
	close(connect_ctx.connfd);

	return (int)ntohs(resp_hdr.resp.acknowledge.rc);
}

--- NEW FILE: v32_network_request.c ---
#include "network.h"
#include "v31_request.h"
#include "benson/perl_util.h"

short
process_acknowledge_v32(bnet_req_v32 *req_pkt, SV *server_ref)
{
	char id[ID_MAXSIZE_v31];
	char status[STA_MAXSIZE_v31];
	SV *acknowledge_ref;
	SV *rc;

	safe_strncpy(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v32);
	safe_strncpy(status, "acknowledge", STA_MAXSIZE_v32);

	ENTER;
	SAVETMPS;

	bn_require_module("Benson::Alert");
	bn_require_module("Benson::Handlers::Network::Update");
	acknowledge_ref = sv_2mortal(bn_new_object("Benson::Alert", 0));
	bn_set_attribute(acknowledge_ref, "identity", newSVpv(id, 0));
	bn_set_attribute(acknowledge_ref, "status", newSVpv(status, 0));
	bn_set_attribute(acknowledge_ref, "server", SvREFCNT_inc(server_ref));

	rc = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Update",acknowledge_ref));

	FREETMPS;
	LEAVE;

	return (short)SvIV(rc);
}

int network_request_parser_v32(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header)
{
	int rc;
	int function;
	int bytes_read;
	bnet_req_v32 req_pkt;
	PerlInterpreter *request_perl;
	SV *server_ref;
	char config_file[255];

	function = ntohs(request_header->function);

	bytes_read = fread(&req_pkt, sizeof(bnet_req_v32), 1, conn_ctx->input);

	request_perl = bn_perl_initialize(0, NULL, NULL, 1);

	bn_require_module("Benson::Server");
	bn_require_module("Benson::Handlers::Config");
	bn_require_module("Benson::Handlers::Init");
	server_ref = bn_new_object("Benson::Server", 0);

	snprintf(config_file, 255, "%s/etc/benson.conf", BENSON_HOME);
	config_file[255] = '\0';

	bn_set_attribute(server_ref, "ConfigFile", newSVpv(config_file, 0));
	bn_call_handler("Benson::Handlers::Config", server_ref);
	bn_call_handler("Benson::Handlers::Init", server_ref);

	if(function == BENSON_ACKNOWLEDGE_v32) {
		bnet_resp_v32 resp_hdr;
		bnet_ack_v32 resp_ack;

		printf("benson acknowledge received\n");
		rc = process_acknowledge_v32(&req_pkt, server_ref);

		memset(&resp_hdr, 0, sizeof(bnet_resp_v32));
		memset(&resp_ack, 0, sizeof(bnet_ack_v32));

		rc = fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
		rc = fwrite(&resp_hdr, sizeof(bnet_resp_v32), 1, conn_ctx->output);
		fflush(conn_ctx->output);

		rc = fread(&resp_hdr, sizeof(bnet_ack_v32), 1, conn_ctx->input);
	} else {
		printf("unrecognized function\n");
	}
	return GOOD;
}

--- NEW FILE: v32_request.h ---
/*
 *
 * src/network/request.h
 *
 * Copyright (C) 2003 Bob Tribit <bt...@ne...>
 *
 */

#ifndef __v32_request_h
#define __v32_request_h

#define BENSON_TRAP_v32 1
#define BENSON_ALERTLIST_v32 2
#define BENSON_ACKNOWLEDGE_v32 3
#define BENSON_UPDATE_STATUS_v32 4

#define DST_MAXSIZE_v32 50
#define AGT_MAXSIZE_v32 50

typedef struct benson_inet_32 {
	unsigned char destination[DST_MAXSIZE_v32];
	unsigned char agent[AGT_MAXSIZE_v32];
} bn_inet_v32;

#define SEV_MAXSIZE_v32 50
#define SUB_MAXSIZE_v32 50
#define MSG_MAXSIZE_v32 256

typedef struct benson_trap_v32 {
	unsigned char severity[SEV_MAXSIZE_v32];
	unsigned char subsystem[SUB_MAXSIZE_v32];
	unsigned char message[MSG_MAXSIZE_v32];
} bn_trap_v32;

#define STA_MAXSIZE_v32 50
#define UPD_MAXSIZE_v32 50

typedef struct benson_status_v32 {
	unsigned short received;
	unsigned char updated[UPD_MAXSIZE_v32];
	unsigned char status[STA_MAXSIZE_v32];
} bn_status_v32;

#define ID_MAXSIZE_v32 50

typedef struct benson_acknowledge_v32 {
	unsigned char identity[ID_MAXSIZE_v32];
	unsigned char agent[AGT_MAXSIZE_v32];
	unsigned char subsystem[SUB_MAXSIZE_v32];
} bn_acknowledge_v32;

typedef struct benson_update_status_v32 {
	unsigned char identity[ID_MAXSIZE_v32];
	unsigned char status[STA_MAXSIZE_v32];
} bn_update_status_v32;

typedef struct benson_alertlist_v32 {
	unsigned short max_num_alerts;
} bn_alertlist_v32;

#define BNH_MAXSIZE_v32 7
#define VER_MAXSIZE_v32 32

typedef struct benson_request_v32 {
	bn_inet_v32 inet;
	union {
		bn_trap_v32 trap;
		bn_acknowledge_v32 acknowledge;
		bn_alertlist_v32 alertlist;
		bn_update_status_v32 update_status;
	} data;
} bnet_req_v32;

typedef struct benson_alertlist_response_v32 {
	unsigned char identity[ID_MAXSIZE_v32];
	bn_inet_v32 inet;
	bn_trap_v32 trap;
	bn_status_v32 misc;
} bn_alertlist_response_v32;

#define RMSG_MAXSIZE_v32 100

typedef struct benson_trap_response_v32 {
	unsigned char identity[ID_MAXSIZE_v32];
	unsigned char message[RMSG_MAXSIZE_v32];
	unsigned short rc;
} bn_trap_response_v32;

typedef struct benson_acknowledge_response_v32 {
	unsigned short rc;
} bn_acknowledge_response_v32;

typedef struct benson_update_status_response_v32 {
	unsigned short rc;
} bn_update_status_response_v32;

typedef struct benson_response_v32 {
	union {
		unsigned short total_alerts;
		bn_trap_response_v32 trap;
		bn_acknowledge_response_v32 acknowledge;
		bn_update_status_response_v32 update_status;
	} resp;
} bnet_resp_v32;

typedef struct benson_resp_acknowledge_v32 {
	union {
		unsigned short rc;
	} ack;
} bnet_ack_v32;

extern int bn_ack_v32 (char *destination, int port, char *source, char *identity, char *agent, char *subsystem);

#endif /* __v32_request_h */

[Benson-commit] CVS: benson3/scripts Makefile.in,1.7,1.8 Makefile.am,1.6,NONE

From: Bob T. <bt...@us...> - 2003-11-08 21:05:21

Update of /cvsroot/benson/benson3/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv14518/scripts

Modified Files:
	Makefile.in 
Removed Files:
	Makefile.am 
Log Message:
Added the v32 changes.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile.in	7 Oct 2002 21:24:02 -0000	1.7
--- Makefile.in	8 Nov 2003 21:05:16 -0000	1.8
***************
*** 1,340 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! # This Makefile.in is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
  
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
  
  
! SHELL = @SHELL@
! 
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! VPATH = @srcdir@
! prefix = @prefix@
! exec_prefix = @exec_prefix@
! 
! bindir = @bindir@
! sbindir = @sbindir@
! libexecdir = @libexecdir@
! datadir = @datadir@
! sysconfdir = @sysconfdir@
! sharedstatedir = @sharedstatedir@
! localstatedir = @localstatedir@
! libdir = @libdir@
! infodir = @infodir@
! mandir = @mandir@
! includedir = @includedir@
! oldincludedir = /usr/include
! 
! DESTDIR =
! 
! pkgdatadir = $(datadir)/@PACKAGE@
! pkglibdir = $(libdir)/@PACKAGE@
! pkgincludedir = $(includedir)/@PACKAGE@
! 
! top_builddir = ..
! 
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
! 
! INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
! 
! NORMAL_INSTALL = :
! PRE_INSTALL = :
! POST_INSTALL = :
! NORMAL_UNINSTALL = :
! PRE_UNINSTALL = :
! POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
! AS = @AS@
! CC = @CC@
! DLLTOOL = @DLLTOOL@
! ECHO = @ECHO@
! EXEEXT = @EXEEXT@
! HAVE_X11 = @HAVE_X11@
! LIBTOOL = @LIBTOOL@
! LIBTOOL_DEPS = @LIBTOOL_DEPS@
! LIBTOOL_VERSION = @LIBTOOL_VERSION@
! LN_S = @LN_S@
! MAINT = @MAINT@
! MAKEINFO = @MAKEINFO@
! OBJDUMP = @OBJDUMP@
! OBJEXT = @OBJEXT@
! PACKAGE = @PACKAGE@
! PERL_CFLAGS = @PERL_CFLAGS@
! PERL_LDFLAGS = @PERL_LDFLAGS@
! RANLIB = @RANLIB@
! STRIP = @STRIP@
! VERSION = @VERSION@
! perlpath = @perlpath@
! pythonpath = @pythonpath@
! sedpath = @sedpath@
! sortpath = @sortpath@
! tclpath = @tclpath@
! trpath = @trpath@
! uniqpath = @uniqpath@
! 
! bin_SCRIPTS = bensonctl register_host
! 
! SUBDIRS = cgi
! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES = 
! SCRIPTS =  $(bin_SCRIPTS)
! 
! DIST_COMMON =  Makefile.am Makefile.in
! 
! 
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! 
! TAR = gtar
! GZIP_ENV = --best
! all: all-redirect
! .SUFFIXES:
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
! 	cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile
! 
! Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
! 	cd $(top_builddir) \
! 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
! 
! 
! install-binSCRIPTS: $(bin_SCRIPTS)
! 	@$(NORMAL_INSTALL)
! 	$(mkinstalldirs) $(DESTDIR)$(bindir)
! 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
! 	  if test -f $$p; then \
! 	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
! 	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	  else if test -f $(srcdir)/$$p; then \
! 	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	  else :; fi; fi; \
! 	done
! 
! uninstall-binSCRIPTS:
! 	@$(NORMAL_UNINSTALL)
! 	list='$(bin_SCRIPTS)'; for p in $$list; do \
! 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	done
! 
! # This directory's subdirectories are mostly independent; you can cd
! # into them and run `make' without going through this Makefile.
! # To change the values of `make' variables: instead of editing Makefiles,
! # (1) if the variable is set in `config.status', edit `config.status'
! #     (which will cause the Makefiles to be regenerated when you run `make');
! # (2) otherwise, pass the desired values on the `make' command line.
! 
! @SET_MAKE@
! 
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive  \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
! 	@set fnord $(MAKEFLAGS); amf=$$2; \
! 	dot_seen=no; \
! 	target=`echo $@ | sed s/-recursive//`; \
! 	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  echo "Making $$target in $$subdir"; \
! 	  if test "$$subdir" = "."; then \
! 	    dot_seen=yes; \
! 	    local_target="$$target-am"; \
! 	  else \
! 	    local_target="$$target"; \
! 	  fi; \
! 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
! 	done; \
! 	if test "$$dot_seen" = "no"; then \
! 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
! 	fi; test -z "$$fail"
! 
! mostlyclean-recursive clean-recursive distclean-recursive \
! maintainer-clean-recursive:
! 	@set fnord $(MAKEFLAGS); amf=$$2; \
! 	dot_seen=no; \
! 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  rev="$$subdir $$rev"; \
! 	  test "$$subdir" != "." || dot_seen=yes; \
! 	done; \
! 	test "$$dot_seen" = "no" && rev=". $$rev"; \
! 	target=`echo $@ | sed s/-recursive//`; \
! 	for subdir in $$rev; do \
! 	  echo "Making $$target in $$subdir"; \
! 	  if test "$$subdir" = "."; then \
! 	    local_target="$$target-am"; \
! 	  else \
! 	    local_target="$$target"; \
! 	  fi; \
! 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
! 	done && test -z "$$fail"
! tags-recursive:
! 	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
! 	done
! 
! tags: TAGS
! 
! ID: $(HEADERS) $(SOURCES) $(LISP)
! 	list='$(SOURCES) $(HEADERS)'; \
! 	unique=`for i in $$list; do echo $$i; done | \
! 	  awk '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	here=`pwd` && cd $(srcdir) \
! 	  && mkid -f$$here/ID $$unique $(LISP)
! 
! TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SUBDIRS)'; for subdir in $$list; do \
!    if test "$$subdir" = .; then :; else \
! 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
!    fi; \
! 	done; \
! 	list='$(SOURCES) $(HEADERS)'; \
! 	unique=`for i in $$list; do echo $$i; done | \
! 	  awk '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
! 
! mostlyclean-tags:
! 
! clean-tags:
! 
! distclean-tags:
! 	-rm -f TAGS ID
! 
! maintainer-clean-tags:
! 
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
! 
! subdir = scripts
! 
! distdir: $(DISTFILES)
! 	here=`cd $(top_builddir) && pwd`; \
! 	top_distdir=`cd $(top_distdir) && pwd`; \
! 	distdir=`cd $(distdir) && pwd`; \
! 	cd $(top_srcdir) \
! 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu scripts/Makefile
! 	@for file in $(DISTFILES); do \
! 	  d=$(srcdir); \
! 	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
! 	  else \
! 	    test -f $(distdir)/$$file \
! 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
! 	  fi; \
! 	done
! 	for subdir in $(SUBDIRS); do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test -d $(distdir)/$$subdir \
! 	    || mkdir $(distdir)/$$subdir \
! 	    || exit 1; \
! 	    chmod 777 $(distdir)/$$subdir; \
! 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
! 	      || exit 1; \
! 	  fi; \
! 	done
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
! check-am: all-am
! check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! install-exec-am: install-binSCRIPTS
! install-exec: install-exec-recursive
! 
! install-data-am:
! install-data: install-data-recursive
! 
! install-am: all-am
! 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-recursive
! uninstall-am: uninstall-binSCRIPTS
! uninstall: uninstall-recursive
! all-am: Makefile $(SCRIPTS)
! all-redirect: all-recursive
! install-strip:
! 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs: installdirs-recursive
! installdirs-am:
! 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
! 
! 
! mostlyclean-generic:
! 
! clean-generic:
! 
! distclean-generic:
! 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
! 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
! 
! maintainer-clean-generic:
! mostlyclean-am:  mostlyclean-tags mostlyclean-generic
! 
! mostlyclean: mostlyclean-recursive
! 
! clean-am:  clean-tags clean-generic mostlyclean-am
! 
! clean: clean-recursive
! 
! distclean-am:  distclean-tags distclean-generic clean-am
! 	-rm -f libtool
! 
! distclean: distclean-recursive
! 
! maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
! 		distclean-am
! 	@echo "This command is intended for maintainers to use;"
! 	@echo "it deletes files that may require special tools to rebuild."
! 
! maintainer-clean: maintainer-clean-recursive
! 
! .PHONY: uninstall-binSCRIPTS install-binSCRIPTS install-data-recursive \
! uninstall-data-recursive install-exec-recursive \
! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
! all-recursive check-recursive installcheck-recursive info-recursive \
! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs-am \
! installdirs mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
! 
  
! distclean:
! 	test -z bensonctl || rm -f bensonctl; 
! 	test -z register_host || rm -f register_host; 
  
  clean:
! 	test -z bensonctl || rm -f bensonctl;
! 	test -z register_host || rm -f register_host; 
! 
! bensonctl: bensonctl.tmpl
! 	sed -e "s:prefixpath:@prefix@:" bensonctl.tmpl > bensonctl
  
! register_host: register_host.tmpl
! 	sed -e "s:prefixpath:@prefix@:" register_host.tmpl > register_host
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--- 1,37 ----
! prefix=@prefix@
! exec_prefix=@exec_prefix@
! bindir=@bindir@
! srcdir=@srcdir@
! top_srcdir=@top_srcdir@
! 
! CC=@CC@
! LD=@LD@
! CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src/perl @CFLAGS@
! PERL_CFLAGS=@PERL_CFLAGS@
! PERL_LDFLAGS=@PERL_LDFLAGS@
! CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=@LIBS@
! AR=@arpath@
! RANLIB=@RANLIB@
! INSTALL=@INSTALL@
! LDFLAGS=-L. @LDFLAGS@
  
! TARGETS=bensonctl
  
  
+ all: $(TARGETS)
  
! bensonctl: bensonctl.tmpl
! 	sed -e "s:prefixpath:@prefix@:" bensonctl.tmpl > bensonctl
  
! install: $(TARGETS)
! 	$(top_srcdir)/mkinstalldirs $(bindir)
! 	$(top_srcdir)/mkinstalldirs $(prefix)/logs
! 	$(INSTALL) -m 0755 bensonctl $(bindir)
  
  clean:
! 	rm -f bensonctl
  
! distclean: clean
! 	rm -f Makefile *~
  

--- Makefile.am DELETED ---

[Benson-commit] CVS: benson3 configure,1.62,1.63 configure.ac,1.10,1.11

From: Bob T. <bt...@us...> - 2003-11-08 21:05:20

Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv14518

Modified Files:
	configure configure.ac 
Log Message:
Added the v32 changes.

Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** configure	8 Oct 2003 04:16:37 -0000	1.62
--- configure	8 Nov 2003 21:05:14 -0000	1.63
***************
*** 3241,3245 ****
  
  CONF_LIBNSL=yes
- echo $host_os
  case $host_os in
    *cyg*)
--- 3241,3244 ----
***************
*** 5624,5627 ****
--- 5623,5629 ----
  fi
  
+           ac_config_commands="$ac_config_commands src/tests/atconfig"
+ 
+ 
  
  if test X"$unamepath" != "X"; then
***************
*** 5841,5849 ****
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="$CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="$CFLAGS -pg"
  fi
  
--- 5843,5851 ----
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -pg"
  fi
  
***************
*** 6266,6269 ****
--- 6268,6274 ----
  $config_headers
  
+ Configuration commands:
+ $config_commands
+ 
  Report bugs to <bug...@gn...>."
  _ACEOF
***************
*** 6395,6398 ****
--- 6400,6404 ----
    "doc/htdocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/htdocs/Makefile" ;;
    "doc/htdocs/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/htdocs/images/Makefile" ;;
+   "src/tests/atconfig" ) CONFIG_COMMANDS="$CONFIG_COMMANDS src/tests/atconfig" ;;
    "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
***************
*** 6409,6412 ****
--- 6415,6419 ----
    test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
    test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
  fi
  
***************
*** 6949,6952 ****
--- 6956,7038 ----
      rm -f $tmp/config.h
    fi
+ done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ #
+ # CONFIG_COMMANDS section.
+ #
+ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+ $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_dest" : 'X\(//\)[^/]' \| \
+          X"$ac_dest" : 'X\(//\)$' \| \
+          X"$ac_dest" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dest" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+ 
+   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+ echo "$as_me: executing $ac_dest commands" >&6;}
+   case $ac_dest in
+     src/tests/atconfig ) cat >src/tests/atconfig <<ATEOF
+ # Configurable variable values for building test suites.
+ # Generated by $0.
+ # Copyright 2000, 2001 Free Software Foundation, Inc.
+ 
+ # The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
+ at_testdir='src/tests'
+ abs_builddir='$ac_abs_builddir'
+ at_srcdir='$ac_srcdir'
+ abs_srcdir='$ac_abs_srcdir'
+ at_top_srcdir='$ac_top_srcdir'
+ abs_top_srcdir='$ac_abs_top_srcdir'
+ at_top_builddir='$ac_top_builddir'
+ abs_top_builddir='$ac_abs_top_builddir'
+ 
+ AUTOTEST_PATH='src/tests'
+ 
+ SHELL=\${CONFIG_SHELL-'$SHELL'}
+ ATEOF
+  ;;
+   esac
  done
  _ACEOF

Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure.ac	8 Oct 2003 04:16:37 -0000	1.10
--- configure.ac	8 Nov 2003 21:05:15 -0000	1.11
***************
*** 26,30 ****
  
  CONF_LIBNSL=yes
- echo $host_os
  case $host_os in
    *cyg*)
--- 26,29 ----
***************
*** 101,104 ****
--- 100,104 ----
  AC_CHECK_LIB(ssl, SSL_library_init)
  AC_CHECK_LIB(expat, XML_Parse)
+ AC_CONFIG_TESTDIR(src/tests)
  
  if test X"$unamepath" != "X"; then
***************
*** 180,188 ****
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="$CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="$CFLAGS -pg"
  fi
  
--- 180,188 ----
  
  if test X"$use_debug" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -g"
  fi
  
  if test X"$use_profile" = Xyes; then
! 	CFLAGS="-Wall $CFLAGS -pg"
  fi

[Benson-commit] CVS: benson3/include/benson benson.h,1.25,1.26 bsm.h,1.11,1.12 cfgctl.h,1.4,1.5 perl_util.h,1.11,1.12

From: Bob T. <bt...@us...> - 2003-11-08 21:05:20

Update of /cvsroot/benson/benson3/include/benson
In directory sc8-pr-cvs1:/tmp/cvs-serv14518/include/benson

Modified Files:
	benson.h bsm.h cfgctl.h perl_util.h 
Log Message:
Added the v32 changes.

Index: benson.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/benson.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** benson.h	8 Oct 2003 02:59:12 -0000	1.25
--- benson.h	8 Nov 2003 21:05:15 -0000	1.26
***************
*** 16,19 ****
--- 16,21 ----
  #include <syslog.h>
  #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
  #include <errno.h>
  #include "config.h"
***************
*** 34,41 ****
  int sequence;
  
! void safe_insert(char *d, char *s, int maxsize);
  void sig_int(int signal);
  int err_exit(char *string);
! void *ibn_malloc(size_t length);
  
  
--- 36,44 ----
  int sequence;
  
! extern void safe_insert(char *d, char *s, int maxsize);
  void sig_int(int signal);
  int err_exit(char *string);
! extern void *ibn_malloc(size_t length);
! extern void ibn_free(void *);
  
  

Index: bsm.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/bsm.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** bsm.h	8 Oct 2003 03:34:10 -0000	1.11
--- bsm.h	8 Nov 2003 21:05:16 -0000	1.12
***************
*** 70,73 ****
--- 70,75 ----
  int bsm_detach(bsm_ctx *this);
  int bsm_destroy(bsm_ctx *this);
+ int ibn_create_locks(bsm_ctx *this, int numlocks);
+ int ibn_destroy_locks(bsm_ctx *this);
  
  #endif

Index: cfgctl.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/cfgctl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** cfgctl.h	29 Sep 2003 17:36:25 -0000	1.4
--- cfgctl.h	8 Nov 2003 21:05:16 -0000	1.5
***************
*** 43,50 ****
  void delete_dt ( dts * );
  char *find_config_item ( char * );
! int cfg_helper ( int, char *, char * ); 
  		/* command integer, datatag in , datavalue out */
  
! int load_config ( void );
  
  
--- 43,50 ----
  void delete_dt ( dts * );
  char *find_config_item ( char * );
! extern int cfg_helper ( int, char *, char * ); 
  		/* command integer, datatag in , datavalue out */
  
! extern int load_config ( void );
  
  

Index: perl_util.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/perl_util.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** perl_util.h	26 Jan 2003 20:54:22 -0000	1.11
--- perl_util.h	8 Nov 2003 21:05:16 -0000	1.12
***************
*** 22,26 ****
  #endif /* incgv */
  
! static PerlInterpreter *my_perl;
  
  void bn_perl_destroy(PerlInterpreter *benson_perl);
--- 22,26 ----
  #endif /* incgv */
  
! extern PerlInterpreter *my_perl;
  
  void bn_perl_destroy(PerlInterpreter *benson_perl);
***************
*** 30,33 ****
--- 30,34 ----
  void bn_set_attribute(SV *pkg, const char *method, SV *value);
  SV* bn_get_attribute(SV *pkg, const char *method);
+ extern SV* bn_call_handler(const char *pkgname, SV* objref);
  
  #endif /* __perl_util_h */

Flat | Threaded

<< < 1 2 3 4 5 6 .. 33 > >> (Page 4 of 33)

2001	Jan	Feb	Mar	Apr	May (1)	Jun (27)	Jul (24)	Aug (64)	Sep (15)	Oct (72)	Nov (28)	Dec (44)
2002	Jan (72)	Feb (58)	Mar (33)	Apr (3)	May (5)	Jun (4)	Jul	Aug	Sep	Oct (24)	Nov (29)	Dec (12)
2003	Jan (37)	Feb (44)	Mar (13)	Apr (23)	May (9)	Jun (3)	Jul	Aug (7)	Sep (33)	Oct (30)	Nov (31)	Dec (11)
2004	Jan (4)	Feb (35)	Mar (14)	Apr	May (2)	Jun	Jul	Aug (5)	Sep	Oct	Nov	Dec
2005	Jan	Feb (2)	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec