From: Alex Rousskov Date: Sun, 8 Mar 2009 19:34:36 +0000 (-0600) Subject: Moved src/ACL* and a few related files into src/acl/. X-Git-Tag: SQUID_3_2_0_1~1111^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ad6361537890aadfc2c1383c0b80d3f024bcdae;p=thirdparty%2Fsquid.git Moved src/ACL* and a few related files into src/acl/. Renamed ACL source files from ACLFoo.{cc,cci,h} to Foo.{cc,cci,h}. Many targets in src/Makefile.am depended on selected ACL ACL*cc and related sources. These targets depend on acl/* libraries now. As a part of this cleanup and reorganization, the number of ufsdump sources went from about 160 to about 20. Context: SourceLayout: acl/, take 1 --- diff --git a/src/DelayBucket.cc b/src/DelayBucket.cc index 8fd4ac9ce4..1651ff0230 100644 --- a/src/DelayBucket.cc +++ b/src/DelayBucket.cc @@ -49,8 +49,8 @@ #include "StoreClient.h" #include "MemObject.h" #include "client_side_request.h" -#include "ACLChecklist.h" -#include "ACL.h" +#include "acl/Checklist.h" +#include "acl/Acl.h" #include "ConfigParser.h" #include "DelayId.h" #include "Array.h" diff --git a/src/DelayConfig.cc b/src/DelayConfig.cc index a5efa35b71..fe2aefca56 100644 --- a/src/DelayConfig.cc +++ b/src/DelayConfig.cc @@ -46,7 +46,8 @@ #include "DelayPools.h" #include "DelayPool.h" #include "Store.h" -#include "ACL.h" +#include "acl/Acl.h" +#include "acl/Gadgets.h" void DelayConfig::parsePoolCount() diff --git a/src/DelayPool.cc b/src/DelayPool.cc index 45b3096bec..d6666c92ff 100644 --- a/src/DelayPool.cc +++ b/src/DelayPool.cc @@ -41,7 +41,8 @@ #if DELAY_POOLS #include "DelayPool.h" #include "CommonPool.h" -#include "ACL.h" +#include "acl/Acl.h" +#include "acl/Gadgets.h" #include "Store.h" DelayPool::DelayPool() : pool (NULL), access (NULL) diff --git a/src/DelayTagged.h b/src/DelayTagged.h index 204f1d899d..b75994fca3 100644 --- a/src/DelayTagged.h +++ b/src/DelayTagged.h @@ -41,7 +41,7 @@ #if DELAY_POOLS #include "squid.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "CompositePoolNode.h" #include "DelayIdComposite.h" #include "DelayBucket.h" diff --git a/src/DelayUser.h b/src/DelayUser.h index 604a5caa0a..885389e4d5 100644 --- a/src/DelayUser.h +++ b/src/DelayUser.h @@ -41,7 +41,7 @@ #if DELAY_POOLS #include "squid.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "CompositePoolNode.h" #include "DelayIdComposite.h" #include "DelayBucket.h" diff --git a/src/ExternalACL.h b/src/ExternalACL.h index 11c1cbf9d7..0334312aea 100644 --- a/src/ExternalACL.h +++ b/src/ExternalACL.h @@ -34,7 +34,7 @@ #ifndef SQUID_EXTERNALACL_H #define SQUID_EXTERNALACL_H -#include "ACLChecklist.h" +#include "acl/Checklist.h" class external_acl; @@ -53,7 +53,7 @@ private: /** \todo CLEANUP: kill this typedef. */ typedef struct _external_acl_data external_acl_data; -#include "ACL.h" +#include "acl/Acl.h" class ACLExternal : public ACL { diff --git a/src/Makefile.am b/src/Makefile.am index b7707ee162..0d24396c98 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,7 @@ LOADABLE_MODULES_SOURCES = \ TESTS=$(check_PROGRAMS) check_PROGRAMS= -SUBDIRS = base fs repl auth ip icmp +SUBDIRS = base acl fs repl auth ip icmp if USE_ADAPTATION SUBDIRS += adaptation @@ -132,14 +132,6 @@ UNLINKD = endif SSL_ALL_SOURCE = \ - ACLCertificateData.cc \ - ACLCertificateData.h \ - ACLCertificate.cc \ - ACLCertificate.h \ - ACLSslError.cc \ - ACLSslError.h \ - ACLSslErrorData.cc \ - ACLSslErrorData.h \ ssl_support.cc \ ssl_support.h @@ -181,20 +173,13 @@ else AIOPS_SOURCE = DiskIO/DiskThreads/aiops.cc endif -IDENT_ALL_SOURCE = ACLIdent.cc ACLIdent.h ident.cc ident.h +IDENT_ALL_SOURCE = ident.cc ident.h if ENABLE_IDENT IDENT_SOURCE = $(IDENT_ALL_SOURCE) else IDENT_SOURCE = endif -ARP_ACL_ALL_SOURCE = ACLARP.cc ACLARP.h -if ENABLE_ARP_ACL -ARP_ACL_SOURCE = $(ARP_ACL_ALL_SOURCE) -else -ARP_ACL_SOURCE = -endif - AM_CFLAGS = @SQUID_CFLAGS@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ @@ -205,7 +190,11 @@ noinst_LTLIBRARIES = libsquid.la # libraries used by many targets COMMON_LIBS = \ libsquid.la \ - auth/libauth.a \ + auth/libacls.la \ + acl/libacls.la \ + acl/libstate.la \ + auth/libauth.la \ + acl/libapi.la \ base/libbase.la \ ip/libip.la @@ -278,7 +267,6 @@ DiskIO/DiskIOModules_gen.cc: Makefile EXTRA_squid_SOURCES = \ $(AIO_WIN32_ALL_SOURCES) \ $(all_AUTHMODULES) \ - $(ARP_ACL_ALL_SOURCE) \ ConfigOption.h \ $(DELAY_POOL_ALL_SOURCE) \ dns.cc \ @@ -301,89 +289,6 @@ EXTRA_squid_SOURCES = \ DiskIO/DiskThreads/aiops.cc \ DiskIO/DiskThreads/aiops_win32.cc -squid_ACLSOURCES = \ - $(ARP_ACL_SOURCE) \ - ACLASN.cc \ - ACLASN.h \ - ACLDestinationASN.h \ - ACLSourceASN.h \ - ACLBrowser.cc \ - ACLBrowser.h \ - ACLData.h \ - ACLDestinationDomain.cc \ - ACLDestinationDomain.h \ - ACLDestinationIP.cc \ - ACLDestinationIP.h \ - ACLDomainData.h \ - ACLDomainData.cc \ - ACLExtUser.h \ - ACLExtUser.cc \ - ACLHTTPHeaderData.h \ - ACLHTTPHeaderData.cc \ - ACLHTTPStatus.h \ - ACLHTTPStatus.cc \ - ACLIntRange.cc \ - ACLIntRange.h \ - ACLIP.cc \ - ACLIP.h \ - ACLMaxConnection.cc \ - ACLMaxConnection.h \ - ACLMaxUserIP.cc \ - ACLMaxUserIP.h \ - ACLMethod.cc \ - ACLMethod.h \ - ACLMethodData.cc \ - ACLMethodData.h \ - ACLMyIP.cc \ - ACLMyIP.h \ - ACLMyPort.cc \ - ACLMyPort.h \ - ACLMyPortName.cc \ - ACLMyPortName.h \ - ACLPeerName.cc \ - ACLPeerName.h \ - ACLProtocol.cc \ - ACLProtocol.h \ - ACLProtocolData.cc \ - ACLProtocolData.h \ - ACLProxyAuth.cc \ - ACLProxyAuth.h \ - ACLReferer.cc \ - ACLReferer.h \ - ACLRegexData.cc \ - ACLRegexData.h \ - ACLReplyHeaderStrategy.h \ - ACLReplyMIMEType.cc \ - ACLReplyMIMEType.h \ - ACLHTTPRepHeader.cc \ - ACLHTTPRepHeader.h \ - ACLHTTPReqHeader.cc \ - ACLHTTPReqHeader.h \ - ACLRequestHeaderStrategy.h \ - ACLRequestMIMEType.cc \ - ACLRequestMIMEType.h \ - ACLSourceDomain.cc \ - ACLSourceDomain.h \ - ACLSourceIP.cc \ - ACLSourceIP.h \ - ACLStrategised.cc \ - ACLStrategised.h \ - ACLStrategy.h \ - ACLStringData.cc \ - ACLStringData.h \ - ACLTime.cc \ - ACLTime.h \ - ACLTimeData.cc \ - ACLTimeData.h \ - ACLUrl.cc \ - ACLUrl.h \ - ACLUrlPath.cc \ - ACLUrlPath.h \ - ACLUrlPort.cc \ - ACLUrlPort.h \ - ACLUserData.cc \ - ACLUserData.h - squid_COMMSOURCES = \ comm_select.cc \ comm_select.h \ @@ -413,12 +318,6 @@ libsquid_la_SOURCES = \ squid_SOURCES = \ access_log.cc \ AccessLogEntry.h \ - acl.cc \ - acl_noncore.cc \ - ACL.h \ - ACLChecklist.cc \ - ACLChecklist.h \ - $(squid_ACLSOURCES) \ asn.cc \ AsyncCallQueue.cc \ AsyncCallQueue.h \ @@ -427,8 +326,6 @@ squid_SOURCES = \ AsyncJobCalls.h \ AsyncEngine.cc \ AsyncEngine.h \ - authenticate.cc \ - authenticate.h \ cache_cf.cc \ ProtoPort.cc \ ProtoPort.h \ @@ -472,6 +369,7 @@ squid_SOURCES = \ $(DNSSOURCE) \ enums.h \ errorpage.cc \ + errorpage.h \ $(ESI_SOURCE) \ ETag.cc \ event.cc \ @@ -637,7 +535,7 @@ squid_SOURCES = \ $(WIN32_SOURCE) \ $(WINSVC_SOURCE) -noinst_HEADERS = ACLChecklist.cci \ +noinst_HEADERS = \ client_side_request.cci \ MemBuf.cci \ MemBuf.h \ @@ -663,7 +561,6 @@ squid_LDADD = \ @REPL_OBJS@ \ @STORE_LIBS_TO_ADD@ \ @DISK_LIBS@ \ - @AUTH_LIBS_TO_ADD@ \ @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ @@ -677,8 +574,7 @@ squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @STORE_LIBS_TO_ADD@ \ @DISK_LIBS@ \ @DISK_LINKOBJS@ \ - @REPL_OBJS@ \ - @AUTH_LIBS_TO_ADD@ + @REPL_OBJS@ if USE_LOADABLE_MODULES squid_SOURCES += $(LOADABLE_MODULES_SOURCES) @@ -729,162 +625,20 @@ ufsdump_SOURCES = \ String.cc \ time.cc \ ufsdump.cc \ - url.cc \ - AsyncCallQueue.cc \ - AsyncCallQueue.h \ - AsyncCall.cc \ - AsyncCall.h \ - BodyPipe.cc \ - BodyPipe.h \ - ConfigParser.cc \ - store.cc \ - StoreFileSystem.cc \ - StoreSwapLogData.cc \ - StoreSwapLogData.h \ - access_log.cc \ - acl.cc \ - acl_noncore.cc \ - ACLChecklist.cc \ - ACLProxyAuth.cc \ - ACLUserData.cc \ - ACLRegexData.cc \ - ACLStringData.cc \ - authenticate.cc \ - cache_cf.cc \ - ProtoPort.cc \ - ProtoPort.h \ - cache_manager.cc \ - CacheDigest.cc \ - carp.cc \ - cbdata.cc \ - ChunkedCodingParser.cc \ - ChunkedCodingParser.h \ - client_db.cc \ - client_side.cc \ - client_side_reply.cc \ - client_side_request.cc \ - client_side_request.h \ - clientStream.cc \ - clientStream.h \ - CommIO.h \ - $(squid_COMMSOURCES) \ - ConfigOption.cc \ - defines.h \ - $(DELAY_POOL_SOURCE) \ - disk.cc \ dlink.h \ dlink.cc \ - $(DNSSOURCE) \ - enums.h \ - errorpage.cc \ - errorpage.h \ - $(ESI_SOURCE) \ - ETag.cc \ - event.cc \ - external_acl.cc \ - ExternalACLEntry.cc \ - fd.cc \ - fde.cc \ - fde.h \ - filemap.cc \ - forward.cc \ - forward.h \ - fqdncache.cc \ - ftp.cc \ - gopher.cc \ - helper.cc \ - $(HTCPSOURCE) \ - http.cc \ - HttpStatusLine.cc \ - HttpHdrCc.cc \ - HttpHdrRange.cc \ - HttpHdrSc.cc \ - HttpHdrScTarget.cc \ - HttpHdrContRange.cc \ - HttpHeader.cc \ - HttpHeaderTools.cc \ - HttpBody.cc \ - HttpMsg.cc \ - HttpReply.cc \ - HttpRequest.cc \ HttpRequestMethod.cc \ - icp_v2.cc \ - icp_v3.cc \ - $(IDENT_SOURCE) \ - internal.cc \ - $(IPC_SOURCE) \ - ipcache.cc \ - $(LEAKFINDERSOURCE) \ - list.cc \ - logfile.cc \ - mem_node.cc \ - mem_node.h \ - Mem.h \ - MemBuf.cc \ - MemObject.cc \ - MemObject.h \ - mime.cc \ - multicast.cc \ - neighbors.cc \ - Packer.cc \ - Parsing.cc \ - $(XPROF_STATS_SOURCE) \ - pconn.cc \ - peer_digest.cc \ - peer_select.cc \ - peer_sourcehash.cc \ - peer_userhash.cc \ - protos.h \ - redirect.cc \ - referer.cc \ - refresh.cc \ RemovalPolicy.cc \ - send-announce.cc \ - $(SNMP_SOURCE) \ squid.h \ - $(SSL_SOURCE) \ - tunnel.cc \ - Server.cc \ - SquidNew.cc \ - stat.cc \ - StatHist.cc \ - stmem.cc \ - store_io.cc \ - StoreIOBuffer.h \ - StoreIOState.cc \ - store_client.cc \ - StoreClient.h \ - store_digest.cc \ - store_dir.cc \ - store_log.cc \ - store_rebuild.cc \ - store_swapin.cc \ - store_swapmeta.cc \ - store_swapout.cc \ - structs.h \ - SwapDir.cc \ - tools.cc \ - typedefs.h \ - $(UNLINKDSOURCE) \ - URLScheme.cc \ - urn.cc \ - useragent.cc \ - wccp.cc \ - wccp2.cc \ - whois.cc \ - wordlist.cc \ $(WIN32_SOURCE) ufsdump_LDADD = \ $(COMMON_LIBS) \ - icmp/libicmp.la icmp/libicmp-core.la \ @XTRA_OBJS@ \ @REPL_OBJS@ \ @STORE_LIBS_TO_ADD@ \ - @AUTH_LIBS_TO_ADD@ \ @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ - ${ADAPTATION_LIBS} \ @SSLLIB@ \ -L$(top_builddir)/lib -lmiscutil \ @XTRA_LIBS@ \ @@ -894,14 +648,10 @@ ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @STORE_LIBS_TO_ADD@ \ @DISK_LIBS@ \ @DISK_LINKOBJS@ \ - @REPL_OBJS@ \ - @AUTH_LIBS_TO_ADD@ + @REPL_OBJS@ nodist_ufsdump_SOURCES = \ - repl_modules.cc \ - cf_parser.h \ - globals.cc \ - string_arrays.c + globals.cc BUILT_SOURCES = \ cf_gen_defines.h \ @@ -1163,13 +913,12 @@ CLEANFILES += testHeaders.c tests_testAuth_SOURCES = \ tests/testAuth.cc tests/testMain.cc tests/testAuth.h \ - authenticate.cc \ ConfigParser.cc \ tests/stub_acl.cc tests/stub_cache_cf.cc \ tests/stub_helper.cc cbdata.cc String.cc \ - tests/stub_store.cc HttpHeaderTools.cc HttpHeader.cc acl.cc mem.cc \ - MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \ - HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \ + tests/stub_store.cc HttpHeaderTools.cc HttpHeader.cc mem.cc \ + MemBuf.cc HttpHdrContRange.cc Packer.cc HttpHdrCc.cc HttpHdrSc.cc \ + HttpHdrScTarget.cc url.cc \ StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \ tests/stub_HttpRequest.cc tests/stub_DelayId.cc \ tests/stub_MemObject.cc mem_node.cc \ @@ -1194,22 +943,19 @@ nodist_tests_testAuth_SOURCES = \ tests_testAuth_LDADD= \ $(COMMON_LIBS) \ - @AUTH_LIBS_TO_ADD@ \ -L../lib -lmiscutil \ @REGEXLIB@ \ @SQUID_CPPUNIT_LIBS@ \ @SSLLIB@ tests_testAuth_LDFLAGS = $(LIBADD_DL) tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ - @AUTH_LIBS_TO_ADD@ \ @SQUID_CPPUNIT_LA@ ## Tests for the ACLMaxUserIP class ## acl needs wordlist. wordlist needs MemBug ## MemBuf needs mem, MemBuf needs event, ## event needs cbdata. -## ACLMaxUserUP needs authenticate.cc -## authenticate.cc needs libauth.la +## ACLMaxUserUP needs libauth.la ## ACLMaxUserIP needs ACLChecklist ## AuthUser request needs HttpHeader, which brings in ## ETag.cc \ @@ -1224,13 +970,6 @@ tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ ## StatHist.cc \ ## String.cc \ tests_testACLMaxUserIP_SOURCES= \ - acl.cc \ - ACLChecklist.cc \ - ACLMaxUserIP.cc \ - ACLProxyAuth.cc \ - ACLRegexData.cc \ - ACLUserData.cc \ - authenticate.cc \ cbdata.cc \ ConfigParser.cc \ ETag.cc \ @@ -1302,14 +1041,6 @@ tests_testCacheManager_SOURCES = \ tests/testMain.cc \ time.cc \ access_log.cc \ - acl.cc \ - acl_noncore.cc \ - ACLChecklist.cc \ - ACLProxyAuth.cc \ - ACLStringData.cc \ - ACLRegexData.cc \ - ACLUserData.cc \ - authenticate.cc \ BodyPipe.cc \ cache_manager.cc \ cache_cf.cc \ @@ -1452,10 +1183,11 @@ tests_testDiskIO_SOURCES = \ nodist_tests_testDiskIO_SOURCES= \ $(SWAP_TEST_GEN_SOURCES) tests_testDiskIO_LDADD = \ - $(COMMON_LIBS) \ - @DISK_LIBS@ \ $(SWAP_TEST_LDADD) \ + @DISK_LIBS@ \ + $(COMMON_LIBS) \ SquidConfig.o + tests_testDiskIO_LDFLAGS = $(LIBADD_DL) tests_testDiskIO_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @DISK_LIBS@ \ @@ -1478,14 +1210,6 @@ tests_testEvent_SOURCES = \ tests/testMain.cc \ time.cc \ access_log.cc \ - acl.cc \ - acl_noncore.cc \ - ACLChecklist.cc \ - ACLProxyAuth.cc \ - ACLStringData.cc \ - ACLRegexData.cc \ - ACLUserData.cc \ - authenticate.cc \ BodyPipe.cc \ cache_manager.cc \ cache_cf.cc \ @@ -1633,14 +1357,6 @@ tests_testEventLoop_SOURCES = \ tests/testMain.cc \ time.cc \ access_log.cc \ - acl.cc \ - acl_noncore.cc \ - ACLChecklist.cc \ - ACLProxyAuth.cc \ - ACLStringData.cc \ - ACLRegexData.cc \ - ACLUserData.cc \ - authenticate.cc \ BodyPipe.cc \ cache_manager.cc \ cache_cf.cc \ @@ -1776,14 +1492,6 @@ tests_testEventLoop_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ tests_test_http_range_SOURCES = \ tests/test_http_range.cc \ access_log.cc \ - acl.cc \ - acl_noncore.cc \ - ACLChecklist.cc \ - ACLProxyAuth.cc \ - ACLStringData.cc \ - ACLRegexData.cc \ - ACLUserData.cc \ - authenticate.cc \ BodyPipe.cc \ cache_cf.cc \ ProtoPort.cc \ @@ -1938,14 +1646,6 @@ tests_testHttpRequest_SOURCES = \ tests/testMain.cc \ time.cc \ access_log.cc \ - acl.cc \ - acl_noncore.cc \ - ACLChecklist.cc \ - ACLProxyAuth.cc \ - ACLStringData.cc \ - ACLRegexData.cc \ - ACLUserData.cc \ - authenticate.cc \ BodyPipe.cc \ cache_manager.cc \ cache_cf.cc \ @@ -2097,7 +1797,6 @@ STORE_TEST_SOURCES=\ Parsing.cc \ ConfigOption.cc \ SwapDir.cc \ - authenticate.cc \ tests/stub_acl.cc tests/stub_cache_cf.cc \ tests/stub_helper.cc cbdata.cc String.cc \ tests/stub_comm.cc \ @@ -2106,10 +1805,9 @@ STORE_TEST_SOURCES=\ mem_node.cc \ stmem.cc \ tests/stub_mime.cc \ - HttpHeaderTools.cc HttpHeader.cc acl.cc mem.cc \ - acl_noncore.cc \ - MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \ - HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \ + HttpHeaderTools.cc HttpHeader.cc mem.cc \ + MemBuf.cc HttpHdrContRange.cc Packer.cc HttpHdrCc.cc HttpHdrSc.cc \ + HttpHdrScTarget.cc url.cc \ StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \ tests/stub_HttpRequest.cc tests/stub_access_log.cc \ refresh.cc \ @@ -2223,6 +1921,7 @@ SWAP_TEST_LDADD = \ @REPL_OBJS@ \ @DISK_LIBS@ \ -L../lib -lmiscutil \ + acl/libapi.la \ @SQUID_CPPUNIT_LIBS@ SWAP_TEST_DS =\ $(top_builddir)/lib/libmiscutil.a \ @@ -2241,8 +1940,8 @@ tests_testUfs_SOURCES = \ nodist_tests_testUfs_SOURCES = \ $(SWAP_TEST_GEN_SOURCES) tests_testUfs_LDADD = \ - $(COMMON_LIBS) \ $(SWAP_TEST_LDADD) \ + $(COMMON_LIBS) \ @SSLLIB@ tests_testUfs_LDFLAGS = $(LIBADD_DL) tests_testUfs_DEPENDENCIES = \ @@ -2296,14 +1995,6 @@ tests_testURL_SOURCES = \ tests/testMain.cc \ time.cc \ access_log.cc \ - acl.cc \ - acl_noncore.cc \ - ACLChecklist.cc \ - ACLProxyAuth.cc \ - ACLStringData.cc \ - ACLRegexData.cc \ - ACLUserData.cc \ - authenticate.cc \ BodyPipe.cc \ cache_manager.cc \ cache_cf.cc \ diff --git a/src/access_log.cc b/src/access_log.cc index 9f7c1f2f37..7ff76f26af 100644 --- a/src/access_log.cc +++ b/src/access_log.cc @@ -39,7 +39,7 @@ // Store.h Required by configuration directives parsing/dumping only #include "Store.h" -#include "ACLChecklist.h" +#include "acl/Checklist.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/ACLARP.h b/src/acl/Arp.h similarity index 97% rename from src/ACLARP.h rename to src/acl/Arp.h index 51a7c0108b..68cce6c486 100644 --- a/src/ACLARP.h +++ b/src/acl/Arp.h @@ -35,8 +35,8 @@ #ifndef SQUID_ACLARP_H #define SQUID_ACLARP_H -#include "ACL.h" -#include "ACLChecklist.h" +#include "acl/Acl.h" +#include "acl/Checklist.h" #include "splay.h" /// \ingroup ACLAPI diff --git a/src/ACLASN.cc b/src/acl/Asn.cc similarity index 96% rename from src/ACLASN.cc rename to src/acl/Asn.cc index 78f0fe236a..63ba9cd77d 100644 --- a/src/ACLASN.cc +++ b/src/acl/Asn.cc @@ -34,6 +34,6 @@ */ #include "squid.h" -#include "ACLASN.h" -#include "ACLChecklist.h" +#include "acl/Asn.h" +#include "acl/Checklist.h" diff --git a/src/ACLASN.h b/src/acl/Asn.h similarity index 96% rename from src/ACLASN.h rename to src/acl/Asn.h index 1879be32ae..ca44df2682 100644 --- a/src/ACLASN.h +++ b/src/acl/Asn.h @@ -32,10 +32,10 @@ #ifndef SQUID_ACLASN_H #define SQUID_ACLASN_H -#include "ACLData.h" +#include "acl/Data.h" #include "CbDataList.h" -#include "ACLStrategised.h" -#include "ACLChecklist.h" +#include "acl/Strategised.h" +#include "acl/Checklist.h" #include "ip/IpAddress.h" SQUIDCEXTERN int asnMatchIp(CbDataList *, IpAddress &); diff --git a/src/ACLBrowser.cc b/src/acl/Browser.cc similarity index 95% rename from src/ACLBrowser.cc rename to src/acl/Browser.cc index 2ca7db8d8b..5854253ed7 100644 --- a/src/ACLBrowser.cc +++ b/src/acl/Browser.cc @@ -35,9 +35,9 @@ */ #include "squid.h" -#include "ACLChecklist.h" -#include "ACLBrowser.h" -#include "ACLRegexData.h" +#include "acl/Checklist.h" +#include "acl/Browser.h" +#include "acl/RegexData.h" /* explicit template instantiation required for some systems */ diff --git a/src/ACLBrowser.h b/src/acl/Browser.h similarity index 93% rename from src/ACLBrowser.h rename to src/acl/Browser.h index 998af7c821..2ef93b3ac2 100644 --- a/src/ACLBrowser.h +++ b/src/acl/Browser.h @@ -35,10 +35,10 @@ #ifndef SQUID_ACLBROWSER_H #define SQUID_ACLBROWSER_H -#include "ACL.h" -#include "ACLData.h" -#include "ACLRequestHeaderStrategy.h" -#include "ACLStrategised.h" +#include "acl/Acl.h" +#include "acl/Data.h" +#include "acl/RequestHeaderStrategy.h" +#include "acl/Strategised.h" /// \ingroup ACLAPI class ACLBrowser diff --git a/src/ACLCertificateData.cc b/src/acl/CertificateData.cc similarity index 97% rename from src/ACLCertificateData.cc rename to src/acl/CertificateData.cc index b74d8de515..9921732d6d 100644 --- a/src/ACLCertificateData.cc +++ b/src/acl/CertificateData.cc @@ -35,9 +35,8 @@ */ #include "squid.h" -#include "ACLCertificateData.h" -#include "authenticate.h" -#include "ACLChecklist.h" +#include "acl/CertificateData.h" +#include "acl/Checklist.h" #include "wordlist.h" ACLCertificateData::ACLCertificateData(SSLGETATTRIBUTE *sslStrategy) : attribute (NULL), values (), sslAttributeCall (sslStrategy) diff --git a/src/ACLCertificateData.h b/src/acl/CertificateData.h similarity index 96% rename from src/ACLCertificateData.h rename to src/acl/CertificateData.h index 4a2f6d7ab8..8000b4181f 100644 --- a/src/ACLCertificateData.h +++ b/src/acl/CertificateData.h @@ -36,10 +36,10 @@ #define SQUID_ACLCERTIFICATEDATA_H #include "splay.h" -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" #include "ssl_support.h" -#include "ACLStringData.h" +#include "acl/StringData.h" /// \ingroup ACLAPI class ACLCertificateData : public ACLData diff --git a/src/ACLData.h b/src/acl/Data.h similarity index 100% rename from src/ACLData.h rename to src/acl/Data.h diff --git a/src/ACLDestinationIP.h b/src/acl/DestinationIp.h similarity index 97% rename from src/ACLDestinationIP.h rename to src/acl/DestinationIp.h index 8d18545213..537b146429 100644 --- a/src/ACLDestinationIP.h +++ b/src/acl/DestinationIp.h @@ -35,8 +35,8 @@ #ifndef SQUID_ACLDESTINATIONIP_H #define SQUID_ACLDESTINATIONIP_H -#include "ACLChecklist.h" -#include "ACLIP.h" +#include "acl/Checklist.h" +#include "acl/Ip.h" class DestinationIPLookup : public ACLChecklist::AsyncState { diff --git a/src/ACLDomainData.cc b/src/acl/DomainData.cc similarity index 98% rename from src/ACLDomainData.cc rename to src/acl/DomainData.cc index 508cb2a0ec..320d42ed17 100644 --- a/src/ACLDomainData.cc +++ b/src/acl/DomainData.cc @@ -35,9 +35,8 @@ */ #include "squid.h" -#include "ACLDomainData.h" -#include "authenticate.h" -#include "ACLChecklist.h" +#include "acl/DomainData.h" +#include "acl/Checklist.h" #include "wordlist.h" template diff --git a/src/ACLDomainData.h b/src/acl/DomainData.h similarity index 97% rename from src/ACLDomainData.h rename to src/acl/DomainData.h index 724452102b..fbd0838f98 100644 --- a/src/ACLDomainData.h +++ b/src/acl/DomainData.h @@ -36,8 +36,8 @@ #define SQUID_ACLDOMAINDATA_H #include "splay.h" -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" /// \ingroup ACLAPI class ACLDomainData : public ACLData diff --git a/src/ACLExtUser.h b/src/acl/ExtUser.h similarity index 97% rename from src/ACLExtUser.h rename to src/acl/ExtUser.h index 3aa3773c34..fa4294f15a 100644 --- a/src/ACLExtUser.h +++ b/src/acl/ExtUser.h @@ -35,9 +35,9 @@ #ifndef SQUID_ACLIDENT_H #define SQUID_ACLIDENT_H -#include "ACL.h" -#include "ACLChecklist.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Checklist.h" +#include "acl/Data.h" /// \ingroup ACLAPI class ACLExtUser : public ACL diff --git a/src/ACLHTTPHeaderData.cc b/src/acl/HttpHeaderData.cc similarity index 96% rename from src/ACLHTTPHeaderData.cc rename to src/acl/HttpHeaderData.cc index a73f6dcbd0..e7d5f3df44 100644 --- a/src/ACLHTTPHeaderData.cc +++ b/src/acl/HttpHeaderData.cc @@ -35,11 +35,10 @@ */ #include "squid.h" -#include "ACLHTTPHeaderData.h" -#include "authenticate.h" -#include "ACLChecklist.h" -#include "ACL.h" -#include "ACLRegexData.h" +#include "acl/HttpHeaderData.h" +#include "acl/Checklist.h" +#include "acl/Acl.h" +#include "acl/RegexData.h" #include "wordlist.h" #include "ConfigParser.h" diff --git a/src/ACLHTTPHeaderData.h b/src/acl/HttpHeaderData.h similarity index 99% rename from src/ACLHTTPHeaderData.h rename to src/acl/HttpHeaderData.h index 960b2576dd..323906faeb 100644 --- a/src/ACLHTTPHeaderData.h +++ b/src/acl/HttpHeaderData.h @@ -38,7 +38,7 @@ class HttpHeader; class wordlist; /* becaue we inherit from it */ -#include "ACLData.h" +#include "acl/Data.h" /* for String field */ #include "SquidString.h" /* for http_hdr_type field */ diff --git a/src/ACLHTTPStatus.h b/src/acl/HttpStatus.h similarity index 98% rename from src/ACLHTTPStatus.h rename to src/acl/HttpStatus.h index 75af4323bb..85033d7e24 100644 --- a/src/ACLHTTPStatus.h +++ b/src/acl/HttpStatus.h @@ -35,8 +35,8 @@ #ifndef SQUID_ACLHTTPSTATUS_H #define SQUID_ACLHTTPSTATUS_H -#include "ACL.h" -#include "ACLChecklist.h" +#include "acl/Acl.h" +#include "acl/Checklist.h" #include "splay.h" /// \ingroup ACLAPI diff --git a/src/ACLIdent.h b/src/acl/Ident.h similarity index 97% rename from src/ACLIdent.h rename to src/acl/Ident.h index 3c563e9b6a..edbdf5a10f 100644 --- a/src/ACLIdent.h +++ b/src/acl/Ident.h @@ -35,7 +35,7 @@ #ifndef SQUID_ACLIDENT_H #define SQUID_ACLIDENT_H -#include "ACLChecklist.h" +#include "acl/Checklist.h" /// \ingroup ACLAPI class IdentLookup : public ACLChecklist::AsyncState @@ -51,8 +51,8 @@ private: }; -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" /// \ingroup ACLAPI class ACLIdent : public ACL diff --git a/src/ACLIntRange.cc b/src/acl/IntRange.cc similarity index 99% rename from src/ACLIntRange.cc rename to src/acl/IntRange.cc index 0482dba74a..7d0f3758c9 100644 --- a/src/ACLIntRange.cc +++ b/src/acl/IntRange.cc @@ -35,7 +35,7 @@ */ #include "squid.h" -#include "ACLIntRange.h" +#include "acl/IntRange.h" #include "wordlist.h" #include "Parsing.h" diff --git a/src/ACLIntRange.h b/src/acl/IntRange.h similarity index 98% rename from src/ACLIntRange.h rename to src/acl/IntRange.h index 9e75ecba7b..d4bb1a6f36 100644 --- a/src/ACLIntRange.h +++ b/src/acl/IntRange.h @@ -35,7 +35,7 @@ #ifndef SQUID_ACLINTRANGE_H #define SQUID_ACLINTRANGE_H -#include "ACLData.h" +#include "acl/Data.h" #include "CbDataList.h" #include "Range.h" diff --git a/src/ACLIP.cc b/src/acl/Ip.cc similarity index 99% rename from src/ACLIP.cc rename to src/acl/Ip.cc index c1372098eb..d135ab9a82 100644 --- a/src/ACLIP.cc +++ b/src/acl/Ip.cc @@ -34,8 +34,8 @@ */ #include "squid.h" -#include "ACLIP.h" -#include "ACLChecklist.h" +#include "acl/Ip.h" +#include "acl/Checklist.h" #include "MemBuf.h" #include "wordlist.h" diff --git a/src/ACLIP.h b/src/acl/Ip.h similarity index 99% rename from src/ACLIP.h rename to src/acl/Ip.h index 74f8975757..9ff8cea16e 100644 --- a/src/ACLIP.h +++ b/src/acl/Ip.h @@ -32,7 +32,7 @@ #ifndef SQUID_ACLIP_H #define SQUID_ACLIP_H -#include "ACL.h" +#include "acl/Acl.h" #include "splay.h" #include "ip/IpAddress.h" diff --git a/src/acl/Makefile.am b/src/acl/Makefile.am new file mode 100644 index 0000000000..41cbceedcc --- /dev/null +++ b/src/acl/Makefile.am @@ -0,0 +1,142 @@ +include $(top_srcdir)/src/Common.am +include $(top_srcdir)/src/TestHeaders.am + +noinst_LTLIBRARIES = libapi.la libstate.la libacls.la + +## General data-independent ACL API +libapi_la_SOURCES = \ + Acl.cc \ + Acl.h \ + Checklist.cc \ + Checklist.h + +## Data-dependent Squid/transaction state used by specific ACLs. +## Does not refer to specific ACLs to avoid circular dependencies. +libstate_la_SOURCES = \ + Data.h \ + Strategy.h \ + Strategised.cc \ + Strategised.h \ + \ + FilledChecklist.cc \ + FilledChecklist.h + +## data-specific ACLs +libacls_la_SOURCES = \ + IntRange.cc \ + IntRange.h \ + RegexData.cc \ + RegexData.h \ + StringData.cc \ + StringData.h \ + Time.cc \ + Time.h \ + TimeData.cc \ + TimeData.h \ + \ + Asn.cc \ + Asn.h \ + Browser.cc \ + Browser.h \ + DestinationAsn.h \ + DestinationDomain.cc \ + DestinationDomain.h \ + DestinationIp.cc \ + DestinationIp.h \ + DomainData.cc \ + DomainData.h \ + ExtUser.cc \ + ExtUser.h \ + HttpHeaderData.cc \ + HttpHeaderData.h \ + HttpRepHeader.cc \ + HttpRepHeader.h \ + HttpReqHeader.cc \ + HttpReqHeader.h \ + HttpStatus.cc \ + HttpStatus.h \ + Ip.cc \ + Ip.h \ + MaxConnection.cc \ + MaxConnection.h \ + Method.cc \ + MethodData.cc \ + MethodData.h \ + Method.h \ + MyIp.cc \ + MyIp.h \ + MyPort.cc \ + MyPort.h \ + MyPortName.cc \ + MyPortName.h \ + PeerName.cc \ + PeerName.h \ + Protocol.cc \ + ProtocolData.cc \ + ProtocolData.h \ + Protocol.h \ + Referer.cc \ + Referer.h \ + ReplyHeaderStrategy.h \ + ReplyMimeType.cc \ + ReplyMimeType.h \ + RequestHeaderStrategy.h \ + RequestMimeType.cc \ + RequestMimeType.h \ + SourceAsn.h \ + SourceDomain.cc \ + SourceDomain.h \ + SourceIp.cc \ + SourceIp.h \ + Url.cc \ + Url.h \ + UrlPath.cc \ + UrlPath.h \ + UrlPort.cc \ + UrlPort.h \ + UserData.cc \ + UserData.h \ + \ + Gadgets.cc \ + Gadgets.h + +## Add conditional sources +## TODO: move these to their respectful dirs when those dirs are created + +EXTRA_libacls_la_SOURCES = + +SSL_ACLS = \ + CertificateData.cc \ + CertificateData.h \ + Certificate.cc \ + Certificate.h \ + SslError.cc \ + SslError.h \ + SslErrorData.cc \ + SslErrorData.h + +if ENABLE_SSL +libacls_la_SOURCES += $(SSL_ACLS) +endif + +EXTRA_libacls_la_SOURCES += $(SSL_ACLS) + + +ARP_ACLS = Arp.cc Arp.h + +if ENABLE_ARP_ACL +libacls_la_SOURCES += $(ARP_ACLS) +endif + +EXTRA_libacls_la_SOURCES += $(ARP_ACLS) + + +IDENT_ACLS = Ident.cc Ident.h + +if ENABLE_IDENT +libacls_la_SOURCES += $(IDENT_ACLS) +endif + +EXTRA_libacls_la_SOURCES += $(IDENT_ACLS) + + diff --git a/src/ACLMaxConnection.h b/src/acl/MaxConnection.h similarity index 97% rename from src/ACLMaxConnection.h rename to src/acl/MaxConnection.h index 55ce594a8c..b01f3d46ab 100644 --- a/src/ACLMaxConnection.h +++ b/src/acl/MaxConnection.h @@ -35,8 +35,8 @@ #ifndef SQUID_ACLMAXCONNECTION_H #define SQUID_ACLMAXCONNECTION_H -#include "ACL.h" -#include "ACLChecklist.h" +#include "acl/Acl.h" +#include "acl/Checklist.h" /// \ingroup ACLAPI class ACLMaxConnection : public ACL diff --git a/src/ACLMethodData.cc b/src/acl/MethodData.cc similarity index 98% rename from src/ACLMethodData.cc rename to src/acl/MethodData.cc index 2f42b3048a..b502f7be48 100644 --- a/src/ACLMethodData.cc +++ b/src/acl/MethodData.cc @@ -35,8 +35,8 @@ */ #include "squid.h" -#include "ACLMethodData.h" -#include "ACLChecklist.h" +#include "acl/MethodData.h" +#include "acl/Checklist.h" #include "HttpRequestMethod.h" #include "wordlist.h" diff --git a/src/ACLMethodData.h b/src/acl/MethodData.h similarity index 97% rename from src/ACLMethodData.h rename to src/acl/MethodData.h index 46bff2c6d7..062efc8154 100644 --- a/src/ACLMethodData.h +++ b/src/acl/MethodData.h @@ -35,8 +35,8 @@ #ifndef SQUID_ACLMETHODDATA_H #define SQUID_ACLMETHODDATA_H -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" #include "CbDataList.h" /// \ingroup ACLAPI diff --git a/src/ACLMyIP.h b/src/acl/MyIp.h similarity index 98% rename from src/ACLMyIP.h rename to src/acl/MyIp.h index b8302e71f0..114d837a89 100644 --- a/src/ACLMyIP.h +++ b/src/acl/MyIp.h @@ -35,7 +35,7 @@ #ifndef SQUID_ACLMYIP_H #define SQUID_ACLMYIP_H -#include "ACLIP.h" +#include "acl/Ip.h" /// \ingroup ACLAPI class ACLMyIP : public ACLIP diff --git a/src/ACLProtocolData.cc b/src/acl/ProtocolData.cc similarity index 98% rename from src/ACLProtocolData.cc rename to src/acl/ProtocolData.cc index a087ea6e75..6fef088092 100644 --- a/src/ACLProtocolData.cc +++ b/src/acl/ProtocolData.cc @@ -35,8 +35,8 @@ */ #include "squid.h" -#include "ACLProtocolData.h" -#include "ACLChecklist.h" +#include "acl/ProtocolData.h" +#include "acl/Checklist.h" #include "URLScheme.h" #include "wordlist.h" diff --git a/src/ACLProtocolData.h b/src/acl/ProtocolData.h similarity index 97% rename from src/ACLProtocolData.h rename to src/acl/ProtocolData.h index 8406311c39..af98746914 100644 --- a/src/ACLProtocolData.h +++ b/src/acl/ProtocolData.h @@ -35,8 +35,8 @@ #ifndef SQUID_ACLPROTOCOLDATA_H #define SQUID_ACLPROTOCOLDATA_H -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" #include "CbDataList.h" class ACLProtocolData : public ACLData diff --git a/src/ACLReferer.cc b/src/acl/Referer.cc similarity index 95% rename from src/ACLReferer.cc rename to src/acl/Referer.cc index 0d103a1e9c..3a97bad5a9 100644 --- a/src/ACLReferer.cc +++ b/src/acl/Referer.cc @@ -35,9 +35,9 @@ */ #include "squid.h" -#include "ACLReferer.h" -#include "ACLChecklist.h" -#include "ACLRegexData.h" +#include "acl/Referer.h" +#include "acl/Checklist.h" +#include "acl/RegexData.h" /* explicit template instantiation required for some systems */ diff --git a/src/ACLReferer.h b/src/acl/Referer.h similarity index 93% rename from src/ACLReferer.h rename to src/acl/Referer.h index a485e98e59..f1fe216e77 100644 --- a/src/ACLReferer.h +++ b/src/acl/Referer.h @@ -35,10 +35,10 @@ #ifndef SQUID_ACLREFERER_H #define SQUID_ACLREFERER_H -#include "ACL.h" -#include "ACLData.h" -#include "ACLRequestHeaderStrategy.h" -#include "ACLStrategised.h" +#include "acl/Acl.h" +#include "acl/Data.h" +#include "acl/RequestHeaderStrategy.h" +#include "acl/Strategised.h" class ACLReferer { diff --git a/src/ACLRegexData.cc b/src/acl/RegexData.cc similarity index 97% rename from src/ACLRegexData.cc rename to src/acl/RegexData.cc index 8fa6869b6f..03314eaea7 100644 --- a/src/ACLRegexData.cc +++ b/src/acl/RegexData.cc @@ -35,10 +35,9 @@ */ #include "squid.h" -#include "ACLRegexData.h" -#include "authenticate.h" -#include "ACLChecklist.h" -#include "ACL.h" +#include "acl/RegexData.h" +#include "acl/Checklist.h" +#include "acl/Acl.h" #include "wordlist.h" #include "ConfigParser.h" diff --git a/src/ACLRegexData.h b/src/acl/RegexData.h similarity index 98% rename from src/ACLRegexData.h rename to src/acl/RegexData.h index 9806f1a7ed..e577c59e52 100644 --- a/src/ACLRegexData.h +++ b/src/acl/RegexData.h @@ -34,7 +34,7 @@ #ifndef SQUID_ACLREGEXDATA_H #define SQUID_ACLREGEXDATA_H -#include "ACLData.h" +#include "acl/Data.h" #include "MemPool.h" /** \todo CLEANUP: break out relist, we don't need the rest. */ diff --git a/src/ACLReplyMIMEType.cc b/src/acl/ReplyMimeType.cc similarity index 95% rename from src/ACLReplyMIMEType.cc rename to src/acl/ReplyMimeType.cc index ba24d1f1d5..ff07b65a28 100644 --- a/src/ACLReplyMIMEType.cc +++ b/src/acl/ReplyMimeType.cc @@ -35,9 +35,9 @@ */ #include "squid.h" -#include "ACLReplyMIMEType.h" -#include "ACLChecklist.h" -#include "ACLRegexData.h" +#include "acl/ReplyMimeType.h" +#include "acl/Checklist.h" +#include "acl/RegexData.h" /* explicit template instantiation required for some systems */ diff --git a/src/ACLRequestMIMEType.cc b/src/acl/RequestMimeType.cc similarity index 95% rename from src/ACLRequestMIMEType.cc rename to src/acl/RequestMimeType.cc index f8ea3fc5c6..91e921db47 100644 --- a/src/ACLRequestMIMEType.cc +++ b/src/acl/RequestMimeType.cc @@ -35,9 +35,9 @@ */ #include "squid.h" -#include "ACLRequestMIMEType.h" -#include "ACLChecklist.h" -#include "ACLRegexData.h" +#include "acl/RequestMimeType.h" +#include "acl/Checklist.h" +#include "acl/RegexData.h" /* explicit template instantiation required for some systems */ diff --git a/src/ACLSourceIP.h b/src/acl/SourceIp.h similarity index 98% rename from src/ACLSourceIP.h rename to src/acl/SourceIp.h index a3b35dc0c4..4225f47c37 100644 --- a/src/ACLSourceIP.h +++ b/src/acl/SourceIp.h @@ -34,7 +34,7 @@ #ifndef SQUID_ACLSOURCEIP_H #define SQUID_ACLSOURCEIP_H -#include "ACLIP.h" +#include "acl/Ip.h" class ACLSourceIP : public ACLIP { diff --git a/src/ACLSslErrorData.cc b/src/acl/SslErrorData.cc similarity index 95% rename from src/ACLSslErrorData.cc rename to src/acl/SslErrorData.cc index 2a71d03c30..62ddef42ed 100644 --- a/src/ACLSslErrorData.cc +++ b/src/acl/SslErrorData.cc @@ -3,8 +3,8 @@ */ #include "squid.h" -#include "ACLSslErrorData.h" -#include "ACLChecklist.h" +#include "acl/SslErrorData.h" +#include "acl/Checklist.h" #include "wordlist.h" ACLSslErrorData::ACLSslErrorData() : values (NULL) diff --git a/src/ACLSslErrorData.h b/src/acl/SslErrorData.h similarity index 93% rename from src/ACLSslErrorData.h rename to src/acl/SslErrorData.h index 7cca7ffeaf..c26e17c383 100644 --- a/src/ACLSslErrorData.h +++ b/src/acl/SslErrorData.h @@ -5,8 +5,8 @@ #ifndef SQUID_ACLSSL_ERRORDATA_H #define SQUID_ACLSSL_ERRORDATA_H -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" #include "CbDataList.h" #include "ssl_support.h" diff --git a/src/ACLStringData.cc b/src/acl/StringData.cc similarity index 98% rename from src/ACLStringData.cc rename to src/acl/StringData.cc index 2f862a1d24..fa9265037b 100644 --- a/src/ACLStringData.cc +++ b/src/acl/StringData.cc @@ -35,8 +35,8 @@ */ #include "squid.h" -#include "ACLStringData.h" -#include "ACLChecklist.h" +#include "acl/StringData.h" +#include "acl/Checklist.h" #include "wordlist.h" diff --git a/src/ACLStringData.h b/src/acl/StringData.h similarity index 97% rename from src/ACLStringData.h rename to src/acl/StringData.h index 7fad98c1e3..587ac27d8c 100644 --- a/src/ACLStringData.h +++ b/src/acl/StringData.h @@ -36,8 +36,8 @@ #ifndef SQUID_ACLSTRINGDATA_H #define SQUID_ACLSTRINGDATA_H #include "splay.h" -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" class ACLStringData : public ACLData diff --git a/src/ACLTimeData.cc b/src/acl/TimeData.cc similarity index 98% rename from src/ACLTimeData.cc rename to src/acl/TimeData.cc index 593995df24..f05560b169 100644 --- a/src/ACLTimeData.cc +++ b/src/acl/TimeData.cc @@ -35,9 +35,8 @@ */ #include "squid.h" -#include "ACLTimeData.h" -#include "authenticate.h" -#include "ACLChecklist.h" +#include "acl/TimeData.h" +#include "acl/Checklist.h" #include "wordlist.h" ACLTimeData::ACLTimeData () : weekbits (0), start (0), stop (0), next (NULL) {} diff --git a/src/ACLTimeData.h b/src/acl/TimeData.h similarity index 97% rename from src/ACLTimeData.h rename to src/acl/TimeData.h index 6d3e4c3d21..a52eed66e0 100644 --- a/src/ACLTimeData.h +++ b/src/acl/TimeData.h @@ -36,8 +36,8 @@ #ifndef SQUID_ACLTIMEDATA_H #define SQUID_ACLTIMEDATA_H #include "splay.h" -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" class ACLTimeData : public ACLData { diff --git a/src/ACLUserData.cc b/src/acl/UserData.cc similarity index 98% rename from src/ACLUserData.cc rename to src/acl/UserData.cc index 09da42ddc6..80df73e35f 100644 --- a/src/ACLUserData.cc +++ b/src/acl/UserData.cc @@ -35,9 +35,8 @@ */ #include "squid.h" -#include "ACLUserData.h" -#include "authenticate.h" -#include "ACLChecklist.h" +#include "acl/UserData.h" +#include "acl/Checklist.h" #include "wordlist.h" #include "ConfigParser.h" diff --git a/src/ACLUserData.h b/src/acl/UserData.h similarity index 97% rename from src/ACLUserData.h rename to src/acl/UserData.h index b0bd11d367..5631bfb618 100644 --- a/src/ACLUserData.h +++ b/src/acl/UserData.h @@ -36,8 +36,8 @@ #ifndef SQUID_ACLUSERDATA_H #define SQUID_ACLUSERDATA_H #include "splay.h" -#include "ACL.h" -#include "ACLData.h" +#include "acl/Acl.h" +#include "acl/Data.h" class ACLUserData : public ACLData { diff --git a/src/adaptation/AccessRule.cc b/src/adaptation/AccessRule.cc index d8dbd649dc..4191c34daa 100644 --- a/src/adaptation/AccessRule.cc +++ b/src/adaptation/AccessRule.cc @@ -2,7 +2,7 @@ #include "structs.h" #include "ConfigParser.h" -#include "ACL.h" +#include "acl/Gadgets.h" #include "adaptation/AccessRule.h" #include "adaptation/Service.h" #include "adaptation/ServiceGroups.h" diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc index cbc19f2ebd..d2571a4298 100644 --- a/src/adaptation/Config.cc +++ b/src/adaptation/Config.cc @@ -34,7 +34,7 @@ #include "structs.h" #include "ConfigParser.h" -#include "ACL.h" +#include "acl/Gadgets.h" #include "Store.h" #include "Array.h" // really Vector #include "adaptation/Config.h" diff --git a/src/authenticate.cc b/src/auth/Gadgets.cc similarity index 97% rename from src/authenticate.cc rename to src/auth/Gadgets.cc index f3fcbc41fb..2bf51f6725 100644 --- a/src/authenticate.cc +++ b/src/auth/Gadgets.cc @@ -38,12 +38,15 @@ * See acl.c for access control and client_side.c for auditing */ #include "squid.h" -#include "authenticate.h" -#include "ACL.h" +#include "acl/Acl.h" +#include "acl/FilledChecklist.h" #include "client_side.h" #include "auth/Config.h" #include "auth/Scheme.h" +#include "auth/Gadgets.h" #include "auth/User.h" +#include "auth/UserRequest.h" +#include "auth/AclProxyAuth.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc index 4d3bf1cb07..764a7c0619 100644 --- a/src/auth/Scheme.cc +++ b/src/auth/Scheme.cc @@ -36,7 +36,7 @@ #include "squid.h" #include "auth/Scheme.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "auth/Config.h" Vector *AuthScheme::_Schemes = NULL; diff --git a/src/auth/User.cc b/src/auth/User.cc index f0ce00f49e..71094e1c06 100644 --- a/src/auth/User.cc +++ b/src/auth/User.cc @@ -37,8 +37,9 @@ #include "auth/User.h" #include "auth/UserRequest.h" #include "auth/Config.h" -#include "authenticate.h" -#include "ACL.h" +#include "auth/Gadgets.h" +#include "acl/Acl.h" +#include "acl/Gadgets.h" #include "event.h" #include "SquidTime.h" diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc index 69423e2fec..285e19c706 100644 --- a/src/auth/UserRequest.cc +++ b/src/auth/UserRequest.cc @@ -43,8 +43,8 @@ #include "squid.h" #include "auth/UserRequest.h" #include "auth/User.h" -/*#include "authenticate.h" -#include "ACL.h" +/*#include "auth/Gadgets.h" +#include "acl/Acl.h" #include "client_side.h" */ #include "auth/Config.h" diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc index b40b02ee1a..4fdee3b525 100644 --- a/src/auth/basic/auth_basic.cc +++ b/src/auth/basic/auth_basic.cc @@ -39,7 +39,7 @@ #include "squid.h" #include "auth_basic.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "CacheManager.h" #include "Store.h" #include "HttpReply.h" diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h index 81c512f33e..3e5161687c 100644 --- a/src/auth/basic/auth_basic.h +++ b/src/auth/basic/auth_basic.h @@ -5,7 +5,7 @@ #ifndef __AUTH_BASIC_H__ #define __AUTH_BASIC_H__ -#include "authenticate.h" +#include "auth/Gadgets.h" #include "auth/User.h" #include "auth/UserRequest.h" #include "auth/Config.h" diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc index af8a3bde85..46041ba775 100644 --- a/src/auth/digest/auth_digest.cc +++ b/src/auth/digest/auth_digest.cc @@ -40,7 +40,7 @@ #include "squid.h" #include "rfc2617.h" #include "auth_digest.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "event.h" #include "CacheManager.h" #include "Store.h" diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h index b8656d3d6f..5b0b512089 100644 --- a/src/auth/digest/auth_digest.h +++ b/src/auth/digest/auth_digest.h @@ -6,7 +6,7 @@ #ifndef __AUTH_DIGEST_H__ #define __AUTH_DIGEST_H__ #include "rfc2617.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "auth/User.h" #include "auth/UserRequest.h" #include "auth/Config.h" diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc index 92e84ac189..2d78603c07 100644 --- a/src/auth/negotiate/auth_negotiate.cc +++ b/src/auth/negotiate/auth_negotiate.cc @@ -39,7 +39,7 @@ #include "squid.h" #include "auth_negotiate.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "CacheManager.h" #include "Store.h" #include "client_side.h" diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h index 2d38b61cd4..b3888c4b5a 100644 --- a/src/auth/negotiate/auth_negotiate.h +++ b/src/auth/negotiate/auth_negotiate.h @@ -5,7 +5,7 @@ #ifndef __AUTH_NEGOTIATE_H__ #define __AUTH_NEGOTIATE_H__ -#include "authenticate.h" +#include "auth/Gadgets.h" #include "auth/User.h" #include "auth/UserRequest.h" #include "auth/Config.h" diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc index 7d33066a63..6a58c16e5f 100644 --- a/src/auth/ntlm/auth_ntlm.cc +++ b/src/auth/ntlm/auth_ntlm.cc @@ -39,7 +39,7 @@ #include "squid.h" #include "auth_ntlm.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "CacheManager.h" #include "Store.h" #include "client_side.h" diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h index 97239a4e22..ebe95253ad 100644 --- a/src/auth/ntlm/auth_ntlm.h +++ b/src/auth/ntlm/auth_ntlm.h @@ -5,7 +5,7 @@ #ifndef __AUTH_NTLM_H__ #define __AUTH_NTLM_H__ -#include "authenticate.h" +#include "auth/Gadgets.h" #include "auth/User.h" #include "auth/UserRequest.h" #include "auth/Config.h" diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 66cd44d480..ca93ed34ae 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -33,7 +33,6 @@ */ #include "squid.h" -#include "authenticate.h" #include "ProtoPort.h" #include "HttpRequestMethod.h" #include "auth/Config.h" @@ -42,7 +41,8 @@ #include "Store.h" #include "SwapDir.h" #include "ConfigParser.h" -#include "ACL.h" +#include "acl/Acl.h" +#include "acl/Gadgets.h" #include "StoreFileSystem.h" #include "Parsing.h" #include "MemBuf.h" diff --git a/src/main.cc b/src/main.cc index c9672b4463..d02d90e0ab 100644 --- a/src/main.cc +++ b/src/main.cc @@ -34,7 +34,7 @@ #include "squid.h" #include "AccessLogEntry.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "ConfigParser.h" #include "errorpage.h" #include "event.h" @@ -46,8 +46,8 @@ #include "HttpReply.h" #include "pconn.h" #include "Mem.h" -#include "ACLASN.h" -#include "ACL.h" +#include "acl/Asn.h" +#include "acl/Acl.h" #include "htcp.h" #include "StoreFileSystem.h" #include "DiskIO/DiskIOModule.h" diff --git a/src/redirect.cc b/src/redirect.cc index cff7013bb2..93fe7d43c8 100644 --- a/src/redirect.cc +++ b/src/redirect.cc @@ -39,7 +39,7 @@ #include "Store.h" #include "fde.h" #include "client_side_request.h" -#include "ACLChecklist.h" +#include "acl/Checklist.h" #include "HttpRequest.h" #include "client_side.h" #include "helper.h" diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc index 7ff1e6cbc9..bd286da28d 100644 --- a/src/tests/testACLMaxUserIP.cc +++ b/src/tests/testACLMaxUserIP.cc @@ -4,7 +4,7 @@ #include #include "testACLMaxUserIP.h" -#include "ACLMaxUserIP.h" +#include "auth/AclMaxUserIp.h" CPPUNIT_TEST_SUITE_REGISTRATION( testACLMaxUserIP ); diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc index 707fa58fe5..55ca211285 100644 --- a/src/tests/testAuth.cc +++ b/src/tests/testAuth.cc @@ -2,7 +2,7 @@ #include "squid.h" #include "testAuth.h" -#include "authenticate.h" +#include "auth/Gadgets.h" #include "auth/UserRequest.h" #include "auth/Scheme.h" #include "auth/Config.h" diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc index e44f1f2408..d9b8df69fd 100644 --- a/src/tests/test_http_range.cc +++ b/src/tests/test_http_range.cc @@ -45,7 +45,7 @@ #include "Mem.h" #if 0 -#include "ACLChecklist.h" +#include "acl/Checklist.h" #endif /* Stub routines */