Changeset 731

Timestamp:

04/18/06 23:59:41 (7 years ago)

Author:

ahu

Message:

implement id.server, version.bind ("version-string" and "server-id" in config)
implement remote-ringbuffer, rec_control top-remotes to see who is querying you
implement max-negative-ttl
remove socklen

Location:

trunk/pdns/pdns

Files:

• dns.hh (modified) (2 diffs)
• dnsparser.cc (modified) (1 diff)
• dnsrecords.cc (modified) (2 diffs)
• iputils.hh (modified) (1 diff)
• pdns_recursor.cc (modified) (11 diffs)
• rec_channel_rec.cc (modified) (3 diffs)
• syncres.cc (modified) (6 diffs)
• syncres.hh (modified) (5 diffs)

trunk/pdns/pdns/dns.hh

@@ -61 +61 @@
 {
 public:
-  DNSResourceRecord() : priority(0), d_place(ANSWER) {};
+  DNSResourceRecord() : qclass(1), priority(0), d_place(ANSWER) {};
   ~DNSResourceRecord(){};
 
@@ -70 +70 @@
   
   QType qtype; //!< qtype of this record, ie A, CNAME, MX etc
+  uint16_t qclass; //!< class of this record
   string qname; //!< the name of this record, for example: www.powerdns.com
   string content; //!< what this record points to. Example: 10.1.2.3

trunk/pdns/pdns/dnsparser.cc

@@ -55 +55 @@
     stringtok(parts, tmp);
     if(parts.size()!=3)
-      throw MOADNSException("Unknown record was stored incorrectly, need 3 fields, got "+lexical_cast<string>(parts.size()));
+      throw MOADNSException("Unknown record was stored incorrectly, need 3 fields, got "+lexical_cast<string>(parts.size())+": "+tmp );
     const string& relevant=parts[2];
     unsigned int total=atoi(parts[1].c_str());

trunk/pdns/pdns/dnsrecords.cc

@@ -283 +283 @@
 void reportBasicTypes()
 {
-    ARecordContent::report();
-    AAAARecordContent::report();
-    NSRecordContent::report();
-    CNAMERecordContent::report();
-    MXRecordContent::report();
-    SOARecordContent::report();
-    SRVRecordContent::report();
-    PTRRecordContent::report();
+  ARecordContent::report();
+  AAAARecordContent::report();
+  NSRecordContent::report();
+  CNAMERecordContent::report();
+  MXRecordContent::report();
+  SOARecordContent::report();
+  SRVRecordContent::report();
+  PTRRecordContent::report();
+  DNSRecordContent::regist(3, ns_t_txt, &TXTRecordContent::make, &TXTRecordContent::make, "TXT");
 }
 
 void reportOtherTypes()
 {
-   TXTRecordContent::report();
    SPFRecordContent::report();
    NAPTRRecordContent::report();
@@ -307 +307 @@
    OPTRecordContent::report();
    DNSRecordContent::regist(1,255, 0, 0, "ANY");
+   TXTRecordContent::report();
 }
 

trunk/pdns/pdns/iputils.hh

@@ -50 +50 @@
     else
       return memcmp(&sin6.sin6_addr.s6_addr, &rhs.sin6.sin6_addr.s6_addr, 16) < 0;
+  }
+
+  socklen_t getSocklen()
+  {
+    if(sin4.sin_family == AF_INET)
+      return sizeof(sin4);
+    else
+      return sizeof(sin6);
   }
 

trunk/pdns/pdns/pdns_recursor.cc

@@ -82 +82 @@
   {
     d_remote=*sa;
-    d_socklen= d_remote.sin4.sin_family == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
   }
 
@@ -97 +96 @@
   struct timeval d_now;
   ComboAddress d_remote;
-  socklen_t d_socklen;
   bool d_tcp;
   int d_socket;
@@ -459 +457 @@
       sr.setCacheOnly();
 
-    int res=sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret);
+    int res=sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);
     if(res<0) {
       pw.getHeader()->rcode=RCode::ServFail;
@@ -482 +480 @@
         shuffle(ret);
         for(vector<DNSResourceRecord>::const_iterator i=ret.begin();i!=ret.end();++i) {
-          pw.startRecord(i->qname, i->qtype.getCode(), i->ttl, 1, (DNSPacketWriter::Place)i->d_place);
-          
-          shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(i->qtype.getCode(), 1, i->content));
+          pw.startRecord(i->qname, i->qtype.getCode(), i->ttl, i->qclass, (DNSPacketWriter::Place)i->d_place);
+          shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(i->qtype.getCode(), i->qclass, i->content));
           
           drc->toPacket(pw);
