From: Amos Jeffries Date: Fri, 27 Aug 2010 13:23:46 +0000 (+1200) Subject: Basic build errors after trunk merge X-Git-Tag: take08~55^2~124^2~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=855150a40b1bcf1d8c46954948b6c5d0b30d2c7a;p=thirdparty%2Fsquid.git Basic build errors after trunk merge --- diff --git a/src/client_side.cc b/src/client_side.cc index 026b5cbb76..aca9466f59 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -3491,7 +3491,7 @@ clientHttpConnectionOpened(int fd, int, http_port_list *s) s->listener = new Comm::ConnAcceptor(fd, true); s->listener->subscribe(5,5, "httpAccept", new CommAcceptCbPtrFun(httpAccept, s)); - AsyncJob::AsyncStart(s->listener); + AsyncJob::Start(s->listener); debugs(1, 1, "Accepting " << (s->intercepted ? " intercepted" : "") << @@ -3544,7 +3544,7 @@ clientHttpsConnectionOpened(int fd, int, http_port_list *s) s->listener = new Comm::ConnAcceptor(fd, true); s->listener->subscribe(5,5, "httpsAccept", new CommAcceptCbPtrFun(httpsAccept, s)); - AsyncJob::AsyncStart(s->listener); + AsyncJob::Start(s->listener); debugs(1, 1, "Accepting HTTPS connections at " << s->s << ", FD " << fd << "."); diff --git a/src/dns_internal.cc b/src/dns_internal.cc index 8a0e1f44f0..39cfc4c7cb 100644 --- a/src/dns_internal.cc +++ b/src/dns_internal.cc @@ -757,7 +757,7 @@ idnsInitVC(int ns) Comm::ConnOpener *cs = new Comm::ConnOpener(conn, call, Config.Timeout.connect); cs->setHost("DNS TCP Socket"); - AsyncJob::AsyncStart(cs); + AsyncJob::Start(cs); } static void diff --git a/src/forward.cc b/src/forward.cc index e81260d4d0..3c4fbccafc 100644 --- a/src/forward.cc +++ b/src/forward.cc @@ -831,7 +831,7 @@ FwdState::connectStart() AsyncCall::Pointer call = commCbCall(17,3, "fwdConnectDoneWrapper", CommConnectCbPtrFun(fwdConnectDoneWrapper, this)); Comm::ConnOpener *cs = new Comm::ConnOpener(serverDestinations[0], call, ctimeout); cs->setHost(host); - AsyncJob::AsyncStart(cs); + AsyncJob::Start(cs); } void diff --git a/src/ftp.cc b/src/ftp.cc index 2cdfa32497..4ef57178e9 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -2429,7 +2429,7 @@ ftpReadEPSV(FtpStateData* ftpState) AsyncCall::Pointer call = commCbCall(9,3, "FtpStateData::ftpPasvCallback", CommConnectCbPtrFun(FtpStateData::ftpPasvCallback, ftpState)); Comm::ConnOpener *cs = new Comm::ConnOpener(conn, call, Config.Timeout.connect); cs->setHost(ftpState->data.host); - AsyncJob::AsyncStart(cs); + AsyncJob::Start(cs); } /** \ingroup ServerProtocolFTPInternal @@ -2676,7 +2676,7 @@ ftpReadPasv(FtpStateData * ftpState) AsyncCall::Pointer call = commCbCall(9,3, "FtpStateData::ftpPasvCallback", CommConnectCbPtrFun(FtpStateData::ftpPasvCallback, ftpState)); Comm::ConnOpener *cs = new Comm::ConnOpener(conn, call, Config.Timeout.connect); cs->setHost(ftpState->data.host); - AsyncJob::AsyncStart(cs); + AsyncJob::Start(cs); } void @@ -2742,7 +2742,7 @@ ftpOpenListenSocket(FtpStateData * ftpState, int fallback) if (!fallback) conn->local.SetPort(comm_local_port(conn->fd)); ftpState->data.host = NULL; - AsyncJob::AsyncStart(ftpState->data.listener); + AsyncJob::Start(ftpState->data.listener); } ftpState->data.listen_conn = conn; @@ -2909,7 +2909,7 @@ FtpStateData::ftpAcceptDataConnection(const CommAcceptCbParams &io) AsyncCall::Pointer acceptCall = JobCallback(11, 5, acceptDialer, this, FtpStateData::ftpAcceptDataConnection); data.listener = new Comm::ConnAcceptor(data.listen_conn, false, data.host); data.listener->subscribe(acceptCall); - AsyncJob::AsyncStart(data.listener); + AsyncJob::Start(data.listener); return; } } @@ -3016,7 +3016,7 @@ void FtpStateData::readStor() data.listener = new Comm::ConnAcceptor(data.conn, false, data.host); data.listener->subscribe(acceptCall); - AsyncJob::AsyncStart(data.listener); + AsyncJob::Start(data.listener); } else { debugs(9, DBG_IMPORTANT, HERE << "Unexpected reply code "<< std::setfill('0') << std::setw(3) << code); ftpFail(this); @@ -3152,7 +3152,7 @@ ftpReadList(FtpStateData * ftpState) ftpState->data.listener = new Comm::ConnAcceptor(ftpState->data.conn, false, ftpState->data.host); ftpState->data.listener->subscribe(acceptCall); - AsyncJob::AsyncStart(ftpState->data.listener); + AsyncJob::Start(ftpState->data.listener); return; } else if (!ftpState->flags.tried_nlst && code > 300) { ftpSendNlst(ftpState); @@ -3199,7 +3199,7 @@ ftpReadRetr(FtpStateData * ftpState) acceptDialer, ftpState, FtpStateData::ftpAcceptDataConnection); ftpState->data.listener = new Comm::ConnAcceptor(ftpState->data.conn, false, ftpState->data.host); ftpState->data.listener->subscribe(acceptCall); - AsyncJob::AsyncStart(ftpState->data.listener); + AsyncJob::Start(ftpState->data.listener); } else if (code >= 300) { if (!ftpState->flags.try_slash_hack) { /* Try this as a directory missing trailing slash... */ diff --git a/src/http.cc b/src/http.cc index df012c91b2..83e9f6000d 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1989,7 +1989,7 @@ HttpStateData::sendRequest() typedef CommCbMemFunT TimeoutDialer; AsyncCall::Pointer timeoutCall = JobCallback(11, 5, TimeoutDialer, this, HttpStateData::httpTimeout); - commSetTimeout(srverConnection->fd, Config.Timeout.lifetime, timeoutCall); + commSetTimeout(serverConnection->fd, Config.Timeout.lifetime, timeoutCall); flags.do_next_read = 1; maybeReadVirginBody(); diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc index 1955f18241..ae1ef2b0ca 100644 --- a/src/ident/Ident.cc +++ b/src/ident/Ident.cc @@ -250,7 +250,7 @@ Ident::Start(Comm::ConnectionPointer &conn, IDCB * callback, void *data) hash_join(ident_hash, &state->hash); AsyncCall::Pointer call = commCbCall(30,3, "Ident::ConnectDone", CommConnectCbPtrFun(Ident::ConnectDone, state)); - AsyncJob::AsyncStart(new Comm::ConnOpener(state->conn, call, Ident::TheConfig.timeout)); + AsyncJob::Start(new Comm::ConnOpener(state->conn, call, Ident::TheConfig.timeout)); } void diff --git a/src/neighbors.cc b/src/neighbors.cc index c952b62f09..ef797ad554 100644 --- a/src/neighbors.cc +++ b/src/neighbors.cc @@ -1372,7 +1372,7 @@ peerProbeConnect(peer * p) AsyncCall::Pointer call = commCbCall(15,3, "peerProbeConnectDone", CommConnectCbPtrFun(peerProbeConnectDone, p)); Comm::ConnOpener *cs = new Comm::ConnOpener(conn, call, ctimeout); cs->setHost(p->host); - AsyncJob::AsyncStart(cs); + AsyncJob::Start(cs); } p->stats.last_connect_probe = squid_curtime; diff --git a/src/pconn.h b/src/pconn.h index 34e979a084..5566fc9d29 100644 --- a/src/pconn.h +++ b/src/pconn.h @@ -26,7 +26,10 @@ class PconnPool; /// \ingroup PConnAPI #define PCONN_HIST_SZ (1<<16) -/// \ingroup PConnAPI +/** \ingroup PConnAPI + * A list of connections currently open to a particular destination end-point. + * We currently define the end-point by the FQDN it is serving. + */ class IdleConnList { public: @@ -65,7 +68,10 @@ class IdleConnLimit; /* for hash_table */ #include "hash.h" -/// \ingroup PConnAPI +/** \ingroup PConnAPI + * A pool of persistent connections for a particular service type. + * HTTP servers being one such pool type, ICAP services another etc. + */ class PconnPool { @@ -95,7 +101,9 @@ private: class StoreEntry; class PconnPool; -/// \ingroup PConnAPI +/** \ingroup PConnAPI + * The global registry of persistent connection pools. + */ class PconnModule { diff --git a/src/tunnel.cc b/src/tunnel.cc index 2f8c05a5cd..dfc20c3475 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -527,6 +527,9 @@ tunnelConnectDone(Comm::ConnectionPointer &conn, comm_err_t status, int xerrno, else hierarchyNote(&tunnelState->request->hier, conn->peerType, tunnelState->getHost()); + // TODO: merge this into hierarchyNote with a conn parameter instead of peerType + request->hier.peer_local_port = conn->local.GetPort(); // for %serverDestinations[0], call, Config.Timeout.connect); cs->setHost(tunnelState->url); - AsyncJob::AsyncStart(cs); + AsyncJob::Start(cs); } else { err = errorCon(ERR_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE, request); *tunnelState->status_ptr = HTTP_SERVICE_UNAVAILABLE; @@ -610,8 +613,6 @@ tunnelStart(ClientHttpRequest * http, int64_t * size_ptr, int *status_ptr) statCounter.server.all.requests++; statCounter.server.other.requests++; - request->hier.peer_local_port = comm_local_port(sock); // for %server.setDelayId(DelayId::DelayClient(http)); @@ -668,11 +669,10 @@ static void tunnelPeerSelectComplete(Comm::ConnectionList *peer_paths, void *data) { TunnelStateData *tunnelState = (TunnelStateData *)data; - HttpRequest *request = tunnelState->request; if (peer_paths == NULL || peer_paths->size() < 1) { ErrorState *err; - err = errorCon(ERR_CANNOT_FORWARD, HTTP_SERVICE_UNAVAILABLE, request); + err = errorCon(ERR_CANNOT_FORWARD, HTTP_SERVICE_UNAVAILABLE, tunnelState->request); *tunnelState->status_ptr = HTTP_SERVICE_UNAVAILABLE; err->callback = tunnelErrorComplete; err->callback_data = tunnelState; @@ -683,7 +683,7 @@ tunnelPeerSelectComplete(Comm::ConnectionList *peer_paths, void *data) AsyncCall::Pointer call = commCbCall(26,3, "tunnelConnectDone", CommConnectCbPtrFun(tunnelConnectDone, tunnelState)); Comm::ConnOpener *cs = new Comm::ConnOpener(tunnelState->serverDestinations[0], call, Config.Timeout.connect); cs->setHost(tunnelState->url); - AsyncJob::AsyncStart(cs); + AsyncJob::Start(cs); } CBDATA_CLASS_INIT(TunnelStateData);