You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/08/31 03:59:47 UTC
svn commit: r991057 - in /trafficserver/traffic/trunk: ./ iocore/dns/
iocore/hostdb/ proxy/ proxy/config/ proxy/dns_cache/ proxy/mgmt2/
proxy/mgmt2/cli2/ proxy/mgmt2/html2/ proxy/mgmt2/html2/configure/
proxy/mgmt2/html2/monitor/ proxy/mgmt2/html2/tune/
Author: zwoop
Date: Tue Aug 31 01:59:46 2010
New Revision: 991057
URL: http://svn.apache.org/viewvc?rev=991057&view=rev
Log:
TS-422 Remove DNS proxy support.
After talking with John, we agreed to move ahead with this. Please
vote -1 on this committ if you are against this change. The thinking
here is that a) no one uses this and b) it's not 'feature complete'
anyways, making for a poor DNS proxy implementation.
Removed:
trafficserver/traffic/trunk/proxy/dns_cache/DNS_cache.cc
trafficserver/traffic/trunk/proxy/dns_cache/DNS_cache.h
trafficserver/traffic/trunk/proxy/dns_cache/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_dns_proxy.ink
trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/m_dns_proxy.ink
Modified:
trafficserver/traffic/trunk/REVIEWERS
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/dns/DNS.cc
trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h
trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h
trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/config/records.config.in
trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
Modified: trafficserver/traffic/trunk/REVIEWERS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/REVIEWERS?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/REVIEWERS (original)
+++ trafficserver/traffic/trunk/REVIEWERS Tue Aug 31 01:59:46 2010
@@ -76,7 +76,6 @@ Config
bcall@apache.org
georgep@apache.org
Congest
-DNS Cache
Logging
georgep@apache.org
MGMT
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Tue Aug 31 01:59:46 2010
@@ -1065,7 +1065,6 @@ AC_CONFIG_FILES([proxy/config/records.co
AC_CONFIG_FILES([proxy/config/storage.config])
AC_CONFIG_FILES([proxy/config/Makefile])
AC_CONFIG_FILES([proxy/congest/Makefile])
-AC_CONFIG_FILES([proxy/dns_cache/Makefile])
AC_CONFIG_FILES([proxy/hdrs/Makefile])
AC_CONFIG_FILES([proxy/http2/Makefile])
AC_CONFIG_FILES([proxy/logging/Makefile])
Modified: trafficserver/traffic/trunk/iocore/dns/DNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/DNS.cc?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/DNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/DNS.cc Tue Aug 31 01:59:46 2010
@@ -252,59 +252,49 @@ DNSEntry::init(const char *x, int len, i
dnsH->txn_lookup_timeout = dns_lookup_timeout;
mutex = dnsH->mutex;
-#ifdef DNS_PROXY
- if (!proxy) {
-#endif
- if (qtype == T_A || qtype == T_SRV) {
- if (len) {
- len = len > (MAXDNAME - 1) ? (MAXDNAME - 1) : len;
- memcpy(qname, x, len);
- qname_len = len;
- qname[len] = 0;
- } else {
- strncpy(qname, x, MAXDNAME);
- qname[MAXDNAME - 1] = '\0';
- qname_len = strlen(qname);
- }
- } else { //T_PTR
- char *p = qname;
- unsigned char *u = (unsigned char *) x;
- if (u[3] > 99)
- *p++ = (u[3] / 100) + '0';
- if (u[3] > 9)
- *p++ = ((u[3] / 10) % 10) + '0';
- *p++ = u[3] % 10 + '0';
- *p++ = '.';
- if (u[2] > 99)
- *p++ = (u[2] / 100) + '0';
- if (u[2] > 9)
- *p++ = ((u[2] / 10) % 10) + '0';
- *p++ = u[2] % 10 + '0';
- *p++ = '.';
- if (u[1] > 99)
- *p++ = (u[1] / 100) + '0';
- if (u[1] > 9)
- *p++ = ((u[1] / 10) % 10) + '0';
- *p++ = u[1] % 10 + '0';
- *p++ = '.';
- if (u[0] > 99)
- *p++ = (u[0] / 100) + '0';
- if (u[0] > 9)
- *p++ = ((u[0] / 10) % 10) + '0';
- *p++ = u[0] % 10 + '0';
- *p++ = '.';
- ink_strncpy(p, "in-addr.arpa", MAXDNAME - (p - qname + 1));
- }
-#ifdef DNS_PROXY
- } else {
+
+ if (qtype == T_A || qtype == T_SRV) {
if (len) {
- len = len > (MAX_DNS_PROXY_PACKET_LEN - 1) ? (MAX_DNS_PROXY_PACKET_LEN - 1) : len;
+ len = len > (MAXDNAME - 1) ? (MAXDNAME - 1) : len;
+ memcpy(qname, x, len);
+ qname_len = len;
+ qname[len] = 0;
} else {
- len = MAX_DNS_PROXY_PACKET_LEN;
- }
- memcpy(request, x, len);
+ strncpy(qname, x, MAXDNAME);
+ qname[MAXDNAME - 1] = '\0';
+ qname_len = strlen(qname);
+ }
+ } else { //T_PTR
+ char *p = qname;
+ unsigned char *u = (unsigned char *) x;
+
+ if (u[3] > 99)
+ *p++ = (u[3] / 100) + '0';
+ if (u[3] > 9)
+ *p++ = ((u[3] / 10) % 10) + '0';
+ *p++ = u[3] % 10 + '0';
+ *p++ = '.';
+ if (u[2] > 99)
+ *p++ = (u[2] / 100) + '0';
+ if (u[2] > 9)
+ *p++ = ((u[2] / 10) % 10) + '0';
+ *p++ = u[2] % 10 + '0';
+ *p++ = '.';
+ if (u[1] > 99)
+ *p++ = (u[1] / 100) + '0';
+ if (u[1] > 9)
+ *p++ = ((u[1] / 10) % 10) + '0';
+ *p++ = u[1] % 10 + '0';
+ *p++ = '.';
+ if (u[0] > 99)
+ *p++ = (u[0] / 100) + '0';
+ if (u[0] > 9)
+ *p++ = ((u[0] / 10) % 10) + '0';
+ *p++ = u[0] % 10 + '0';
+ *p++ = '.';
+ ink_strncpy(p, "in-addr.arpa", MAXDNAME - (p - qname + 1));
}
-#endif
+
if (sem_ent) {
#if defined(darwin)
static int qnum = 0;
@@ -869,35 +859,19 @@ write_dns_event(DNSHandler * h, DNSEntry
char buffer[MAX_DNS_PACKET_LEN];
int r = 0;
-#ifdef DNS_PROXY
- if (!e->proxy) {
-#endif
- if ((r = _ink_res_mkquery(h->m_res, e->qname, e->qtype, buffer)) <= 0) {
- Debug("dns", "cannot build query: %s", e->qname);
- dns_result(h, e, NULL, false);
- return true;
- }
-#ifdef DNS_PROXY
+ if ((r = _ink_res_mkquery(h->m_res, e->qname, e->qtype, buffer)) <= 0) {
+ Debug("dns", "cannot build query: %s", e->qname);
+ dns_result(h, e, NULL, false);
+ return true;
}
-#endif
-#ifdef DNS_PROXY
- if (!e->proxy) {
-#endif
- uint16 i = h->get_query_id();
- ((HEADER *) (buffer))->id = htons(i);
- if(e->id[dns_retries - e->retries] >= 0) {
- //clear previous id in case named was switched or domain was expanded
- h->release_query_id(e->id[dns_retries - e->retries]);
- }
- e->id[dns_retries - e->retries] = i;
-#ifdef DNS_PROXY
- } else {
- e->id[dns_retries - e->retries] = ntohs(((HEADER *) (e->request))->id);
- memcpy(buffer, e->request, MAX_DNS_PROXY_PACKET_LEN);
- r = MAX_DNS_PROXY_PACKET_LEN;
+ uint16 i = h->get_query_id();
+ ((HEADER *) (buffer))->id = htons(i);
+ if(e->id[dns_retries - e->retries] >= 0) {
+ //clear previous id in case named was switched or domain was expanded
+ h->release_query_id(e->id[dns_retries - e->retries]);
}
-#endif
+ e->id[dns_retries - e->retries] = i;
Debug("dns", "send query for %s to fd %d", e->qname, h->con[h->name_server].fd);
int s = socketManager.send(h->con[h->name_server].fd, buffer, r, 0);
@@ -964,33 +938,24 @@ DNSEntry::mainEvent(int event, Event * e
SET_HANDLER((DNSEntryHandler) & DNSEntry::delayEvent);
return handleEvent(event, e);
}
-#ifdef DNS_PROXY
- if (!proxy) {
-#endif
- //if (dns_search && !strnchr(qname,'.',MAXDNAME)){
- if (dns_search)
- domains = dnsH->m_res->dnsrch;
- if (domains && !strnchr(qname, '.', MAXDNAME)) {
- qname[qname_len] = '.';
- ink_strncpy(qname + qname_len + 1, *domains, MAXDNAME - (qname_len + 1));
- ++domains;
- }
- Debug("dns", "enqueing query %s", qname);
- DNSEntry *dup = get_entry(dnsH, qname, qtype);
- if (dup) {
- Debug("dns", "collapsing NS request");
- dup->dups.enqueue(this);
- } else {
- Debug("dns", "adding first to collapsing queue");
- dnsH->entries.enqueue(this);
- write_dns(dnsH);
- }
-#ifdef DNS_PROXY
+ //if (dns_search && !strnchr(qname,'.',MAXDNAME)){
+ if (dns_search)
+ domains = dnsH->m_res->dnsrch;
+ if (domains && !strnchr(qname, '.', MAXDNAME)) {
+ qname[qname_len] = '.';
+ ink_strncpy(qname + qname_len + 1, *domains, MAXDNAME - (qname_len + 1));
+ ++domains;
+ }
+ Debug("dns", "enqueing query %s", qname);
+ DNSEntry *dup = get_entry(dnsH, qname, qtype);
+ if (dup) {
+ Debug("dns", "collapsing NS request");
+ dup->dups.enqueue(this);
} else {
+ Debug("dns", "adding first to collapsing queue");
dnsH->entries.enqueue(this);
write_dns(dnsH);
}
-#endif
return EVENT_DONE;
}
case EVENT_INTERVAL:
@@ -1015,7 +980,7 @@ DNSEntry::mainEvent(int event, Event * e
Action *
DNSProcessor::getby(const char *x, int len, int type,
- Continuation * cont, HostEnt ** wait, DNSHandler * adnsH, bool proxy, bool proxy_cache, int timeout)
+ Continuation * cont, HostEnt ** wait, DNSHandler * adnsH, int timeout)
{
Debug("dns", "received query %s type = %d, timeout = %d", x, type, timeout);
if (type == T_SRV) {
@@ -1023,10 +988,6 @@ DNSProcessor::getby(const char *x, int l
}
DNSEntry *e = dnsEntryAllocator.alloc();
e->retries = dns_retries;
- if (proxy)
- e->proxy = true;
- if (proxy_cache)
- e->proxy_cache = true;
e->init(x, len, type, cont, wait, adnsH, timeout);
MUTEX_TRY_LOCK(lock, e->mutex, this_ethread());
if (!lock)
@@ -1055,7 +1016,7 @@ dns_result(DNSHandler * h, DNSEntry * e,
if (!ent && !cancelled) {
// try to retry operation
- if (retry && e->retries && !e->proxy && !e->proxy_cache) {
+ if (retry && e->retries) {
Debug("dns", "doing retry for %s", e->qname);
DNS_INCREMENT_DYN_STAT(dns_retries_stat);
@@ -1063,7 +1024,7 @@ dns_result(DNSHandler * h, DNSEntry * e,
--(e->retries);
write_dns(h);
return;
- } else if (e->domains && *e->domains && !e->proxy && !e->proxy_cache) {
+ } else if (e->domains && *e->domains) {
do {
Debug("dns", "domain extending %s", e->qname);
//int l = _strlen(e->qname);
@@ -1095,7 +1056,7 @@ dns_result(DNSHandler * h, DNSEntry * e,
LnextDomain:
++(e->domains);
} while (*e->domains);
- } else if (!e->proxy && !e->proxy_cache) {
+ } else {
e->qname[e->qname_len] = 0;
if (!strchr(e->qname, '.') && !e->last) {
e->last = true;
@@ -1183,17 +1144,11 @@ DNSEntry::post(DNSHandler * h, HostEnt *
}
return 0;
}
-#ifdef DNS_PROXY
- if (!proxy) {
-#endif
- for (int i = 0; i < MAX_DNS_RETRIES; i++) {
- if (id[i] < 0)
- break;
- h->release_query_id(id[i]);
- }
-#ifdef DNS_PROXY
+ for (int i = 0; i < MAX_DNS_RETRIES; i++) {
+ if (id[i] < 0)
+ break;
+ h->release_query_id(id[i]);
}
-#endif
action.mutex = NULL;
mutex = NULL;
dnsEntryAllocator.free(this);
@@ -1213,17 +1168,11 @@ DNSEntry::postEvent(int event, Event * e
if (ink_atomic_increment(&result_ent->ref_count, -1) == 1)
dnsProcessor.free_hostent(result_ent);
-#ifdef DNS_PROXY
- if (!proxy) {
-#endif
- for (int i = 0; i < MAX_DNS_RETRIES; i++) {
- if (id[i] < 0)
- break;
- dnsH->release_query_id(id[i]);
- }
-#ifdef DNS_PROXY
+ for (int i = 0; i < MAX_DNS_RETRIES; i++) {
+ if (id[i] < 0)
+ break;
+ dnsH->release_query_id(id[i]);
}
-#endif
action.mutex = NULL;
mutex = NULL;
dnsEntryAllocator.free(this);
@@ -1259,12 +1208,6 @@ dns_process(DNSHandler * handler, HostEn
--(handler->in_flight);
DNS_DECREMENT_DYN_STAT(dns_in_flight_stat);
- if (e->proxy) {
- Debug("dns", "using proxy");
- dns_result(handler, e, buf, retry);
- return server_ok;
- }
-
DNS_SUM_DYN_STAT(dns_response_time_stat, ink_get_hrtime() - e->send_time);
if (h->rcode != NOERROR || !h->ancount) {
Modified: trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h Tue Aug 31 01:59:46 2010
@@ -39,8 +39,6 @@
#define DOMAIN_SERVICE_PORT 53
#define DEFAULT_DOMAIN_NAME_SERVER 0 // use the default server
-#define DNS_PROXY 1
-
/**
All buffering required to handle a DNS receipt. For asynchronous DNS,
@@ -83,11 +81,10 @@ struct DNSProcessor: public Processor
// NOTE: the HostEnt * block is freed when the function returns
//
- Action *gethostbyname(Continuation * cont, const char *name, DNSHandler * adnsH = 0, bool dns_proxy = 0, int timeout = 0);
- Action *getSRVbyname(Continuation * cont, const char *name, DNSHandler * adnsH = 0, bool dns_proxy = 0, int timeout = 0);
+ Action *gethostbyname(Continuation * cont, const char *name, DNSHandler * adnsH = 0, int timeout = 0);
+ Action *getSRVbyname(Continuation * cont, const char *name, DNSHandler * adnsH = 0, int timeout = 0);
Action *gethostbyname(Continuation * cont, const char *name, int len, int timeout = 0);
Action *gethostbyaddr(Continuation * cont, unsigned int ip, int timeout = 0);
- Action *getproxyresult(Continuation * cont, char *request, DNSHandler * adnsH = 0);
// Blocking DNS lookup, user must free the return HostEnt *
// NOTE: this HostEnt is big, please free these ASAP
@@ -118,8 +115,7 @@ struct DNSProcessor: public Processor
DNSHandler *handler;
__ink_res_state l_res;
Action *getby(const char *x, int len, int type, Continuation * cont,
- HostEnt ** wait, DNSHandler * adnsH = NULL, bool proxy = false, bool proxy_cache = false, int timeout =
- 0);
+ HostEnt ** wait, DNSHandler * adnsH = NULL, int timeout = 0);
void dns_init();
};
@@ -145,30 +141,30 @@ DNSProcessor::getSRVbyname(const char *n
inline Action *
-DNSProcessor::getSRVbyname(Continuation * cont, const char *name, DNSHandler * adnsH, bool proxy, int timeout)
+DNSProcessor::getSRVbyname(Continuation * cont, const char *name, DNSHandler * adnsH, int timeout)
{
- return getby(name, 0, T_SRV, cont, 0, adnsH, 0, proxy, timeout);
+ return getby(name, 0, T_SRV, cont, 0, adnsH, timeout);
}
inline Action *
-DNSProcessor::gethostbyname(Continuation * cont, const char *name, DNSHandler * adnsH, bool proxy, int timeout)
+DNSProcessor::gethostbyname(Continuation * cont, const char *name, DNSHandler * adnsH, int timeout)
{
- return getby(name, 0, T_A, cont, 0, adnsH, 0, proxy, timeout);
+ return getby(name, 0, T_A, cont, 0, adnsH, timeout);
}
inline Action *
DNSProcessor::gethostbyname(Continuation * cont, const char *name, int len, int timeout)
{
- return getby(name, len, T_A, cont, 0, NULL, 0, false, timeout);
+ return getby(name, len, T_A, cont, 0, NULL, timeout);
}
inline Action *
DNSProcessor::gethostbyaddr(Continuation * cont, unsigned int addr, int timeout)
{
- return getby((char *) &addr, sizeof(addr), T_PTR, cont, 0, NULL, 0, false, timeout);
+ return getby((char *) &addr, sizeof(addr), T_PTR, cont, 0, NULL, timeout);
}
@@ -189,15 +185,6 @@ DNSProcessor::gethostbyaddr(unsigned int
return ent;
}
-
-#if DNS_PROXY
-inline Action *
-DNSProcessor::getproxyresult(Continuation * cont, char *request, DNSHandler * adnsH)
-{
- return getby((char *) request, 0, 0, cont, 0, adnsH, true, 0);
-}
-#endif
-
void ink_dns_init(ModuleVersion version);
#endif
Modified: trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h Tue Aug 31 01:59:46 2010
@@ -24,7 +24,6 @@
#if !defined (_P_DNSProcessor_h_)
#define _P_DNSProcessor_h_
-#define DNS_PROXY 1
/*
#include "I_DNS.h"
#include "inktomi++.h"
@@ -46,7 +45,6 @@
#define DEFAULT_FAILOVER_TRY_PERIOD (DEFAULT_DNS_TIMEOUT + 1)
#define DEFAULT_DNS_SEARCH 1
#define FAILOVER_SOON_RETRY 5
-#define MAX_DNS_PROXY_PACKET_LEN 1024
#define NO_NAMESERVER_SELECTED -1
//
@@ -88,7 +86,6 @@ extern unsigned int dns_sequence_number;
extern int dns_fd;
-void dns_cache_Init(void);
void *dns_udp_receiver(void *arg);
@@ -159,14 +156,8 @@ struct DNSEntry: public Continuation
char qname[MAXDNAME];
int qname_len;
char **domains;
- bool proxy_cache;
EThread *submit_thread;
-#ifdef DNS_PROXY
- bool proxy;
- unsigned char request[MAX_DNS_PROXY_PACKET_LEN];
-#endif
-
Action action;
Event *timeout;
@@ -198,17 +189,13 @@ struct DNSEntry: public Continuation
: Continuation(NULL),
qtype(0),
retries(DEFAULT_DNS_RETRIES),
- which_ns(NO_NAMESERVER_SELECTED), submit_time(0), send_time(0), qname_len(0), domains(0), proxy_cache(0),
-#ifdef DNS_PROXY
- proxy(0),
-#endif
+ which_ns(NO_NAMESERVER_SELECTED), submit_time(0), send_time(0), qname_len(0), domains(0),
timeout(0), result_ent(0), sem_ent(0), dnsH(0), written_flag(false), once_written_flag(false), last(false)
{
for (int i = 0; i < MAX_DNS_RETRIES; i++)
id[i] = -1;
memset(qname, 0, MAXDNAME);
- memset(request, 0, MAX_DNS_PROXY_PACKET_LEN);
memset(&sem, 0, sizeof sem);
}
};
Modified: trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc Tue Aug 31 01:59:46 2010
@@ -843,8 +843,6 @@ HostDBProcessor::getSRVbyname_imm(Contin
// Otherwise, create a continuation to do a deeper probe in the background
HostDBContinuation *c = hostDBContAllocator.alloc();
c->init(hostname, len, 0, port, md5, cont, pDS, true, dns_lookup_timeout);
- if (flags & HOSTDB_DNS_PROXY)
- c->dns_proxy = true;
c->force_dns = force_dns;
SET_CONTINUATION_HANDLER(c, (HostDBContHandler) & HostDBContinuation::probeEvent);
@@ -935,8 +933,6 @@ HostDBProcessor::getbyname_imm(Continuat
// Otherwise, create a continuation to do a deeper probe in the background
HostDBContinuation *c = hostDBContAllocator.alloc();
c->init(hostname, len, 0, port, md5, cont, pDS, false, dns_lookup_timeout);
- if (flags & HOSTDB_DNS_PROXY)
- c->dns_proxy = true;
c->force_dns = force_dns;
SET_CONTINUATION_HANDLER(c, (HostDBContHandler) & HostDBContinuation::probeEvent);
@@ -1822,11 +1818,11 @@ HostDBContinuation::do_dns()
if (m_pDS)
dnsH = (DNSHandler *) (((DNSServer *) (m_pDS))->x_dnsH);
#endif
- pending_action = dnsProcessor.gethostbyname(this, name, dnsH, dns_proxy, dns_lookup_timeout);
+ pending_action = dnsProcessor.gethostbyname(this, name, dnsH, dns_lookup_timeout);
} else if (is_srv()) {
DNSHandler *dnsH = 0;
Debug("dns_srv", "SRV lookup of %s", name);
- pending_action = dnsProcessor.getSRVbyname(this, name, dnsH, dns_proxy, dns_lookup_timeout);
+ pending_action = dnsProcessor.getSRVbyname(this, name, dnsH, dns_lookup_timeout);
} else {
Debug("hostdb", "DNS IP %u.%u.%u.%u",
((unsigned char *) &ip)[0], ((unsigned char *) &ip)[1],
@@ -2358,52 +2354,6 @@ ink_hostdb_init(ModuleVersion v)
// create a stat block for HostDBStats
hostdb_rsb = RecAllocateRawStatBlock((int) HostDB_Stat_Count);
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb", 1, RECU_DYNAMIC, RECC_NULL, NULL);
-
- IOCORE_RegisterConfigString(RECT_CONFIG, "proxy.config.hostdb.filename", "host.db", RECU_DYNAMIC, RECC_NULL, NULL);
-
-
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.size", 200000, RECU_DYNAMIC, RECC_NULL, NULL);
-
- IOCORE_RegisterConfigString(RECT_CONFIG,
- "proxy.config.hostdb.storage_path", "var/trafficserver", RECU_DYNAMIC, RECC_NULL, NULL);
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG,
- "proxy.config.hostdb.storage_size", 33554432, RECU_DYNAMIC, RECC_NULL, NULL);
-
- // # in minutes (all three)
- // # 0 = obey, 1 = ignore, 2 = min(X,ttl), 3 = max(X,ttl)
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.ttl_mode", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG,
- "proxy.config.hostdb.lookup_timeout", 120, RECU_DYNAMIC, RECC_STR, "^[0-9]+$");
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.verify_after", 720, RECU_DYNAMIC, RECC_NULL, NULL);
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.fail.timeout", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.re_dns_on_reload", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.migrate_on_demand", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
- // find DNS results on another node in the cluster?
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.cluster", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
- // find DNS results for round-robin hosts on another node in the cluster?
- IOCORE_RegisterConfigInteger(RECT_CONFIG,
- "proxy.config.hostdb.cluster.round_robin", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
- // # round-robin addresses for single clients
- // # (can cause authentication problems)
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.strict_round_robin", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.sync_frequency", 60, RECU_DYNAMIC, RECC_NULL, NULL);
-
- IOCORE_RegisterConfigInteger(RECT_CONFIG,
- "proxy.config.hostdb.disable_reverse_lookup", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
//
// Register stats
//
Modified: trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h Tue Aug 31 01:59:46 2010
@@ -432,7 +432,6 @@ struct HostDBProcessor: public Processor
HOSTDB_FORCE_DNS_RELOAD = 1,
HOSTDB_FORCE_DNS_ALWAYS = 2,
HOSTDB_DO_NOT_ROUND_ROBIN = 4,
- HOSTDB_DNS_PROXY = 8
};
inkcoreapi Action *getbyname_re(Continuation * cont, char *hostname, int len = 0,
Modified: trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h Tue Aug 31 01:59:46 2010
@@ -295,7 +295,6 @@ struct HostDBContinuation: public Contin
unsigned int missing:1;
unsigned int force_dns:1;
unsigned int round_robin:1;
- unsigned int dns_proxy:1;
int probeEvent(int event, Event * e);
int clusterEvent(int event, Event * e);
@@ -337,7 +336,7 @@ HostDBContinuation():
Continuation(NULL), ip(0), ttl(0), port(0),
is_srv_lookup(false), dns_lookup_timeout(0),
timeout(0), from(0),
- from_cont(0), probe_depth(0), namelen(0), missing(false), force_dns(false), round_robin(false), dns_proxy(false) {
+ from_cont(0), probe_depth(0), namelen(0), missing(false), force_dns(false), round_robin(false) {
memset(name, 0, MAXDNAME);
md5.b[0] = 0;
md5.b[1] = 0;
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Tue Aug 31 01:59:46 2010
@@ -97,7 +97,6 @@ extern "C" int plock(int);
// Including the new Auth Work Include File.
//#include "I_ACC.h"
-#include "dns_cache/DNS_cache.h"
#include "Update.h"
#include "congest/Congestion.h"
@@ -156,7 +155,6 @@ int http_accept_port_number = DEFAULT_HT
int http_accept_file_descriptor = NO_FD;
int ssl_accept_file_descriptor = NO_FD;
int qt_accept_file_descriptor = NO_FD;
-int dns_proxy_file_descriptor = NO_FD;
char accept_fd_list[1024] = "";
char core_file[255] = "";
int command_flag = DEFAULT_COMMAND_FLAG;
@@ -1061,11 +1059,6 @@ parse_accept_fd_list()
ink_assert(qt_accept_file_descriptor == NO_FD);
qt_accept_file_descriptor = fd;
continue;
- case 'D':
- // D is the special case of DNS proxy port
- ink_assert(dns_proxy_file_descriptor == NO_FD);
- dns_proxy_file_descriptor = fd;
- continue;
case 'C':
attr = SERVER_PORT_COMPRESSED;
break;
@@ -2152,17 +2145,6 @@ main(int argc, char **argv)
///////////////////////////////////////////
updateManager.start();
-
- int dns_proxy_enabled = 0;
-
- TS_ReadConfigInteger(dns_proxy_enabled, "proxy.config.dns.proxy.enabled");
- if (dns_proxy_enabled) {
- ink_dns_cache_init(makeModuleVersion(1, 0, PRIVATE_MODULE_HEADER));
- start_dns_Proxy(dns_proxy_file_descriptor);
- }
-
- TS_ReadConfigInteger(dns_proxy_enabled, "proxy.config.dns.proxy.enabled");
-
void *mgmt_restart_shutdown_callback(void *, char *, int data_len);
pmgmt->registerMgmtCallback(MGMT_EVENT_SHUTDOWN, mgmt_restart_shutdown_callback, NULL);
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Tue Aug 31 01:59:46 2010
@@ -22,7 +22,7 @@ noinst_LIBRARIES = libTrafficServerStand
bin_PROGRAMS =
noinst_PROGRAMS =
else
-SUBDIRS = congest dns_cache http2 hdrs logging mgmt2 config stats
+SUBDIRS = congest http2 hdrs logging mgmt2 config stats
noinst_LIBRARIES =
bin_PROGRAMS = \
traffic_server \
@@ -153,7 +153,6 @@ traffic_server_LDFLAGS = @EXTRA_CXX_LDFL
traffic_server_LDADD = \
http2/libhttp.a \
congest/libCongestionControl.a \
- dns_cache/libdnscache.a \
logging/liblogging.a \
stats/libstats.a \
hdrs/libhdrs.a \
@@ -218,7 +217,6 @@ traffic_logcat_LDADD = \
stats/libstats.a \
hdrs/libhdrs.a \
congest/libCongestionControl.a \
- dns_cache/libdnscache.a \
mgmt2/preparse/libpreparse.a \
mgmt2/utils/libutils_p.a \
mgmt2/libmgmt_p.a \
@@ -281,7 +279,6 @@ traffic_logstats_LDADD = \
stats/libstats.a \
hdrs/libhdrs.a \
congest/libCongestionControl.a \
- dns_cache/libdnscache.a \
mgmt2/preparse/libpreparse.a \
mgmt2/utils/libutils_p.a \
mgmt2/libmgmt_p.a \
@@ -342,7 +339,6 @@ traffic_sac_LDADD = \
InkXml.o \
http2/libhttp.a \
congest/libCongestionControl.a \
- dns_cache/libdnscache.a \
logging/liblogging.a \
stats/libstats.a \
hdrs/libhdrs.a \
Modified: trafficserver/traffic/trunk/proxy/config/records.config.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.in?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.in Tue Aug 31 01:59:46 2010
@@ -356,13 +356,6 @@ CONFIG proxy.config.dns.nameservers STRI
CONFIG proxy.config.dns.validate_query_name INT 0
##############################################################################
#
-# DNS Proxy
-#
-##############################################################################
-CONFIG proxy.config.dns.proxy.enabled INT 0
-CONFIG proxy.config.dns.proxy_port INT 53
-##############################################################################
-#
# HostDB
#
##############################################################################
Modified: trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc Tue Aug 31 01:59:46 2010
@@ -312,19 +312,7 @@ BaseManager(), run_proxy(proxy_on), reco
pnum++;
}
}
- // Check to see if we are running DNS proxy
- RecInt dns_proxy_enabled = REC_readInteger("proxy.config.dns.proxy.enabled", &found);
- ink_assert(found);
- if (found && dns_proxy_enabled) {
- // Get the DNS cache port
- RecInt dns_proxy_port = REC_readInteger("proxy.config.dns.proxy_port", &found);
- ink_assert(found);
- if (found) {
- proxy_server_port[pnum] = (int) dns_proxy_port;
- ink_strncpy((char *) proxy_server_port_attributes[pnum], "D", sizeof(proxy_server_port_attributes[pnum]));
- pnum++;
- }
- }
+
// Read other ports to be listened on
char *proxy_server_other_ports = REC_readString("proxy.config.http.server_other_ports", &found);
if (proxy_server_other_ports) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Tue Aug 31 01:59:46 2010
@@ -4157,12 +4157,6 @@ RecordElement RecordsConfig[] = {
,
{CONFIG, "proxy.config.remap.num_remap_threads", "", INK_INT, "1", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
-
- //#DNS_cache configuration
- {CONFIG, "proxy.config.dns.proxy.enabled", "", INK_INT, "0", RU_RESTART_TM, RR_NULL, RC_INT, "[0-1]", RA_NULL}
- ,
- {CONFIG, "proxy.config.dns.proxy_port", "", INK_INT, "53", RU_RESTART_TM, RR_NULL, RC_INT, "[0-65535]", RA_NULL}
- ,
//##############################################################################
//#
//# The End
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc Tue Aug 31 01:59:46 2010
@@ -252,8 +252,6 @@ CliCreateCommands()
createCommand("config:dns", Cmd_ConfigDns, CmdArgs_ConfigDns, CLI_COMMAND_EXTERNAL,
- "config:dns proxy <on | off>\n"
- "config:dns proxy-port <int>\n"
"config:dns resolve-timeout <seconds>\n" "config:dns retries <int>", "Configure DNS");
createCommand("config:virtual-ip", Cmd_ConfigVirtualip, CmdArgs_ConfigVirtualip, CLI_COMMAND_EXTERNAL,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Tue Aug 31 01:59:46 2010
@@ -2023,12 +2023,6 @@ Cmd_ConfigDns(ClientData clientData, Tcl
if (argtable->parsed_args != CLI_PARSED_ARGV_END) {
switch (argtable->parsed_args) {
- case CMD_CONFIG_DNS_PROXY:
- return (Cli_RecordOnOff_Action(action, "proxy.config.dns.proxy.enabled", argtable->arg_string));
-
- case CMD_CONFIG_DNS_PROXY_PORT:
- return (Cli_RecordInt_Action(action, "proxy.config.dns.proxy_port", argtable->arg_int));
-
case CMD_CONFIG_DNS_RESOLVE_TIMEOUT:
return (Cli_RecordInt_Action(action, "proxy.config.dns.lookup_timeout", argtable->arg_int));
@@ -2048,10 +2042,6 @@ Cmd_ConfigDns(ClientData clientData, Tcl
int
CmdArgs_ConfigDns()
{
- createArgument("proxy", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_DNS_PROXY, "Enable/disable DNS proxy feature <on | off>", (char *) NULL);
- createArgument("proxy-port", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_DNS_PROXY_PORT, "Specify DNS proxy port <int>", (char *) NULL);
createArgument("resolve-timeout", 1, CLI_ARGV_OPTION_INT_VALUE,
(char *) NULL, CMD_CONFIG_DNS_RESOLVE_TIMEOUT, "Resolve timeout <int>", (char *) NULL);
createArgument("retries", 1, CLI_ARGV_OPTION_INT_VALUE,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h Tue Aug 31 01:59:46 2010
@@ -205,8 +205,6 @@ typedef enum
CMD_CONFIG_HOSTDB_RE_DNS_ON_RELOAD,
CMD_CONFIG_HOSTDB_CLEAR,
CMD_CONFIG_DNS,
- CMD_CONFIG_DNS_PROXY,
- CMD_CONFIG_DNS_PROXY_PORT,
CMD_CONFIG_DNS_RESOLVE_TIMEOUT,
CMD_CONFIG_DNS_RETRIES,
CMD_CONFIG_VIRTUALIP,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt Tue Aug 31 01:59:46 2010
@@ -1319,20 +1319,6 @@ hostdb Host Database Configuration
ts#
dns DNS Configuration
- syntax: config:dns proxy <on | off>
- records: proxy.config.dns.proxy.enabled
-
- ts# config:dns proxy on
- +OK
- ts#
-
- syntax: config:dns proxy-port <int>
- records: proxy.config.dns.proxy_port
-
- ts# config:dns proxy-port 5353
- +OK
- ts#
-
syntax: config:dns resolve-timeout <seconds>
records: proxy.config.dns.lookup_timeout
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml Tue Aug 31 01:59:46 2010
@@ -151,11 +151,6 @@
file_link="/monitor/m_net.ink"
help_link="/help/ts.ink?help=s_system.htm"/>
</ITEM>
- <ITEM name="DNS Proxy" enable_record="proxy.config.dns.proxy.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_dns_proxy.ink"
- help_link="/help/ts.ink?help=s_dnsp.htm"/>
- </ITEM>
<ITEM name="DNS Resolver">
<LINK refresh="true"
file_link="/monitor/m_dns.ink"
@@ -436,11 +431,6 @@
file_link="/configure/c_congestion.ink"
help_link="/help/ts.ink?help=c_cmng.htm"/>
</ITEM>
- <ITEM name="DNS Proxy" enable_record="proxy.config.dns.proxy.enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_dns_proxy.ink"
- help_link="/help/ts.ink?help=c_dnsp.htm"/>
- </ITEM>
<ITEM name="DNS Resolver">
<LINK name="Resolver" refresh="false"
file_link="/configure/c_dns_resolver.ink"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp?rev=991057&r1=991056&r2=991057&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp Tue Aug 31 01:59:46 2010
@@ -181,11 +181,6 @@ This text will be stripped from the buil
help_link="/help/ts.ink?help=s_system.htm"/>
</ITEM>
#endif
- <ITEM name="DNS Proxy" enable_record="proxy.config.dns.proxy.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_dns_proxy.ink"
- help_link="/help/ts.ink?help=s_dnsp.htm"/>
- </ITEM>
<ITEM name="DNS Resolver">
<LINK refresh="true"
file_link="/monitor/m_dns.ink"
@@ -502,11 +497,6 @@ This text will be stripped from the buil
file_link="/configure/c_congestion.ink"
help_link="/help/ts.ink?help=c_cmng.htm"/>
</ITEM>
- <ITEM name="DNS Proxy" enable_record="proxy.config.dns.proxy.enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_dns_proxy.ink"
- help_link="/help/ts.ink?help=c_dnsp.htm"/>
- </ITEM>
<ITEM name="DNS Resolver">
<LINK name="Resolver" refresh="false"
file_link="/configure/c_dns_resolver.ink"