From ea892f706fc423edb0b7e883ebd8a0c26dd4d44d Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Mon, 8 Jan 2018 00:50:24 +0100
Subject: [PATCH] Remove obsolete EDNS PING code

---
 pdns/dnspacket.cc | 21 +++++----------------
 pdns/dnspacket.hh |  1 -
 pdns/sdig.cc      | 10 +++-------
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index e03f7fad9..dc89f342b 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -36,6 +36,7 @@
 #include "dnsseckeeper.hh"
 #include "dns.hh"
 #include "dnsbackend.hh"
+#include "ednsoptions.hh"
 #include "pdnsexception.hh"
 #include "dnspacket.hh"
 #include "logger.hh"
@@ -105,7 +106,6 @@ DNSPacket::DNSPacket(const DNSPacket &orig)
   qdomainwild=orig.qdomainwild;
   qdomainzone=orig.qdomainzone;
   d_maxreplylen = orig.d_maxreplylen;
-  d_ednsping = orig.d_ednsping;
   d_wantsnsid = orig.d_wantsnsid;
   d_anyLocal = orig.d_anyLocal;  
   d_eso = orig.d_eso;
@@ -242,7 +242,7 @@ void DNSPacket::setCompress(bool compress)
 
 bool DNSPacket::couldBeCached()
 {
-  return d_ednsping.empty() && !d_wantsnsid && qclass==QClass::IN && !d_havetsig;
+  return !d_wantsnsid && qclass==QClass::IN && !d_havetsig;
 }
 
 unsigned int DNSPacket::getMinTTL()
@@ -306,11 +306,6 @@ void DNSPacket::wrapup()
     }
   }
 
-  if(!d_ednsping.empty()) {
-    opts.push_back(make_pair(4, d_ednsping));
-  }
-  
-  
   if(!d_rrs.empty() || !opts.empty() || d_haveednssubnet || d_haveednssection) {
     try {
       uint8_t maxScopeMask=0;
@@ -402,7 +397,6 @@ DNSPacket *DNSPacket::replyPacket() const
   r->qtype = qtype;
   r->qclass = qclass;
   r->d_maxreplylen = d_maxreplylen;
-  r->d_ednsping = d_ednsping;
   r->d_wantsnsid = d_wantsnsid;
   r->d_dnssecOk = d_dnssecOk;
   r->d_eso = d_eso;
@@ -447,7 +441,6 @@ int DNSPacket::noparse(const char *mesg, size_t length)
     return -1;
   }
   d_wantsnsid=false;
-  d_ednsping.clear();
   d_maxreplylen=512;
   memcpy((void *)&d,(const void *)d_rawpacket.c_str(),12);
   return 0;
@@ -543,7 +536,6 @@ try
 
   d_wantsnsid=false;
   d_dnssecOk=false;
-  d_ednsping.clear();
   d_havetsig = mdp.getTSIGPos();
   d_haveednssubnet = false;
   d_haveednssection = false;
@@ -562,13 +554,10 @@ try
     for(vector<pair<uint16_t, string> >::const_iterator iter = edo.d_options.begin();
         iter != edo.d_options.end(); 
         ++iter) {
-      if(iter->first == 3) {// 'EDNS NSID'
-        d_wantsnsid=1;
-      }
-      else if(iter->first == 5) {// 'EDNS PING'
-        d_ednsping = iter->second;
+      if(iter->first == EDNSOptionCode::NSID) {
+        d_wantsnsid=true;
       }
-      else if(s_doEDNSSubnetProcessing && (iter->first == 8)) { // 'EDNS SUBNET'
+      else if(s_doEDNSSubnetProcessing && (iter->first == EDNSOptionCode::ECS)) { // 'EDNS SUBNET'
         if(getEDNSSubnetOptsFromString(iter->second, &d_eso)) {
           //cerr<<"Parsed, source: "<<d_eso.source.toString()<<", scope: "<<d_eso.scope.toString()<<", family = "<<d_eso.scope.getNetwork().sin4.sin_family<<endl;
           d_haveednssubnet=true;
diff --git a/pdns/dnspacket.hh b/pdns/dnspacket.hh
index 5a717e307..27b428bf0 100644
--- a/pdns/dnspacket.hh
+++ b/pdns/dnspacket.hh
@@ -175,7 +175,6 @@ private:
 
   vector<DNSZoneRecord> d_rrs; // 8
   string d_rawpacket; // this is where everything lives 8
-  string d_ednsping;
   EDNSSubnetOpts d_eso;
 
   int d_maxreplylen;
diff --git a/pdns/sdig.cc b/pdns/sdig.cc
index bcd2bbeb0..dd424b50c 100644
--- a/pdns/sdig.cc
+++ b/pdns/sdig.cc
@@ -2,6 +2,7 @@
 #include "config.h"
 #endif
 #include "dnsparser.hh"
+#include "ednsoptions.hh"
 #include "sstuff.hh"
 #include "misc.hh"
 #include "dnswriter.hh"
@@ -92,7 +93,7 @@ try
     if(ednsnm) {
       EDNSSubnetOpts eo;
       eo.source = *ednsnm;
-      opts.push_back(make_pair(8, makeEDNSSubnetOptsString(eo)));
+      opts.push_back(make_pair(EDNSOptionCode::ECS, makeEDNSSubnetOptsString(eo)));
     }
 
     pw.addOpt(bufsize, 0, dnssec ? EDNSOpts::DNSSECOK : 0, opts);
@@ -196,12 +197,7 @@ try
     for(vector<pair<uint16_t, string> >::const_iterator iter = edo.d_options.begin();
         iter != edo.d_options.end(); 
         ++iter) {
-      if(iter->first == 5) {// 'EDNS PING'
-        cerr<<"Have ednsping: '"<<iter->second<<"'\n";
-        //if(iter->second == ping) 
-         // cerr<<"It is correct!"<<endl;
-      }
-      if(iter->first == 8) {// 'EDNS subnet'
+      if(iter->first == EDNSOptionCode::ECS) {// 'EDNS subnet'
 	EDNSSubnetOpts reso;
         if(getEDNSSubnetOptsFromString(iter->second, &reso)) {
           cerr<<"EDNS Subnet response: "<<reso.source.toString()<<", scope: "<<reso.scope.toString()<<", family = "<<reso.scope.getNetwork().sin4.sin_family<<endl;
-- 
2.40.0