Build issues

diff --git a/src/Makefile.am b/src/Makefile.am
index b1e843b22461346ae5e1c96e4225fd440d2ad0b3..405f4afb222ffa0fc2c881f3f80aaf60d4e4d0d8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1325,6 +1325,7 @@ tests_testDiskIO_LDADD = \
        $(DISK_LIBS) \
        $(DISK_OS_LIBS) \
        acl/libapi.la \
+       comm/libcomm.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \

diff --git a/src/cache_manager.cc b/src/cache_manager.cc
index a4e62283d71cb8172a2b081bdf682b3f26b591e8..38ee8cddfe90053442c3764dcd29284f993cd6be 100644 (file)
--- a/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@ -366,7 +366,7 @@ CacheManager::Start(const Comm::ConnectionPointer &client, HttpRequest * request
            actionName << "'" );
 
     if (UsingSmp() && IamWorkerProcess()) {
-        AsyncJob::Start(new Mgr::Forwarder(fd, cmd->params, request, entry));
+        AsyncJob::Start(new Mgr::Forwarder(client, cmd->params, request, entry));
         return;
     }
 

diff --git a/src/client_side.cc b/src/client_side.cc
index 1ab505f9d8c1919842489efa261a2151892b6199..7e4cd6241d2644c473c0ca5f60fdcda04cc6d7a5 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -740,9 +740,9 @@ void
 ConnStateData::swanSong()
 {
     debugs(33, 2, HERE << clientConn);
-    clientConn = NULL;
     flags.readMoreRequests = false;
     clientdbEstablished(clientConn->remote, -1);       /* decrement */
+    clientConn = NULL;
     assert(areAllContextsForThisConnection());
     freeAllContexts();
 
@@ -2726,7 +2726,7 @@ ConnStateData::clientReadRequest(const CommIoCbParams &io)
     }
 
     assert(Comm::IsConnOpen(clientConn));
