Merge branch 'master' of dnstap.pb

dnstap · Apr 21, 2014 · e4644c5 · e4644c5
2 parents 228ac64 + 2d8098a
commit e4644c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/dnstap.pb/.gitignore b/dnstap.pb/.gitignore
@@ -7,3 +7,4 @@
 *.pb.h
 *.pb.go
 *_pb2.py
+*_pb2.pyc
diff --git a/dnstap.pb/dnstap.proto b/dnstap.pb/dnstap.proto
@@ -157,6 +157,14 @@ message Message {
         // STUB_RESPONSE is a DNS response message sent from a DNS server to a
         // stub resolver, from the perspective of the stub resolver.
         STUB_RESPONSE = 10;
+
+        // TOOL_QUERY is a DNS query message sent from a DNS software tool to a
+        // DNS server, from the perspective of the tool.
+        TOOL_QUERY = 11;
+
+        // TOOL_RESPONSE is a DNS response message received by a DNS software
+        // tool from a DNS server, from the perspective of the tool.
+        TOOL_RESPONSE = 12;
     }
 
     // One of the Type values described above.
@@ -235,15 +243,13 @@ message Message {
 
 // RESOLVER_QUERY:
 //      socket_family, socket_protocol
-//      query_name, query_type, query_class
 //      query_message
 //      query_time_sec, query_time_nsec
 //      query_zone
 //      response_address, response_port
 
 // RESOLVER_RESPONSE:
 //      socket_family, socket_protocol
-//      query_name, query_type, query_class
 //      query_time_sec, query_time_nsec
 //      query_zone
 //      response_address, response_port