From 330a95ed73eeb4c10a9eaf2804665706f586a6b9 Mon Sep 17 00:00:00 2001
From: Andrew Kroh <andy@crowbird.com>
Date: Fri, 28 Aug 2015 02:30:25 -0400
Subject: [PATCH] Addressing DNS pull request comments.

---
 etc/packetbeat.yml | 14 +++++++-------
 packetbeat.dev.yml | 14 +++++++-------
 protos/dns/dns.go  |  2 ++
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/etc/packetbeat.yml b/etc/packetbeat.yml
index 43a934de9fd..988c1d27a0e 100644
--- a/etc/packetbeat.yml
+++ b/etc/packetbeat.yml
@@ -42,19 +42,19 @@ protocols:
     ports: [53]
 
     # include_authorities controls whether or not the dns.authorities field
-    # (authority resource records) is added to messages. The default is no.
-    include_authorities: yes
+    # (authority resource records) is added to messages. The default is false.
+    include_authorities: true
     # include_additionals controls whether or not the dns.additionals field
-    # (additional resource records) is added to messages. The default is no.
-    include_additionals: yes
+    # (additional resource records) is added to messages. The default is false.
+    include_additionals: true
 
     # send_request and send_response control whether or not the stringified DNS
-    # request and response message are added to the result. The default is no.
+    # request and response message are added to the result. The default is false.
     # Nearly all data about the request/response is available in the dns.*
     # fields, but this can be useful if you need visibility specifically
     # into the request or the response.
-    #send_request:  yes
-    #send_response: yes
+    #send_request:  true
+    #send_response: true
 
   http:
 
diff --git a/packetbeat.dev.yml b/packetbeat.dev.yml
index 5298b20e4be..49ed1589518 100644
--- a/packetbeat.dev.yml
+++ b/packetbeat.dev.yml
@@ -46,19 +46,19 @@ protocols:
     ports: [53]
 
     # include_authorities controls whether or not the dns.authorities field
-    # (authority resource records) is added to messages. The default is no.
-    include_authorities: yes
+    # (authority resource records) is added to messages. The default is false.
+    include_authorities: true
     # include_additionals controls whether or not the dns.additionals field
-    # (additional resource records) is added to messages. The default is no.
-    include_additionals: yes
+    # (additional resource records) is added to messages. The default is false.
+    include_additionals: true
 
     # send_request and send_response control whether or not the stringified DNS
-    # request and response message are added to the result. The default is no.
+    # request and response message are added to the result. The default is false.
     # Nearly all data about the request/response is available in the dns.*
     # fields, but this can be useful if you need visibility specifically
     # into the request or the response.
-    #send_request:  yes
-    #send_response: yes
+    #send_request:  false
+    #send_response: flase
 
   http:
 
diff --git a/protos/dns/dns.go b/protos/dns/dns.go
index eaf4c8b951d..4dcc951fea6 100644
--- a/protos/dns/dns.go
+++ b/protos/dns/dns.go
@@ -312,6 +312,8 @@ func (dns *Dns) GetPorts() []int {
 }
 
 func (dns *Dns) ParseUdp(pkt *protos.Packet) {
+	defer logp.Recover("Dns ParseUdp")
+
 	logp.Debug("dns", "Parsing packet addressed with %s of length %d.",
 		pkt.Tuple.String(), len(pkt.Payload))