@@ -500 +497 @@
   sendit:;
     if(!dc->d_tcp) {
-      sendto(dc->d_socket, &*packet.begin(), packet.size(), 0, (struct sockaddr *)(&dc->d_remote), dc->d_socklen);
+      sendto(dc->d_socket, &*packet.begin(), packet.size(), 0, (struct sockaddr *)(&dc->d_remote), dc->d_remote.getSocklen());
     }
     else {
@@ -672 +669 @@
   int newsock=accept(fd, (struct sockaddr*)&addr, &addrlen);
   if(newsock>0) {
+    g_stats.addRemote(addr);
     if(g_allowFrom && !g_allowFrom->match(&addr)) {
       g_stats.unauthorizedTCP++;
@@ -698 +696 @@
 }
 
-
 void handleNewUDPQuestion(int fd, boost::any& var)
 {
-  int d_len;
+  int len;
   char data[1500];
   ComboAddress fromaddr;
   socklen_t addrlen=sizeof(fromaddr);
 
-  while((d_len=recvfrom(fd, data, sizeof(data), 0, (sockaddr *)&fromaddr, &addrlen)) >= 0) {
+  if((len=recvfrom(fd, data, sizeof(data), 0, (sockaddr *)&fromaddr, &addrlen)) >= 0) {
+    g_stats.addRemote(fromaddr);
     if(g_allowFrom && !g_allowFrom->match(&fromaddr)) {
       g_stats.unauthorizedUDP++;
-      continue;
+      return;
     }
     
     try {
-      DNSComboWriter* dc = new DNSComboWriter(data, d_len, g_now);
+      DNSComboWriter* dc = new DNSComboWriter(data, len, g_now);
       
       dc->setRemote(&fromaddr);
@@ -792 +790 @@
 }
 
-
 void makeUDPServerSockets()
 {
@@ -927 +924 @@
 
     sr.setNoCache();
-    int res=sr.beginResolve(".", QType(QType::NS), ret);
+    int res=sr.beginResolve(".", QType(QType::NS), 1, ret);
     if(!res) {
       L<<Logger::Error<<"Refreshed . records"<<endl;
@@ -1176 +1173 @@
     ::arg().set("hint-file", "If set, load root hints from this file")="";
     ::arg().set("max-cache-entries", "If set, maximum number of entries in the main cache")="0";
+    ::arg().set("max-negative-ttl", "maximum number of seconds to keep a negative cached entry in memory")="3600";
+    ::arg().set("server-id", "Returned when queried for 'server.id' TXT, defaults to hostname")="";
+    ::arg().set("remotes-ringbuffer-entries", "maximum number of packets to store statistics for")="0";
+    ::arg().set("version-string", "maximum number of packets to store statistics for")="PowerDNS Recursor "VERSION" $Id$";
     ::arg().set("allow-from", "If set, only allow these comma separated netmasks to recurse")="127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12";
     ::arg().set("max-tcp-per-client", "If set, maximum number of TCP sessions per client (IP address)")="0";
@@ -1239 +1240 @@
     }
 
+    SyncRes::s_maxnegttl=::arg().asNum("max-negative-ttl");
+    SyncRes::s_serverID=::arg()["server-id"];
+    if(SyncRes::s_serverID.empty()) {
+      char tmp[128];
+      gethostname(tmp, sizeof(tmp)-1);
+      SyncRes::s_serverID=tmp;
+    }
+
+    g_stats.remotes.resize(::arg().asNum("remotes-ringbuffer-entries"));
+    memset(&*g_stats.remotes.begin(), 0, g_stats.remotes.size() * sizeof(RecursorStats::remotes_t::value_type));
     g_logCommonErrors=::arg().mustDo("log-common-errors");
 

trunk/pdns/pdns/rec_channel_rec.cc

@@ -9 +9 @@
 #include <boost/optional.hpp>
 #include <boost/tuple/tuple.hpp>
+#include <boost/format.hpp>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -182 +183 @@
 }
 
+string doTopRemotes()
+{
+  typedef map<ComboAddress, int> counts_t;
+  counts_t counts;
+  
+  unsigned int total=0;
+  for(RecursorStats::remotes_t::const_iterator i=g_stats.remotes.begin(); i != g_stats.remotes.end(); ++i)
+    if(i->sin4.sin_family) {
+      total++;
+      counts[*i]++;
+    }
+
+  typedef multimap<int, ComboAddress> rcounts_t;
+  rcounts_t rcounts;
+  
+  for(counts_t::const_iterator i=counts.begin(); i != counts.end(); ++i)
+    rcounts.insert(make_pair(-i->second, i->first));
+
+  ostringstream ret;
+  ret<<"Over last "<<total<<" queries:\n";
+  format fmt("%.02f%%\t%s\n");
+  if(total)
+    for(rcounts_t::const_iterator i=rcounts.begin(); i != rcounts.end(); ++i)
+      ret<< fmt % (-100.0*i->first/total) % i->second.toString();
+
+  return ret.str();
+}
+
 string RecursorControlParser::getAnswer(const string& question, RecursorControlParser::func_t** command)
 {
@@ -210 +239 @@
   if(cmd=="wipe-cache") 
     return doWipeCache(begin, end);
+
+  if(cmd=="top-remotes")
+    return doTopRemotes();
   
   return "Unknown command '"+cmd+"'\n";

trunk/pdns/pdns/syncres.cc

@@ -40 +40 @@
 SyncRes::negcache_t SyncRes::s_negcache;    
 SyncRes::nsspeeds_t SyncRes::s_nsSpeeds;    
-
+unsigned int SyncRes::s_maxnegttl;
 unsigned int SyncRes::s_queries;
 unsigned int SyncRes::s_outgoingtimeouts;
@@ -47 +47 @@
 unsigned int SyncRes::s_throttledqueries;
 unsigned int SyncRes::s_nodelegated;
+string SyncRes::s_serverID;
 bool SyncRes::s_log;
 
@@ -54 +55 @@
 
 /** everything begins here - this is the entry point just after receiving a packet */
-int SyncRes::beginResolve(const string &qname, const QType &qtype, vector<DNSResourceRecord>&ret)
+int SyncRes::beginResolve(const string &qname, const QType &qtype, uint16_t qclass, vector<DNSResourceRecord>&ret)
 {
   s_queries++;
@@ -63 +64 @@
     rr.qname=qname;
     rr.qtype=qtype;
+    rr.qclass=1;
     rr.ttl=86400;
     if(qtype.getCode()==QType::PTR)
@@ -68 +70 @@
     else
       rr.content="127.0.0.1";
+    ret.push_back(rr);
+    return 0;
+  }
+
+  if(qclass==3 && qtype.getCode()==QType::TXT && 
+        (!strcasecmp(qname.c_str(), "version.bind.") || !strcasecmp(qname.c_str(), "id.server.") || !strcasecmp(qname.c_str(), "version.pdns.") ) 
+     ) {
+    ret.clear();
+    DNSResourceRecord rr;
+    rr.qname=qname;
+    rr.qtype=qtype;
+    rr.qclass=qclass;
+    rr.ttl=86400;
+    if(!strcasecmp(qname.c_str(),"version.bind.")  || !strcasecmp(qname.c_str(),"version.pdns."))
+      rr.content="\""+::arg()["version-string"]+"\"";
+    else
+      rr.content="\""+s_serverID+"\"";
     ret.push_back(rr);
     return 0;
@@ -546 +565 @@
 
           ne.d_qname=i->qname;
-          ne.d_ttd=d_now.tv_sec + min(i->ttl, 3600U); // controversial
+          ne.d_ttd=d_now.tv_sec + min(i->ttl, s_maxnegttl); // controversial
           ne.d_name=qname;
           ne.d_qtype=QType(0);

trunk/pdns/pdns/syncres.hh

@@ -19 +19 @@
 #include <boost/tuple/tuple_comparison.hpp>
 #include "mtasker.hh"
-
-/* external functions, opaque to us */
+#include "iputils.hh"
 
 void primeHints(void);
@@ -215 +214 @@
   explicit SyncRes(const struct timeval& now) :  d_outqueries(0), d_tcpoutqueries(0), d_throttledqueries(0), d_timeouts(0), d_now(now),
                                                 d_cacheonly(false), d_nocache(false) { }
-  int beginResolve(const string &qname, const QType &qtype, vector<DNSResourceRecord>&ret);
+  int beginResolve(const string &qname, const QType &qtype, uint16_t qclass, vector<DNSResourceRecord>&ret);
   void setId(int id)
   {
@@ -269 +268 @@
   static throttle_t s_throttle;
   struct timeval d_now;
+  static unsigned int s_maxnegttl;
+  static string s_serverID;
 private:
   struct GetBestNSAnswer;
@@ -312 +313 @@
 };
 class Socket;
+/* external functions, opaque to us */
 int asendtcp(const string& data, Socket* sock);
 int arecvtcp(string& data, int len, Socket* sock);
@@ -373 +375 @@
   uint64_t spoofCount;
   uint64_t resourceLimits;
+  typedef vector<ComboAddress> remotes_t;
+  remotes_t remotes;
+  int d_remotepos;
+  void addRemote(const ComboAddress& remote)
+  {
+    if(!remotes.size())
+      return;
+
+    remotes[(d_remotepos++) % remotes.size()]=remote;
+  }
 };