Skip to content

Commit

Permalink
Merge pull request #81 from dns-stats/develop
Browse files Browse the repository at this point in the history
Clarify accept/ignore command options for both OPCODE and RRTYPE
  • Loading branch information
saradickinson authored Mar 23, 2022
2 parents a4977ad + f103dde commit c5073c0
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 15 deletions.
6 changes: 6 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
#

Version 1.2.1 - 2022-03-23
--------------------------

* Minor documentation update to address
https://github.com/dns-stats/compactor/issues/80

Version 1.2.1-rc2 - 2022-01-26
--------------------------

Expand Down
28 changes: 15 additions & 13 deletions doc/user-guide/compactor-outputs.adoc.in
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,28 @@
the `excludesfile` option. See the user guide for more information.

*-G, --ignore-opcode* _OPCODE_::
Indicate an opcode _OPCODE_ that should not be included in the main output.
This argument can be given multiple times.
DNS messages with this _OPCODE_ should NOT be included in the main output
(the DNS message is discarded). This argument can be given multiple times.

*-E, --accept-opcode* _OPCODE_::
Indicate an opcode _OPCODE_ that should be included in the main output.
DNS messages with this _OPCODE_ should be included in the main output (if
used, messages with OPCODES not specified with this option are discarded).
This argument can be given multiple times.

*-g, --ignore-rr-type* _TYPE_::
Indicate an RR type _TYPE_ that should not be included in the main output.
The first question is always included, but _TYPE_ nominated using the RR type
name (in upper case) will be omitted from any other question and from
any Answer, Authority or Additional section. This argument can be given
multiple times.
Records of this RR type _TYPE_ should NOT be included in DNS messages when
they are written to the main output. Note that the first question is ALWAYS
included, but _TYPE_ nominated using the RR type name (in upper case) will
be omitted from any other question and from any Answer, Authority or
Additional section. This argument can be given multiple times.

*-e, --accept-rr-type* _TYPE_::
Indicate an RR type _TYPE_ that should be included in the main output.
The first question is always included, but only _TYPE_ nominated using
the RR type name (in upper case) will be included in any other question
and in any Answer, Authority or Additional section. This argument can be
given multiple times.
Records of this RR type _TYPE_ should be included in DNS messages when they
are written to the main output (if used, RR types not specified with this
option will be omitted from DNS messages). Note that the first question is
ALWAYS included, but only _TYPE_ nominated using the RR type name (in upper
case) will be included in any other question and in any Answer, Authority or
Additional section. This argument can be given multiple times.

*--max-block-items* _arg_::
Set the maximum number of query/response items or address event items
Expand Down
6 changes: 4 additions & 2 deletions etc/compactor.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@
# the address must be present on a capture interface.
# server-address-hint=

# RR type to ignore. Type name in UPPER CASE e.g. AAAA, RRSIG.
# Omit records of this RR type from the content of DNS messages when writing output
# (note - the first question is always written). Type name in UPPER CASE e.g. AAAA, RRSIG.
# ignore-rr-type=

# RR type to accept. Type name in UPPER CASE e.g. AAAA, RRSIG.
# Include records of this RR type in the content of DNS messages when writing output
# (note - the first question is always written). Type name in UPPER CASE e.g. AAAA, RRSIG.
# accept-rr-type=

# Log basic collection stats to syslog every n seconds. 0 (default) == never.
Expand Down

0 comments on commit c5073c0

Please sign in to comment.