Merge branch 'master' into rec-outgoing-timeouts

diff --cc pdns/dnsmessage.proto
Simple merge

diff --cc pdns/protobuf.cc
Simple merge

diff --cc pdns/protobuf.hh
Simple merge

diff --cc regression-tests.recursor-dnssec/test_Protobuf.py
index 14497a53c5458ac4ecb0b9742ac1e502a57de535,ba01456faed59da4c6fbac06b88318c1a6cc6ce4..5aa77ed7e08eed6cc52869edee6d8876c12207eb
--- 1/regression-tests.recursor-dnssec/test_Protobuf.py
--- 2/regression-tests.recursor-dnssec/test_Protobuf.py
+++ b/regression-tests.recursor-dnssec/test_Protobuf.py
@@@ -218,17 -215,20 +218,25 @@@ class TestRecursorProtobuf(RecursorTest
          self.assertTrue(msg.question.HasField('qName'))
          self.assertEquals(msg.question.qName, qname)
  
 -    def checkProtobufIncomingResponse(self, msg, protocol, response, initiator='127.0.0.1'):
 +    def checkProtobufIncomingResponse(self, msg, protocol, response, initiator='127.0.0.1', length=None):
          self.assertEquals(msg.type, dnsmessage_pb2.PBDNSMessage.DNSIncomingResponseType)
 -        self.checkOutgoingProtobufBase(msg, protocol, response, initiator)
 +        self.checkOutgoingProtobufBase(msg, protocol, response, initiator, length=length)
          self.assertTrue(msg.HasField('response'))
 +        self.assertTrue(msg.response.HasField('rcode'))
          self.assertTrue(msg.response.HasField('queryTimeSec'))
  
 +    def checkProtobufIncomingNetworkErrorResponse(self, msg, protocol, response, initiator='127.0.0.1'):
 +        self.checkProtobufIncomingResponse(msg, protocol, response, initiator, length=0)
 +        self.assertEquals(msg.response.rcode, 65536)
 +
+     def checkProtobufIdentity(self, msg, requestorId, deviceId, deviceName):
+         self.assertTrue(msg.HasField('requestorId'))
+         self.assertTrue(msg.HasField('deviceId'))
+         self.assertTrue(msg.HasField('deviceName'))
+         self.assertEquals(msg.requestorId, requestorId)
+         self.assertEquals(msg.deviceId, deviceId)
+         self.assertEquals(msg.deviceName, deviceName)
+ 
      @classmethod
      def setUpClass(cls):