Repository: trafficserver Updated Branches: refs/heads/master fbdf0221d -> 97394aedc
Cleanup on HostDB changes. Remove "is_rr" method and clang format. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/97394aed Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/97394aed Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/97394aed Branch: refs/heads/master Commit: 97394aedc0c05a6d541db8ce997ee48b4f9a4cc6 Parents: fbdf022 Author: Alan M. Carroll <[email protected]> Authored: Thu Mar 3 14:20:45 2016 -0600 Committer: Alan M. Carroll <[email protected]> Committed: Thu Mar 3 14:20:45 2016 -0600 ---------------------------------------------------------------------- iocore/hostdb/HostDB.cc | 2 +- iocore/hostdb/I_HostDBProcessor.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/97394aed/iocore/hostdb/HostDB.cc ---------------------------------------------------------------------- diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc index e5ba0d7..c4de47d 100644 --- a/iocore/hostdb/HostDB.cc +++ b/iocore/hostdb/HostDB.cc @@ -1533,7 +1533,7 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e) tip._family = AF_INET; // force the tip valid, or else the srv will fail r = lookup_done(tip, /* junk: FIXME: is the code in lookup_done() wrong to NEED this? */ md5.host_name, /* hostname */ - is_rr, /* is round robin, doesnt matter for SRV since we recheck getCount() inside lookup_done() */ + is_rr, /* is round robin, doesnt matter for SRV since we recheck getCount() inside lookup_done() */ ttl_seconds, /* ttl in seconds */ failed ? 0 : &e->srv_hosts); } else if (failed) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/97394aed/iocore/hostdb/I_HostDBProcessor.h ---------------------------------------------------------------------- diff --git a/iocore/hostdb/I_HostDBProcessor.h b/iocore/hostdb/I_HostDBProcessor.h index 39a58a1..8d83387 100644 --- a/iocore/hostdb/I_HostDBProcessor.h +++ b/iocore/hostdb/I_HostDBProcessor.h @@ -158,13 +158,6 @@ struct HostDBInfo { char *hostname(); char *perm_hostname(); char *srvname(HostDBRoundRobin *rr); - /// Check if this entry is the root of a round robin entry. - /// If @c true then this entry needs to be converted to a specific element of the round robin to be used. - bool - is_rr() const - { - return 0 != round_robin; - } /// Check if this entry is an element of a round robin entry. /// If @c true then this entry is part of and was obtained from a round robin root. This is useful if the /// address doesn't work - a retry can probably get a new address by doing another lookup and resolving to
