return NULL;
}
-/*
- * XXX DW thinks this function is equivalent to/redundant with
- * getFirstUpParent(). peerHTTPOkay() only returns true if the
- * peer is UP anyway, so this function would not return a
- * DOWN parent.
- */
-peer *
-getAnyParent(HttpRequest * request)
-{
- peer *p = NULL;
-
- for (p = Config.peers; p; p = p->next) {
- if (neighborType(p, request) != PEER_PARENT)
- continue;
-
- if (!peerHTTPOkay(p, request))
- continue;
-
- debugs(15, 3, "getAnyParent: returning " << p->host);
-
- return p;
- }
-
- debugs(15, 3, "getAnyParent: returning NULL");
- return NULL;
-}
-
peer *
getNextPeer(peer * p)
{
if (ps->direct == DIRECT_YES)
return;
- if ((p = getDefaultParent(request))) {
- code = DEFAULT_PARENT;
+ if ((p = peerSourceHashSelectParent(request))) {
+ code = SOURCEHASH_PARENT;
#if USE_AUTH
} else if ((p = peerUserHashSelectParent(request))) {
code = USERHASH_PARENT;
#endif
- } else if ((p = peerSourceHashSelectParent(request))) {
- code = SOURCEHASH_PARENT;
} else if ((p = carpSelectParent(request))) {
code = CARP;
} else if ((p = getRoundRobinParent(request))) {
code = ROUNDROBIN_PARENT;
} else if ((p = getFirstUpParent(request))) {
code = FIRSTUP_PARENT;
- } else if ((p = getAnyParent(request))) {
- code = ANY_OLD_PARENT;
+ } else if ((p = getDefaultParent(request))) {
+ code = DEFAULT_PARENT;
}
if (code != HIER_NONE) {
SQUIDCEXTERN peer *getWeightedRoundRobinParent(HttpRequest * request);
SQUIDCEXTERN void peerClearRRStart(void);
SQUIDCEXTERN void peerClearRR(void);
-SQUIDCEXTERN peer *getAnyParent(HttpRequest * request);
SQUIDCEXTERN lookup_t peerDigestLookup(peer * p, HttpRequest * request);
SQUIDCEXTERN peer *neighborsDigestSelect(HttpRequest * request);
SQUIDCEXTERN void peerNoteDigestLookup(HttpRequest * request, peer * p, lookup_t lookup);