From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Wed, 14 Aug 2013 09:05:22 +0000 (+0200)
Subject: ignore non-query packets, closing #945
X-Git-Tag: rec-3.6.0-rc1~522
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3abcdab29026824fb1b25d8f85944416702c9b11;p=thirdparty%2Fpdns.git

ignore non-query packets, closing #945
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 8d47af81b0..f489004866 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -786,6 +786,11 @@ void handleRunningTCPQuestion(int fd, FDMultiplexer::funcparam_t& var)
         L<<Logger::Error<<"Ignoring answer on server socket!"<<endl;
         return;
       }
+      if(dc->d_mdp.d_header.opcode) {
+        delete dc;
+        L<<Logger::Error<<"Ignoring non-query opcode on server socket!"<<endl;
+        return;
+      }
       else {
         ++g_stats.qcounter;
         ++g_stats.tcpqcounter;
@@ -906,6 +911,10 @@ void handleNewUDPQuestion(int fd, FDMultiplexer::funcparam_t& var)
         if(g_logCommonErrors)
           L<<Logger::Error<<"Ignoring answer from "<<fromaddr.toString()<<" on server socket!"<<endl;
       }
+      else if(dh->opcode) {
+        if(g_logCommonErrors)
+          L<<Logger::Error<<"Ignoring non-query opcode "<<dh->opcode<<" from "<<fromaddr.toString()<<" on server socket!"<<endl;
+      }
       else {
 	string question(data, len);
 	if(g_weDistributeQueries)