[Benson-commit] CVS: benson3/src/network Makefile.in,1.11,1.12 network.h,1.7,1.8 network_listener.c,1.6,1.7 network_master.c,1.6,1.7 network_utils.c,1.5,1.6 v31_network_client.c,1.5,1.6 v31_network_request.c,1.8,1.9 v31_request.h,1.3,1.4

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

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

Modified Files:
	Makefile.in network.h network_listener.c network_master.c 
	network_utils.c v31_network_client.c v31_network_request.c 
	v31_request.h 
Log Message:
Fixed a whole lot of warnings.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Makefile.in	8 Oct 2003 02:53:53 -0000	1.11
--- Makefile.in	8 Nov 2003 20:43:20 -0000	1.12
***************
*** 23,28 ****
  $(LIBNETWORK): ../../config.h
  
! libnetclient.a: v31_network_client.o
! 	$(AR) rv $@ v31_network_client.o network_utils.o
  	$(RANLIB) $@
  
--- 23,28 ----
  $(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) $@
  
***************
*** 30,39 ****
  	$(CC) -shared -o libnetclient.so v31_network_client.o network_utils.o $(LD_FLAGS) $(LIBS)
  
! libnetwork.a: $(LIBNETWORK) v31_network_request.o
! 	$(AR) rv $@ $(LIBNETWORK) v31_network_request.o
  	$(RANLIB) $@
  
  v31_network_request.o:
  	$(CC) $(CFLAGS) $(PERL_CFLAGS) $(CPPFLAGS) -c v31_network_request.c
  
  clean:
--- 30,42 ----
  	$(CC) -shared -o libnetclient.so v31_network_client.o network_utils.o $(LD_FLAGS) $(LIBS)
  
! libnetwork.a: $(LIBNETWORK) v31_network_request.o v32_network_request.o
! 	$(AR) rv $@ $(LIBNETWORK) v31_network_request.o v32_network_request.o
  	$(RANLIB) $@
  
  v31_network_request.o:
  	$(CC) $(CFLAGS) $(PERL_CFLAGS) $(CPPFLAGS) -c v31_network_request.c
+ 
+ v32_network_request.o:
+ 	$(CC) $(CFLAGS) $(PERL_CFLAGS) $(CPPFLAGS) -c v32_network_request.c
  
  clean:

Index: network.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** network.h	8 Oct 2003 03:15:02 -0000	1.7
--- network.h	8 Nov 2003 20:43:20 -0000	1.8
***************
*** 5,8 ****
--- 5,9 ----
  #include <stdlib.h>
  #include <signal.h>
+ #include <unistd.h>
  #include <sys/types.h>
  #include <sys/socket.h>
***************
*** 13,18 ****
--- 14,21 ----
  #include <errno.h>
  #include <assert.h>
+ #include <string.h>
  #include "config.h"
  #include "v31_request.h"
+ #include "v32_request.h"
  
  #define ID_MAXSIZE ID_MAXSIZE_v31
***************
*** 57,65 ****
  #define ERROR -1
  
  extern int open_network_listener(bn_netlisten_ctx *current_ctx);
  extern int close_network_listener(bn_netlisten_ctx *current_ctx);
  extern int network_listener_accept(bn_netlisten_ctx *current_ctx, bn_netaccept_ctx *connect_ctx);
  extern int network_listener_accept_cleanup(bn_netaccept_ctx *connect_ctx);
! int ibn_tcp_connect(bn_netconnect_ctx *current_ctx);
! 
  #endif
--- 60,73 ----
  #define ERROR -1
  
+ extern int network_master(void);
  extern int open_network_listener(bn_netlisten_ctx *current_ctx);
  extern int close_network_listener(bn_netlisten_ctx *current_ctx);
  extern int network_listener_accept(bn_netlisten_ctx *current_ctx, bn_netaccept_ctx *connect_ctx);
  extern int network_listener_accept_cleanup(bn_netaccept_ctx *connect_ctx);
! extern int network_header_parser(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header);
! extern int network_request_parser_v31(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header);
! extern int network_request_parser_v32(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header);
! extern void safe_strncpy(char *dest, char *src, int max_size);
! extern int ibn_tcp_connect(bn_netconnect_ctx *current_ctx);
! extern int ibn_tcp_listen(bn_netlisten_ctx *current_ctx);
  #endif

