Changeset 1123

Timestamp:

01/01/08 21:48:54 (2 years ago)

Author:

ahu

Message:

implement EDNS0 support in the PowerDNS Authoritative Server

Location:

trunk/pdns/pdns

Files:

• dnspacket.cc (modified) (5 diffs)
• dnspacket.hh (modified) (2 diffs)
• nameserver.cc (modified) (2 diffs)

trunk/pdns/pdns/dnspacket.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2001 - 2007  PowerDNS.COM BV
+    Copyright (C) 2001 - 2008  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -88 +88 @@
   qclass=orig.qclass;
   qdomain=orig.qdomain;
-
+  d_maxreplylen = orig.d_maxreplylen;
   rrs=orig.rrs;
 
@@ -381 +381 @@
   r->qdomain = qdomain;
   r->qtype = qtype;
+  r->d_maxreplylen = d_maxreplylen;
   return r;
 }
@@ -407 +408 @@
     return -1;
   }
-  MOADNSParser mdp(string(mesg, length));
+  MOADNSParser mdp(stringbuffer);
+  MOADNSParser::EDNSOpts edo;
+  if(mdp.getEDNSOpts(&edo)) {
+    d_maxreplylen=edo.d_packetsize;
+  }
+  else
+    d_maxreplylen=512;
 
   memcpy((void *)&d,(const void *)stringbuffer.c_str(),12);
@@ -429 +436 @@
 }
 
+int DNSPacket::getMaxReplyLen()
+{
+  return d_maxreplylen;
+}
+
 //! Use this to set where this packet was received from or should be sent to
 void DNSPacket::setRemote(const ComboAddress *s)

trunk/pdns/pdns/dnspacket.hh

@@ -139 +139 @@
 
   void commitD(); //!< copies 'd' into the stringbuffer
-
+  int getMaxReplyLen(); //!< retrieve the maximum length of the packet we should send in response
   //////// DATA !
 
@@ -162 +162 @@
 
   string stringbuffer; // this is where everything lives 4
-
+  int d_maxreplylen;
   vector<DNSResourceRecord> rrs; // 4
 };

trunk/pdns/pdns/nameserver.cc

@@ -43 +43 @@
 
     \section copyright Copyright and License
-    PowerDNS is (C) 2005 PowerDNS.COM BV. It is distributed according to the terms of the General Public License version 2.
+    PowerDNS is (C) 2001-2008 PowerDNS.COM BV. It is distributed according to the terms of the General Public License version 2.
 
     \section overview High level overview
@@ -181 +181 @@
   const char *buffer=p->getData();
   DLOG(L<<Logger::Notice<<"Sending a packet to "<< p->remote.toString() <<" ("<<p->len<<" octets)"<<endl);
-  if(p->len>512) {
+  if(p->len > p->getMaxReplyLen()) {
     shared_ptr<DNSPacket> sharedp(new DNSPacket(*p));
-    sharedp->truncate(512);
+    sharedp->truncate(p->getMaxReplyLen());
     buffer=sharedp->getData();
     if(sendto(sharedp->getSocket(),buffer,sharedp->len,0,(struct sockaddr *)(&sharedp->remote), sharedp->remote.getSocklen())<0)