[srvx-commits] CVS: services/src opserv.c,1.187.2.47,1.187.2.48 sockcheck.c,1.54.2.24,1.54.2.25 sockcheck.h,1.6.4.1,1.6.4.2

[Miles P. <pet...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv27047

Modified Files:
      Tag: rel-1_0
	opserv.c sockcheck.c sockcheck.h 
Log Message:
added cached_ip_count to stats struct


Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.187.2.47
retrieving revision 1.187.2.48
diff -C2 -r1.187.2.47 -r1.187.2.48
*** opserv.c	2001/08/18 00:55:03	1.187.2.47
--- opserv.c	2001/08/18 02:24:13	1.187.2.48
***************
*** 185,189 ****
  #define OSMSG_NO_LAST_WRITE     "Last Database Write: Never"
  #define OSMSG_LAST_WRITE        "Last Database Write: %s Ago"
! #define OSMSG_SOCKCHECK_STATS	"Since booting, I have checked %d clients for illicit proxies, and detected %d proxy hosts.\nI am currently checking %d clients (out of %d max) and have a backlog of %d more to start on.\nI know how to detect %d kinds of proxies."
  #define OSMSG_UNKNOWN_STATS	"Unknown statistics type `%s'"
  #define OSMSG_ADDRESS_QUEUED	"`%s' is now queued to be proxy-checked."
--- 185,189 ----
  #define OSMSG_NO_LAST_WRITE     "Last Database Write: Never"
  #define OSMSG_LAST_WRITE        "Last Database Write: %s Ago"
! #define OSMSG_SOCKCHECK_STATS	"Since booting, I have checked %d clients for illicit proxies, and detected %d proxy hosts.\nI am currently checking %d clients (out of %d max) and have a backlog of %d more to start on.\nI currently have %d hosts cached.\nI know how to detect %d kinds of proxies."
  #define OSMSG_UNKNOWN_STATS	"Unknown statistics type `%s'"
  #define OSMSG_ADDRESS_QUEUED	"`%s' is now queued to be proxy-checked."
***************
*** 1632,1636 ****
  		  stats.failed_ip_count, stats.checking_ip_count,
  		  stats.checking_ip_max, stats.pending_ip_count,
! 		  stats.test_count);
  #else
      opserv_notice(user, OSMSG_MISSING_SUPPORT);
--- 1632,1636 ----
  		  stats.failed_ip_count, stats.checking_ip_count,
  		  stats.checking_ip_max, stats.pending_ip_count,
! 		  stats.cached_ip_count, stats.test_count);
  #else
      opserv_notice(user, OSMSG_MISSING_SUPPORT);

Index: sockcheck.c
===================================================================
RCS file: /cvsroot/srvx/services/src/sockcheck.c,v
retrieving revision 1.54.2.24
retrieving revision 1.54.2.25
diff -C2 -r1.54.2.24 -r1.54.2.25
*** sockcheck.c	2001/08/15 03:21:38	1.54.2.24
--- sockcheck.c	2001/08/18 02:24:13	1.54.2.25
***************
*** 1257,1260 ****
--- 1257,1261 ----
      stats->pending_ip_count = pending_ip_list->used;
      stats->test_count = tests ? tests->used : 0;
+     stats->cached_ip_count = dict_size(checked_ip_dict);
  }
  

Index: sockcheck.h
===================================================================
RCS file: /cvsroot/srvx/services/src/sockcheck.h,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -C2 -r1.6.4.1 -r1.6.4.2
*** sockcheck.h	2001/03/29 00:20:52	1.6.4.1
--- sockcheck.h	2001/08/18 02:24:13	1.6.4.2
***************
*** 29,32 ****
--- 29,33 ----
      unsigned int pending_ip_count;
      unsigned int test_count;
+     unsigned int cached_ip_count;
  };