[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

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

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