Cleanups: Shuffle ClientInfo into a class

 - upgrade struct+typedef to public class
 - gets its own header as pre-requisite to Logs SourceLayout

diff --git a/src/ClientInfo.h b/src/ClientInfo.h
new file mode 100644 (file)
index 0000000..0d91f76
--- /dev/null
+++ b/src/ClientInfo.h
@@ -0,0 +1,29 @@
+#ifndef SQUID__SRC_CLIENTINFO_H
+#define SQUID__SRC_CLIENTINFO_H
+
+#include "ip/IpAddress.h"
+
+class ClientInfo {
+public:
+    hash_link hash;             /* must be first */
+
+    IpAddress addr;
+
+    struct {
+        int result_hist[LOG_TYPE_MAX];
+        int n_requests;
+        kb_t kbytes_in;
+        kb_t kbytes_out;
+        kb_t hit_kbytes_out;
+    } Http, Icp;
+
+    struct {
+        time_t time;
+        int n_req;
+        int n_denied;
+    } cutoff;
+    int n_established;          /* number of current established connections */
+    time_t last_seen;
+};
+
+#endif

diff --git a/src/client_db.cc b/src/client_db.cc
index 954ccb3fe973ef1257d419ce8663bada240a2331..855ae0db68d6de45cdac1deff4b554fb247784f6 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  *
@@ -36,6 +35,7 @@
 #include "squid.h"
 #include "event.h"
 #include "CacheManager.h"
+#include "ClientInfo.h"
 #include "SquidTime.h"
 #include "Store.h"
 

diff --git a/src/mem.cc b/src/mem.cc
index 5d2797ac89ed95709236bc27a53b443b8bb50812..34c462c54780cbd867403525ab8c29c9b761ed0b 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  *
@@ -40,6 +39,7 @@
 
 #include "event.h"
 #include "CacheManager.h"
+#include "ClientInfo.h"
 #include "Mem.h"
 #include "memMeter.h"
 #include "Store.h"

diff --git a/src/structs.h b/src/structs.h
index d4b9a9f24f9b7358a183c9fa4b18949b364494c1..4b0b564def52d8f39fa5cd127c9a5aeb3b0c90b6 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1255,28 +1255,6 @@ struct _HttpHeaderStat {
 };
 
 
-struct _ClientInfo {
-    hash_link hash;            /* must be first */
-
-    IpAddress addr;
-
-    struct {
-        int result_hist[LOG_TYPE_MAX];
-        int n_requests;
-        kb_t kbytes_in;
-        kb_t kbytes_out;
-        kb_t hit_kbytes_out;
-    } Http, Icp;
-
-    struct {
-        time_t time;
-        int n_req;
-        int n_denied;
-    } cutoff;
-    int n_established;         /* number of current established connections */
-    time_t last_seen;
-};
-
 struct _CacheDigest {
     /* public, read-only */
     char *mask;                        /* bit mask */

diff --git a/src/typedefs.h b/src/typedefs.h
index 0452f7b2aa30612f0f88e9c3bacf5d383e2192bd..474864f278685780542eebed4a3d8874ac6a76fa 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -165,8 +165,6 @@ typedef struct _storeSwapLogData storeSwapLogData;
 
 typedef struct _StatHist StatHist;
 
-typedef struct _ClientInfo ClientInfo;
-
 typedef struct _cd_guess_stats cd_guess_stats;
 
 typedef struct _CacheDigest CacheDigest;