Index: network_listener.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_listener.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** network_listener.c	11 May 2003 08:01:12 -0000	1.6
--- network_listener.c	8 Nov 2003 20:43:20 -0000	1.7
***************
*** 26,30 ****
  int network_listener_accept(bn_netlisten_ctx *current_ctx, bn_netaccept_ctx *conn_ctx)
  {
- 	int rc = 0;
  	socklen_t peer_addr_size = (socklen_t)sizeof(struct sockaddr);
  
--- 26,29 ----
***************
*** 77,81 ****
  {
  	int bytes_read = 0;
- 	int function = 0;
  
  	assert(conn_ctx != NULL);
--- 76,79 ----

Index: network_master.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_master.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** network_master.c	28 Sep 2003 22:26:28 -0000	1.6
--- network_master.c	8 Nov 2003 20:43:20 -0000	1.7
***************
*** 23,27 ****
  		network_listener_accept(&main_ctx, &connection_ctx);
  
! 		if(pid=fork()) {
  			network_listener_accept_cleanup(&connection_ctx);
  		} else {
--- 23,27 ----
  		network_listener_accept(&main_ctx, &connection_ctx);
  
! 		if((pid=fork())) {
  			network_listener_accept_cleanup(&connection_ctx);
  		} else {
***************
*** 35,42 ****
  			if((char *)strstr(request_header.version, "3.2") != NULL) {
  				fprintf(stderr, "version %s is a 3.2 compatible protocol\n", request_header.version);
! //				if((rc = network_request_parser_v32(&connection_ctx, &request_header)) == ERROR) {
  					fprintf(stderr, "network_request_parser_v32(): An error occured while trying to parse the request.\n");
  					goto CLEANUP;
! //				}
  			} else if((char *)strstr(request_header.version, "3.1") != NULL) {
  				fprintf(stderr, "version %s is a 3.1 compatible protocol\n", request_header.version);
--- 35,42 ----
  			if((char *)strstr(request_header.version, "3.2") != NULL) {
  				fprintf(stderr, "version %s is a 3.2 compatible protocol\n", request_header.version);
! 				if((rc = network_request_parser_v32(&connection_ctx, &request_header)) == ERROR) {
  					fprintf(stderr, "network_request_parser_v32(): An error occured while trying to parse the request.\n");
  					goto CLEANUP;
! 				}
  			} else if((char *)strstr(request_header.version, "3.1") != NULL) {
  				fprintf(stderr, "version %s is a 3.1 compatible protocol\n", request_header.version);

Index: network_utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_utils.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** network_utils.c	8 Oct 2003 01:41:51 -0000	1.5
--- network_utils.c	8 Nov 2003 20:43:20 -0000	1.6
***************
*** 5,9 ****
  	struct hostent *hp;
  	struct sockaddr_in addr;
- 	int sock;
  
  	if(!(hp=gethostbyname(current_ctx->destination))) {
--- 5,8 ----
***************
*** 64,67 ****
  		current_size = max_size;
  	}
! 	snprintf(dest, current_size, "%s\0", src);
  }
--- 63,66 ----
  		current_size = max_size;
  	}
! 	snprintf(dest, current_size, "%s", src);
  }

Index: v31_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_client.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** v31_network_client.c	8 Oct 2003 03:15:02 -0000	1.5
--- v31_network_client.c	8 Nov 2003 20:43:20 -0000	1.6
***************
*** 21,26 ****
  	bn_netconnect_ctx connect_ctx;
  	struct benson_alertlist_response_v31 *alertlist_ptr;
- 	unsigned short total_alerts;
- 	unsigned int alertlist_size;
  	unsigned int total_num_alerts = 0;
  	
--- 21,24 ----

Index: v31_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** v31_network_request.c	29 Sep 2003 18:04:10 -0000	1.8
--- v31_network_request.c	8 Nov 2003 20:43:20 -0000	1.9
***************
*** 1,5 ****
  #include "network.h"
  #include "v31_request.h"
! #include <benson/perl_util.h>
  
  
--- 1,5 ----
  #include "network.h"
  #include "v31_request.h"
! #include "benson/perl_util.h"
  
  
***************
*** 16,25 ****
  	int rc;
  
! 	safe_insert(destination, req_pkt->inet.destination, DST_MAXSIZE_v31);
! 	safe_insert(agent, req_pkt->inet.agent, AGT_MAXSIZE_v31);
! 	safe_insert(severity, req_pkt->data.trap.severity, SEV_MAXSIZE_v31);
! 	safe_insert(subsystem, req_pkt->data.trap.subsystem, SUB_MAXSIZE_v31);
! 	safe_insert(message, req_pkt->data.trap.message, MSG_MAXSIZE_v31);
! 	safe_insert(status, "initial", STA_MAXSIZE_v31);
  
  	ENTER;
--- 16,25 ----
  	int rc;
  
! 	safe_strncpy(destination, req_pkt->inet.destination, DST_MAXSIZE_v31);
! 	safe_strncpy(agent, req_pkt->inet.agent, AGT_MAXSIZE_v31);
! 	safe_strncpy(severity, req_pkt->data.trap.severity, SEV_MAXSIZE_v31);
! 	safe_strncpy(subsystem, req_pkt->data.trap.subsystem, SUB_MAXSIZE_v31);
! 	safe_strncpy(message, req_pkt->data.trap.message, MSG_MAXSIZE_v31);
! 	safe_strncpy(status, "initial", STA_MAXSIZE_v31);
  
  	ENTER;
***************
*** 53,60 ****
  	SV *acknowledge_ref;
  	SV *rc;
- 	unsigned int rc_int;
  
! 	safe_insert(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
! 	safe_insert(status, "acknowledge", STA_MAXSIZE_v31);
  
  	ENTER;
--- 53,59 ----
  	SV *acknowledge_ref;
  	SV *rc;
  
! 	safe_strncpy(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
! 	safe_strncpy(status, "acknowledge", STA_MAXSIZE_v31);
  
  	ENTER;
***************
*** 83,90 ****
  	SV *acknowledge_ref;
  	SV *rc;
- 	unsigned int rc_int;
  
! 	safe_insert(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
! 	safe_insert(status, req_pkt->data.update_status.status, STA_MAXSIZE_v31);
  
  	ENTER;
--- 82,88 ----
  	SV *acknowledge_ref;
  	SV *rc;
  
! 	safe_strncpy(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
! 	safe_strncpy(status, req_pkt->data.update_status.status, STA_MAXSIZE_v31);
  
  	ENTER;
***************
*** 108,112 ****
  void *process_alertlist_v31 (bnet_req_v31 *req_pkt, SV *server_ref, bnet_resp_v31 *resp_hdr)
  {
- 	int max_num_alerts;
  	SV *result;
  	SV *alert;
--- 106,109 ----
***************
*** 115,119 ****
  	HV *fields;
  	AV *alerts;
- 	void *response_ptr;
  	bn_alertlist_response_v31 *resp_alerts_ptr;
  	int ctr = 0;
--- 112,115 ----
***************
*** 137,148 ****
  		bn_alertlist_response_v31 insert;
  		fields = (HV*)SvRV(alert);
! 		safe_insert(insert.identity, SvPVX(*hv_fetch(fields, "identity", 8, FALSE)), ID_MAXSIZE_v31);
! 		safe_insert(insert.inet.destination, SvPVX(*hv_fetch(fields, "destination", 11, FALSE)), DST_MAXSIZE_v31);
! 		safe_insert(insert.inet.agent, SvPVX(*hv_fetch(fields, "agent", 5, FALSE)), AGT_MAXSIZE_v31);
! 		safe_insert(insert.trap.severity, SvPVX(*hv_fetch(fields, "severity", 8, FALSE)), SEV_MAXSIZE_v31);
! 		safe_insert(insert.trap.subsystem, SvPVX(*hv_fetch(fields, "subsystem", 9, FALSE)), SUB_MAXSIZE_v31);
! 		safe_insert(insert.trap.message, SvPVX(*hv_fetch(fields, "message", 7, FALSE)), MSG_MAXSIZE_v31);
! 		safe_insert(insert.misc.updated, SvPVX(*hv_fetch(fields, "updated", 7, FALSE)), UPD_MAXSIZE_v31);
! 		safe_insert(insert.misc.status, SvPVX(*hv_fetch(fields, "status", 6, FALSE)), STA_MAXSIZE_v31);
  		memcpy(&resp_alerts_ptr[ctr++], &insert, sizeof(bn_alertlist_response_v31));
  	}
--- 133,144 ----
  		bn_alertlist_response_v31 insert;
  		fields = (HV*)SvRV(alert);
! 		safe_strncpy(insert.identity, SvPVX(*hv_fetch(fields, "identity", 8, FALSE)), ID_MAXSIZE_v31);
! 		safe_strncpy(insert.inet.destination, SvPVX(*hv_fetch(fields, "destination", 11, FALSE)), DST_MAXSIZE_v31);
! 		safe_strncpy(insert.inet.agent, SvPVX(*hv_fetch(fields, "agent", 5, FALSE)), AGT_MAXSIZE_v31);
! 		safe_strncpy(insert.trap.severity, SvPVX(*hv_fetch(fields, "severity", 8, FALSE)), SEV_MAXSIZE_v31);
! 		safe_strncpy(insert.trap.subsystem, SvPVX(*hv_fetch(fields, "subsystem", 9, FALSE)), SUB_MAXSIZE_v31);
! 		safe_strncpy(insert.trap.message, SvPVX(*hv_fetch(fields, "message", 7, FALSE)), MSG_MAXSIZE_v31);
! 		safe_strncpy(insert.misc.updated, SvPVX(*hv_fetch(fields, "updated", 7, FALSE)), UPD_MAXSIZE_v31);
! 		safe_strncpy(insert.misc.status, SvPVX(*hv_fetch(fields, "status", 6, FALSE)), STA_MAXSIZE_v31);
  		memcpy(&resp_alerts_ptr[ctr++], &insert, sizeof(bn_alertlist_response_v31));
  	}

Index: v31_request.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_request.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** v31_request.h	28 Sep 2003 22:26:28 -0000	1.3
--- v31_request.h	8 Nov 2003 20:43:20 -0000	1.4
***************
*** 108,111 ****
--- 108,115 ----
  } bnet_ack_v31;
  
+ extern int bn_send_trap (char *destination, int port, char *source, char *severity, char *subsystem, char *message);
+ extern struct benson_alertlist_response_v31 *bn_alertlist (char *destination, int port, char *source, int *buffer_size);
+ 
+ 
  #endif /* __v31_request_h */