/*
- * DEBUG: section 93 ICAP (RFC 3507) Client
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
*/
+/* DEBUG: section 93 ICAP (RFC 3507) Client */
+
#include "squid.h"
#include "acl/FilledChecklist.h"
+#include "adaptation/Answer.h"
+#include "adaptation/icap/Config.h"
#include "adaptation/icap/Launcher.h"
-#include "adaptation/icap/Xaction.h"
#include "adaptation/icap/ServiceRep.h"
-#include "adaptation/icap/Config.h"
+#include "adaptation/icap/Xaction.h"
#include "base/TextException.h"
+#include "globals.h"
#include "HttpMsg.h"
-#include "HttpRequest.h"
#include "HttpReply.h"
-
+#include "HttpRequest.h"
Adaptation::Icap::Launcher::Launcher(const char *aTypeName,
Adaptation::ServicePointer &aService):
- AsyncJob(aTypeName),
- Adaptation::Initiate(aTypeName),
- theService(aService), theXaction(0), theLaunches(0)
+ AsyncJob(aTypeName),
+ Adaptation::Initiate(aTypeName),
+ theService(aService), theXaction(0), theLaunches(0)
{
}
debugs(93,4, HERE << "launching " << xkind << " xaction #" << theLaunches);
Adaptation::Icap::Xaction *x = createXaction();
x->attempts = theLaunches;
- if (theLaunches > 1)
+ if (theLaunches > 1) {
+ x->clearError();
x->disableRetries();
+ }
if (theLaunches >= TheConfig.repeat_limit)
x->disableRepeats("over icap_retry_limit");
theXaction = initiateAdaptation(x);
Must(initiated(theXaction));
}
-void Adaptation::Icap::Launcher::noteAdaptationAnswer(HttpMsg *message)
+void Adaptation::Icap::Launcher::noteAdaptationAnswer(const Answer &answer)
{
- sendAnswer(message);
+ debugs(93,5, HERE << "launches: " << theLaunches << " answer: " << answer);
+
+ // XXX: akError is unused by ICAPXaction in favor of noteXactAbort()
+ Must(answer.kind != Answer::akError);
+
+ sendAnswer(answer);
clearAdaptation(theXaction);
Must(done());
- debugs(93,3, HERE << "Adaptation::Icap::Launcher::noteAdaptationAnswer exiting ");
}
void Adaptation::Icap::Launcher::noteInitiatorAborted()
}
-// XXX: this call is unused by ICAPXaction in favor of ICAPLauncher::noteXactAbort
-void Adaptation::Icap::Launcher::noteAdaptationQueryAbort(bool final)
-{
- debugs(93,5, HERE << "launches: " << theLaunches << "; final: " << final);
- clearAdaptation(theXaction);
-
- Must(done()); // swanSong will notify the initiator
-}
-
void Adaptation::Icap::Launcher::noteXactAbort(XactAbortInfo info)
{
debugs(93,5, HERE << "theXaction:" << theXaction << " launches: " << theLaunches);
if (!info.icapReply) // did not get to read an ICAP reply; a timeout?
return true;
- debugs(93,9, HERE << info.icapReply->sline.status);
- if (!info.icapReply->sline.status) // failed to parse the reply; I/O err
+ debugs(93,9, info.icapReply->sline.status());
+ // XXX: Http::scNone is not the only sign of parse error
+ // XXX: if there is a specific HTTP error code describing the problem, that may be set
+ if (info.icapReply->sline.status() == Http::scNone) // failed to parse the reply; I/O err
return true;
ACLFilledChecklist *cl =
new ACLFilledChecklist(TheConfig.repeat, info.icapRequest, dash_str);
- cl->reply = HTTPMSGLOCK(info.icapReply);
+ cl->reply = info.icapReply;
+ HTTPMSGLOCK(cl->reply);
- const bool result = cl->fastCheck();
+ bool result = cl->fastCheck() == ACCESS_ALLOWED;
delete cl;
return result;
}
Adaptation::Icap::XactAbortInfo::XactAbortInfo(HttpRequest *anIcapRequest,
HttpReply *anIcapReply, bool beRetriable, bool beRepeatable):
- icapRequest(anIcapRequest ? HTTPMSGLOCK(anIcapRequest) : NULL),
- icapReply(anIcapReply ? HTTPMSGLOCK(anIcapReply) : NULL),
- isRetriable(beRetriable), isRepeatable(beRepeatable)
+ icapRequest(anIcapRequest),
+ icapReply(anIcapReply),
+ isRetriable(beRetriable),
+ isRepeatable(beRepeatable)
{
+ if (icapRequest)
+ HTTPMSGLOCK(icapRequest);
+ if (icapReply)
+ HTTPMSGLOCK(icapReply);
}
Adaptation::Icap::XactAbortInfo::XactAbortInfo(const Adaptation::Icap::XactAbortInfo &i):
- icapRequest(i.icapRequest ? HTTPMSGLOCK(i.icapRequest) : NULL),
- icapReply(i.icapReply ? HTTPMSGLOCK(i.icapReply) : NULL),
- isRetriable(i.isRetriable), isRepeatable(i.isRepeatable)
+ icapRequest(i.icapRequest),
+ icapReply(i.icapReply),
+ isRetriable(i.isRetriable),
+ isRepeatable(i.isRepeatable)
{
+ if (icapRequest)
+ HTTPMSGLOCK(icapRequest);
+ if (icapReply)
+ HTTPMSGLOCK(icapReply);
}
Adaptation::Icap::XactAbortInfo::~XactAbortInfo()
HTTPMSGUNLOCK(icapRequest);
HTTPMSGUNLOCK(icapReply);
}
+