support extended dnstap

.github/workflows/golint.yml

@@ -37,6 +37,6 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.54
+        version: "v1.55.2"
         args: --timeout 3m --verbose
 

.gitignore

@@ -18,3 +18,5 @@
 __pycache__/
 
 go-dnscollector
+bin/
+include/

README.md

@@ -1,8 +1,8 @@
 <p align="center">
 <img src="https://goreportcard.com/badge/github.com/dmachard/go-dns-collector" alt="Go Report"/>
 <img src="https://img.shields.io/badge/go%20version-min%201.20-green" alt="Go version"/>
-<img src="https://img.shields.io/badge/go%20tests-377-green" alt="Go tests"/>
-<img src="https://img.shields.io/badge/go%20lines-36222-green" alt="Go lines"/>
+<img src="https://img.shields.io/badge/go%20tests-383-green" alt="Go tests"/>
+<img src="https://img.shields.io/badge/go%20lines-37290-green" alt="Go lines"/>
 </p>
 
 <p align="center">

config.yml

@@ -91,6 +91,14 @@ multiplexer:
 #     routing-policy:
 #       default: [ filter ]
 
+#   - name: second-input
+#     dnstap:
+#       listen-ip: 0.0.0.0
+#       listen-port: 6002
+#       extended-support: true
+#     routing-policy:
+#       default: [ console ]
+
 #   - name: filter
 #     dnsmessage:
 #       matching:
@@ -101,18 +109,26 @@ multiplexer:
 #         tags: [ "google"]
 #     routing-policy:
 #       dropped: [ outputfile ]
-#       default: [ console ]
+#       default: [ central ]
+
+#   - name: central
+#     dnstapclient:
+#       transport: tcp
+#       remote-address: 127.0.0.1
+#       remote-port: 6002
+#       flush-interval: 5
+#       extended-support: true
 
 #   - name: console
 #     stdout:
-#       mode: text
+#       mode: flat-json
 
 #   - name: outputfile
 #     logfile:
 #       file-path:  "/tmp/dnstap.log"
 #       max-size: 1000
 #       max-files: 10
-#       mode: flat-json
+#       mode: text
 
 ################################################
 # list of supported collectors
@@ -142,9 +158,11 @@ multiplexer:
 #   chan-buffer-size: 65535
 #   # Disable the minimalist DNS parser
 #   disable-dnsparser: true
+#   # Decode the extended extra field sent by DNScollector
+#   extended-support: false
 
 # # dnstap proxifier with no protobuf decoding.
-# dnstap-proxifier:
+# dnstap-relay:
 #   # listen on ip
 #   listen-ip: 0.0.0.0
 #   # listening on port
@@ -407,6 +425,8 @@ multiplexer:
 #   buffer-size: 100
 #   # Channel buffer size for incoming packets, number of packet before to drop it.
 #   chan-buffer-size: 65535
+#   # Extend the DNStap message by incorporating additional transformations, such as filtering and ATags, into the extra field.
+#   extended-support: false
 
 # # resend captured dns traffic to a tcp remote destination or to unix socket
 # tcpclient: