Cleanups: Shuffle ident API into its own header file

This reduces a few more links to protos.h by moving the small ident.c
requirements into ident.h in preparation for modulising that component.

diff --git a/src/ACLIdent.cc b/src/ACLIdent.cc
index da842b0824eec2ec1c8c67fa6cc0b6c4fbf3c081..a7298e2b4f7c09f6472d2a67c9c9020ff700560f 100644 (file)
--- a/src/ACLIdent.cc
+++ b/src/ACLIdent.cc
@@ -41,6 +41,7 @@
 #include "ACLRegexData.h"
 #include "ACLUserData.h"
 #include "client_side.h"
+#include "ident.h"
 
 ACLIdent::~ACLIdent()
 {

diff --git a/src/client_side.cc b/src/client_side.cc
index 71e06ce4ca2e435bb383625f18c6773f252e2c6b..af5cb250f7e322b0a7b6d916169641b095ef352b 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -93,6 +93,7 @@
 #include "HttpHdrContRange.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
+#include "ident.h"
 #include "MemObject.h"
 #include "fde.h"
 #include "client_side_request.h"

diff --git a/src/ident.cc b/src/ident.cc
index d7acd6fab0b5938fb4bc00ef8cea9c9ed7bb1914..5e9b6836b98fea0feaace1b621439587bba8d216 100644 (file)
--- a/src/ident.cc
+++ b/src/ident.cc
@@ -1,4 +1,3 @@
-
 /*
  * $Id: ident.cc,v 1.78 2007/12/14 23:11:47 amosjeffries Exp $
  *
@@ -34,6 +33,7 @@
  */
 
 #include "squid.h"
+#include "ident.h"
 #include "comm.h"
 #include "MemBuf.h"
 

diff --git a/src/ident.h b/src/ident.h
new file mode 100644 (file)
index 0000000..a00043e
--- /dev/null
+++ b/src/ident.h
@@ -0,0 +1,28 @@
+/*
+ * $Id$
+ */
+#ifndef SQUID_IDENT_H
+#define SQUID_IDENT_H
+
+/*
+ \defgroup IdentAPI Ident Lookup API
+ \ingroup SquidComponents
+ *
+ */
+
+#include "config.h"
+
+#if USE_IDENT
+
+#include "cbdata.h"
+
+class IPAddress;
+
+/// \ingroup IdentAPI
+SQUIDCEXTERN void identStart(IPAddress &me, IPAddress &my_peer, IDCB * callback, void *cbdata);
+
+/// \ingroup IdentAPI
+SQUIDCEXTERN void identInit(void);
+
+#endif /* USE_IDENT */
+#endif /* SQUID_IDENT_H */

diff --git a/src/main.cc b/src/main.cc
index 006a9e6e98f271151663504ed6b42439d6fe1634..6310e4bf1799386d3aa00e3e63af559ed8f0f128 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -43,6 +43,7 @@
 #include "ExternalACL.h"
 #include "Store.h"
 #include "ICP.h"
+#include "ident.h"
 #include "HttpReply.h"
 #include "pconn.h"
 #include "Mem.h"

diff --git a/src/protos.h b/src/protos.h
index 5b338ebd68ca28e93c336702667798139d66329c..f91473f46d0a2ea6af872b929df72ddff9603c65 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -476,14 +476,6 @@ extern void reconfigure(int);
 extern void start_announce(void *unused);
 extern void waisStart(FwdState *);
 
-/* ident.c */
-#if USE_IDENT
-
-SQUIDCEXTERN void identStart(IPAddress &me, IPAddress &my_peer,
-                             IDCB * callback, void *cbdata);
-SQUIDCEXTERN void identInit(void);
-#endif
-
 SQUIDCEXTERN void statInit(void);
 extern void statRegisterWithCacheManager(CacheManager & manager);
 SQUIDCEXTERN void statFreeMemory(void);