-    assert(io.conn == clientConn);
+    assert(io.conn->fd == clientConn->fd);
 
     /*
      * Don't reset the timeout value here.  The timeout value will be

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 104d36ff6184cfba29cd8571bec4d0a79ea572f1..a4a0d4cecf943c5bffdd54f3c95bb6ee78202a27 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1860,7 +1860,7 @@ clientReplyContext::sendPreconditionFailedError()
     http->logType = LOG_TCP_HIT;
     ErrorState *const err =
         clientBuildError(ERR_PRECONDITION_FAILED, HTTP_PRECONDITION_FAILED,
-                         NULL, http->getConn()->peer, http->request);
+                         NULL, http->getConn()->clientConn->remote, http->request);
     removeClientStoreReference(&sc, http);
     HTTPMSGUNLOCK(reply);
     startError(err);

diff --git a/src/comm.cc b/src/comm.cc
index 49312ace9e999db5b3907cf53327a703b0402704..3365de51b5f8a8c1b8e2d21405b07f2e897130dc 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -2053,7 +2053,6 @@ commSelectOrQueueWrite(const int fd)
 #endif
 
     commSetSelect(fd, COMM_SELECT_WRITE, commHandleWrite, ccb, 0);
->>>>>>> MERGE-SOURCE
 }
 
 

diff --git a/src/comm/Connection.h b/src/comm/Connection.h
index fef288f8d23a07eb8942ebf2121eb5827c4374e5..50155e40adcd2e59f25fcc4ab8c577922f20fa2d 100644 (file)
--- a/src/comm/Connection.h
+++ b/src/comm/Connection.h
@@ -42,6 +42,7 @@
 #include "hier_code.h"
 #include "ip/Address.h"
 #include "RefCount.h"
+#include "typedefs.h"
 
 #if HAVE_IOSFWD
 #include <iosfwd>

diff --git a/src/forward.cc b/src/forward.cc
index ff141ec8ceeaf2ef34894ee74eb9ef280f5fc109..7d109919dcf454130df0b0ac79d3a5ead1d8232d 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -34,6 +34,7 @@
 #include "squid.h"
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
+#include "CacheManager.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
 #include "CommCalls.h"
@@ -863,11 +864,11 @@ FwdState::connectStart()
     }
 #if SO_MARK
     serverDestinations[0]->nfmark = GetNfmarkToServer(request);
-    debugs(17, 3, "fwdConnectStart: got outgoing addr " << outgoing << ", tos " << int(tos)
+    debugs(17, 3, "fwdConnectStart: got outgoing addr " << serverDestinations[0]->local << ", tos " << int(serverDestinations[0]->tos)
            << ", netfilter mark " << serverDestinations[0]->nfmark);
 #else
     serverDestinations[0]->nfmark = 0;
-    debugs(17, 3, "fwdConnectStart: got outgoing addr " << outgoing << ", tos " << int(tos));
+    debugs(17, 3, "fwdConnectStart: got outgoing addr " << serverDestinations[0]->local << ", tos " << int(serverDestinations[0]->tos));
 #endif
 
     AsyncCall::Pointer call = commCbCall(17,3, "fwdConnectDoneWrapper", CommConnectCbPtrFun(fwdConnectDoneWrapper, this));

diff --git a/src/http.cc b/src/http.cc
index bf07e3f3ea5aa15c126f8110b4e18ad179f28426..ca099f31df24aface63d24e636baee71b07c347d 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -2301,7 +2301,7 @@ HttpStateData::handleRequestBodyProducerAborted()
 {
     ServerStateData::handleRequestBodyProducerAborted();
     if (entry->isEmpty()) {
-        debugs(11, 3, "request body aborted: FD " << fd);
+        debugs(11, 3, "request body aborted: " << serverConnection);
         ErrorState *err;
         err = errorCon(ERR_READ_ERROR, HTTP_BAD_GATEWAY, fwd->request);
         err->xerrno = errno;

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index 0b9b8b1dbe74d37b57d1c4f92e26a0ee7b444fe6..c59c13ce18b50ce765f86eaf665c3d0a35f2aafe 100644 (file)
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -739,7 +739,7 @@ icpConnectionsOpen(void)
         debugs(12, DBG_CRITICAL, "Sending ICP messages from " << icpOutgoingConn->local);
 
         commSetSelect(icpOutgoingConn->fd, COMM_SELECT_READ, icpHandleUdp, NULL, 0);
-        fd_note(theOutIcpConnection, "Outgoing ICP socket");
+        fd_note(icpOutgoingConn->fd, "Outgoing ICP socket");
         icpGetOutgoingIpAddress();
     }
 }
@@ -750,7 +750,7 @@ static void
 icpGetOutgoingIpAddress()
 {
     struct addrinfo *xai = NULL;
-    theOutICPAddr.SetEmpty();
+    theIcpPrivateHostID.SetEmpty();
     theIcpPrivateHostID.InitAddrInfo(xai);
     if (getsockname(icpOutgoingConn->fd, xai->ai_addr, &xai->ai_addrlen) < 0)
         debugs(50, DBG_IMPORTANT, "ERROR: Unable to identify ICP host ID to use for " << icpOutgoingConn

diff --git a/src/ipc/Coordinator.cc b/src/ipc/Coordinator.cc
index fc38a7d27373b9f7c2bb36054a57c63bc4828d49..9bab7cc3ce1c0ba4150248d82a3f53f4533e4468 100644 (file)
--- a/src/ipc/Coordinator.cc
+++ b/src/ipc/Coordinator.cc
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "base/Subscription.h"
 #include "base/TextException.h"
+#include "CacheManager.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "ipc/Coordinator.h"
@@ -19,7 +20,6 @@
 #include "mgr/Response.h"
 #include "mgr/StoreToCommWriter.h"
 
-
 CBDATA_NAMESPACED_CLASS_INIT(Ipc, Coordinator);
 Ipc::Coordinator* Ipc::Coordinator::TheInstance = NULL;
 
@@ -124,8 +124,8 @@ Ipc::Coordinator::handleCacheMgrRequest(const Mgr::Request& request)
 
     Mgr::Action::Pointer action =
         CacheManager::GetInstance()->createRequestedAction(request.params);
-    AsyncJob::Start(new Mgr::Inquirer(action,
-                                      Mgr::ImportHttpFdIntoComm(request.fd), request, strands_));
+    Comm::ConnectionPointer ir = Mgr::ImportHttpFdIntoComm(request.fd);
+    AsyncJob::Start(new Mgr::Inquirer(action, ir, request, strands_));
 }
 
 void

diff --git a/src/ipc/SharedListen.h b/src/ipc/SharedListen.h
index 18486d05e0ca2bfe87ebaa45989cb9af1f1e4b1a..2cd8c079ea57b22584026ffacbfabe9b4715d9fa 100644 (file)
--- a/src/ipc/SharedListen.h
+++ b/src/ipc/SharedListen.h
@@ -9,6 +9,7 @@
 #define SQUID_IPC_SHARED_LISTEN_H
 
 #include "base/AsyncCall.h"
+#include "base/Subscription.h"
 
 namespace Ipc
 {

diff --git a/src/tests/stub_comm.cc b/src/tests/stub_comm.cc
index c9720edaae45825641503f61a38a9a5241e24fb5..dba1cbfabf2dd42c4ff25d9acaceafb367a6f10a 100644 (file)
--- a/src/tests/stub_comm.cc
+++ b/src/tests/stub_comm.cc
@@ -176,8 +176,3 @@ comm_write(int fd, const char *buf, int size, AsyncCall::Pointer &callback, FREE
 {
     fatal ("Not implemented");
 }
-
-ConnectionDetail::ConnectionDetail() : me(), peer()
-{
-    fatal ("Not implemented");
-}