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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv27713/src

Modified Files:
	bensond.c network.c 
Log Message:
The latest networking code

Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** bensond.c	2001/08/23 04:49:57	1.5
--- bensond.c	2001/08/26 20:16:34	1.6
***************
*** 1,4 ****
--- 1,15 ----
  #include "benson/benson.h"

+ void
+ sig_chld(int signo)
+ {
+ 	pid_t pid;
+ 	int stat;
+ 
+ 	pid = wait(&stat);
+ 	printf("Child %d has terminated\n", pid);
+ 	return;
+ }
+ 
  int main(int argc, char *argv[], char *env[])
  {
***************
*** 10,15 ****
  	pid_t pid;
  	char buf[1024];
! 	struct benson_trap *trap;
! 	trap = malloc(sizeof(struct benson_trap));

  //	ctx=initialize_ctx(KEYFILE,PASSWORD);
--- 21,26 ----
  	pid_t pid;
  	char buf[1024];
! 	struct benson_header packet_hdr;
! //	trap = malloc(sizeof(struct benson_trap));

  //	ctx=initialize_ctx(KEYFILE,PASSWORD);
***************
*** 17,20 ****
--- 28,33 ----
  //	generate_eph_rsa_key(ctx);

+ 	signal(SIGCHLD, sig_chld);
+ 
  	sock = bn_tcp_listen();

***************
*** 30,44 ****
  			while(1) {
  				if(r > 0) {
! 					r=read(s, trap, sizeof(struct benson_trap));
  					printf("reading (%i bytes)...\n", r);
  				} else {
! 					printf("%s %i\n",trap->agent, sizeof(trap->agent));
! 					printf("%s %i\n",trap->severity, sizeof(trap->severity));
! 					printf("%s %i\n",trap->subsystem, sizeof(trap->subsystem));
! 					printf("%s %i\n",trap->message, sizeof(trap->message));
  					break;
  				}
  			}
  			close(s);			
  //			sbio=BIO_new_socket(s,BIO_NOCLOSE);
  //			ssl=SSL_new(ctx);
--- 43,64 ----
  			while(1) {
  				if(r > 0) {
! 					r=read(s, &packet_hdr, sizeof(struct benson_header));
  					printf("reading (%i bytes)...\n", r);
  				} else {
! 					if(packet_hdr.function == 1) {
! 						printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));
! 						printf("%s %i\n",packet_hdr.agent, sizeof(packet_hdr.agent));
! 						printf("%s %i\n",packet_hdr.data.trap.severity, sizeof(packet_hdr.data.trap.severity));
! 						printf("%s %i\n",packet_hdr.data.trap.subsystem, sizeof(packet_hdr.data.trap.subsystem));
! 						printf("%s %i\n",packet_hdr.data.trap.message, sizeof(packet_hdr.data.trap.message));
! 					} else if(packet_hdr.function == 2) {
! 						printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));						
! 					}
  					break;
  				}
  			}
  			close(s);			
+ 			close(socket);
+ 			exit(0);
  //			sbio=BIO_new_socket(s,BIO_NOCLOSE);
  //			ssl=SSL_new(ctx);

Index: network.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** network.c	2001/08/23 04:49:57	1.3
--- network.c	2001/08/26 20:16:34	1.4
***************
*** 47,56 ****
  	int sock;
  	int ofcmode;
! 	struct benson_trap *trap;
  	char response[255];
  	char rc[2];

- 	trap = malloc(sizeof(struct benson_trap));
- 
  	sock = bn_tcp_connect(destination);
  	ofcmode = fcntl(sock,F_GETFL,0);
--- 47,54 ----
  	int sock;
  	int ofcmode;
! 	struct benson_header packet_hdr;
  	char response[255];
  	char rc[2];

  	sock = bn_tcp_connect(destination);
  	ofcmode = fcntl(sock,F_GETFL,0);
***************
*** 58,74 ****
  	if(fcntl(sock,F_SETFL,ofcmode))
  		err_exit("Couldn't make socket nonblocking");

! 	strncpy(trap->destination, destination, 255);
! 	trap->destination[255] = '\0';
! 	strncpy(trap->agent, source, 255);
! 	trap->agent[255] = '\0';
! 	strncpy(trap->severity, severity, 255);
! 	trap->severity[255] = '\0';
! 	strncpy(trap->subsystem, subsystem, 255);
! 	trap->subsystem[255] = '\0';
! 	strncpy(trap->message, message, 1023);
! 	trap->message[1023] = '\0';

! 	write(sock, trap, sizeof(struct benson_trap));
  	close(sock);
  	return 0;
--- 56,84 ----
  	if(fcntl(sock,F_SETFL,ofcmode))
  		err_exit("Couldn't make socket nonblocking");
+ 
+ 	strncpy(packet_hdr.benson, PACKAGE, 6);
+ 	packet_hdr.benson[6] = '\0';
+ 
+ 	strncpy(packet_hdr.version, VERSION, 32);
+ 	packet_hdr.version[32] = '\0';
+ 
+ 	packet_hdr.function = 1;
+ 
+ 	strncpy(packet_hdr.destination, destination, 255);
+ 	packet_hdr.destination[255] = '\0';
+ 
+ 	strncpy(packet_hdr.agent, source, 255);
+ 	packet_hdr.agent[255] = '\0';
+ 
+ 	strncpy(packet_hdr.data.trap.severity, severity, 255);
+ 	packet_hdr.data.trap.severity[255] = '\0';
+ 
+ 	strncpy(packet_hdr.data.trap.subsystem, subsystem, 255);
+ 	packet_hdr.data.trap.subsystem[255] = '\0';

! 	strncpy(packet_hdr.data.trap.message, message, 1023);
! 	packet_hdr.data.trap.message[1023] = '\0';

! 	write(sock, &packet_hdr, sizeof(struct benson_header));
  	close(sock);
  	return 0;

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

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

benson-commit — Benson Commit Mailing List