[Benson-commit] CVS: benson3/src/network Makefile.in,1.9,1.10 network_utils.c,1.4,1.5 v31_network_client.c,1.2,1.3

[Bob T. <bt...@us...>]

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

Modified Files:
	Makefile.in network_utils.c v31_network_client.c 
Log Message:
Here goes, lets see if this works over on unix now.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.in	7 Oct 2003 01:11:55 -0000	1.9
--- Makefile.in	8 Oct 2003 01:41:51 -0000	1.10
***************
*** 24,32 ****
  
  libnetclient.a: v31_network_client.o
! 	$(AR) rv $@ v31_network_client.o
  	$(RANLIB) $@
  
  libnetclient.so: libnetclient.a
! 	$(CC) -shared -o libnetclient.so v31_network_client.o $(LD_FLAGS) $(LIBS)
  
  libnetwork.a: $(LIBNETWORK) v31_network_request.o
--- 24,32 ----
  
  libnetclient.a: v31_network_client.o
! 	$(AR) rv $@ v31_network_client.o network_utils.o
  	$(RANLIB) $@
  
  libnetclient.so: libnetclient.a
! 	$(CC) -shared -o libnetclient.so v31_network_client.o network_utils.o $(LD_FLAGS) $(LIBS)
  
  libnetwork.a: $(LIBNETWORK) v31_network_request.o

Index: network_utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** network_utils.c	12 May 2003 03:28:56 -0000	1.4
--- network_utils.c	8 Oct 2003 01:41:51 -0000	1.5
***************
*** 56,57 ****
--- 56,67 ----
  	return GOOD;
  }
+ 
+ void safe_strncpy(char *dest, char *src, int max_size)
+ {
+ 	int current_size = sizeof(src);
+ 	if(max_size >= current_size) {
+ 		/* truncate it, who cares it's just user data */
+ 		current_size = max_size;
+ 	}
+ 	snprintf(dest, current_size, "%s\0", src);
+ }

Index: v31_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_client.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** v31_network_client.c	30 Sep 2003 03:55:19 -0000	1.2
--- v31_network_client.c	8 Oct 2003 01:41:51 -0000	1.3
***************
*** 44,51 ****
  	/* Build alertlist request */
  	req_pkt.function = htons(BENSON_ALERTLIST_v31);
! 	safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! 	safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! 	safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! 	safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
  
  	/* Write the data, check for errors, and flush the buffer */
--- 44,51 ----
  	/* Build alertlist request */
  	req_pkt.function = htons(BENSON_ALERTLIST_v31);
! 	safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
  
  	/* Write the data, check for errors, and flush the buffer */
***************
*** 118,128 ****
  
  	req_pkt.function = htons(BENSON_TRAP_v31);
! 	safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! 	safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! 	safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! 	safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! 	safe_insert(req_pkt.data.trap.severity, severity, SEV_MAXSIZE_v31);
! 	safe_insert(req_pkt.data.trap.subsystem, subsystem, SUB_MAXSIZE_v31);
! 	safe_insert(req_pkt.data.trap.message, message, MSG_MAXSIZE_v31);
  
  	rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
--- 118,128 ----
  
  	req_pkt.function = htons(BENSON_TRAP_v31);
! 	safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.data.trap.severity, severity, SEV_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.data.trap.subsystem, subsystem, SUB_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.data.trap.message, message, MSG_MAXSIZE_v31);
  
  	rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
***************
*** 181,189 ****
  
  	req_pkt.function = htons(BENSON_ACKNOWLEDGE_v31);
! 	safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! 	safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! 	safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! 	safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! 	safe_insert(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v31);
  
  	rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
--- 181,189 ----
  
  	req_pkt.function = htons(BENSON_ACKNOWLEDGE_v31);
! 	safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v31);
  
  	rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
***************
*** 235,244 ****
  
  	req_pkt.function = htons(BENSON_UPDATE_STATUS_v31);
! 	safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! 	safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! 	safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! 	safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! 	safe_insert(req_pkt.data.update_status.identity, identity, ID_MAXSIZE_v31);
! 	safe_insert(req_pkt.data.update_status.status, status, STA_MAXSIZE_v31);
  
  	printf("%s %s\n", identity, status);
--- 235,244 ----
  
  	req_pkt.function = htons(BENSON_UPDATE_STATUS_v31);
! 	safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.data.update_status.identity, identity, ID_MAXSIZE_v31);
! 	safe_strncpy(req_pkt.data.update_status.status, status, STA_MAXSIZE_v31);
  
  	printf("%s %s\n", identity, status);