Merge branch 'master' into websvc-confin-manager

internal/aghnet/arpdb_bsd.go

@@ -33,8 +33,7 @@ func newARPDB() (arp *cmdARPDB) {
 // parseArpA parses the output of the "arp -a -n" command on macOS and FreeBSD.
 // The expected input format:
 //
-//   host.name (192.168.0.1) at ff:ff:ff:ff:ff:ff on en0 ifscope [ethernet]
+//	host.name (192.168.0.1) at ff:ff:ff:ff:ff:ff on en0 ifscope [ethernet]
-//
 func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	ns = make([]Neighbor, 0, lenHint)
 	for sc.Scan() {

internal/aghnet/arpdb_linux.go

@@ -117,9 +117,8 @@ func (arp *fsysARPDB) Neighbors() (ns []Neighbor) {
 // parseArpAWrt parses the output of the "arp -a -n" command on OpenWrt.  The
 // expected input format:
 //
-//   IP address     HW type  Flags  HW address         Mask  Device
+//	IP address     HW type  Flags  HW address         Mask  Device
-//   192.168.11.98  0x1      0x2    5a:92:df:a9:7e:28  *     wan
+//	192.168.11.98  0x1      0x2    5a:92:df:a9:7e:28  *     wan
-//
 func parseArpAWrt(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	if !sc.Scan() {
 		// Skip the header.
@@ -161,8 +160,7 @@ func parseArpAWrt(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 // parseArpA parses the output of the "arp -a -n" command on Linux.  The
 // expected input format:
 //
-//   hostname (192.168.1.1) at ab:cd:ef:ab:cd:ef [ether] on enp0s3
+//	hostname (192.168.1.1) at ab:cd:ef:ab:cd:ef [ether] on enp0s3
-//
 func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	ns = make([]Neighbor, 0, lenHint)
 	for sc.Scan() {
@@ -208,8 +206,7 @@ func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 // parseIPNeigh parses the output of the "ip neigh" command on Linux.  The
 // expected input format:
 //
-//   192.168.1.1 dev enp0s3 lladdr ab:cd:ef:ab:cd:ef REACHABLE
+//	192.168.1.1 dev enp0s3 lladdr ab:cd:ef:ab:cd:ef REACHABLE
-//
 func parseIPNeigh(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	ns = make([]Neighbor, 0, lenHint)
 	for sc.Scan() {

internal/aghnet/arpdb_openbsd.go

@@ -32,9 +32,8 @@ func newARPDB() (arp *cmdARPDB) {
 // parseArpA parses the output of the "arp -a -n" command on OpenBSD.  The
 // expected input format:
 //
-//   Host        Ethernet Address  Netif Expire    Flags
+//	Host        Ethernet Address  Netif Expire    Flags
-//   192.168.1.1 ab:cd:ef:ab:cd:ef   em0 19m59s
+//	192.168.1.1 ab:cd:ef:ab:cd:ef   em0 19m59s
-//
 func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	// Skip the header.
 	if !sc.Scan() {

internal/aghnet/arpdb_windows.go

@@ -25,12 +25,10 @@ func newARPDB() (arp *cmdARPDB) {
 // parseArpA parses the output of the "arp /a" command on Windows.  The expected
 // input format (the first line is empty):
 //
-//
+//	Interface: 192.168.56.16 --- 0x7
-//   Interface: 192.168.56.16 --- 0x7
+//	  Internet Address      Physical Address      Type
-//     Internet Address      Physical Address      Type
+//	  192.168.56.1          0a-00-27-00-00-00     dynamic
-//     192.168.56.1          0a-00-27-00-00-00     dynamic
+//	  192.168.56.255        ff-ff-ff-ff-ff-ff     static
-//     192.168.56.255        ff-ff-ff-ff-ff-ff     static
-//
 func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	ns = make([]Neighbor, 0, lenHint)
 	for sc.Scan() {

internal/aghnet/hostgen.go

@@ -45,11 +45,11 @@ func generateIPv6Hostname(ipv6 net.IP) (hostname string) {
 // GenerateHostname generates the hostname from ip.  In case of using IPv4 the
 // result should be like:
 //
-//   192-168-10-1
+//	192-168-10-1
 //
 // In case of using IPv6, the result is like:
 //
-//   ff80-f076-0000-0000-0000-0000-0000-0010
+//	ff80-f076-0000-0000-0000-0000-0000-0010
 //
 // ip must be either an IPv4 or an IPv6.
 func GenerateHostname(ip net.IP) (hostname string) {

internal/aghnet/hostscontainer.go

@@ -70,8 +70,7 @@ func (rm *requestMatcher) MatchRequest(
 // rule or an empty string if the last doesn't exist.  The returned rules are in
 // a processed format like:
 //
-//   ip host1 host2 ...
+//	ip host1 host2 ...
-//
 func (rm *requestMatcher) Translate(rule string) (hostRule string) {
 	rm.stateLock.RLock()
 	defer rm.stateLock.RUnlock()

internal/aghnet/ipset.go

@@ -18,7 +18,7 @@ type IpsetManager interface {
 //
 // The syntax of the ipsetConf is:
 //
-//   DOMAIN[,DOMAIN].../IPSET_NAME[,IPSET_NAME]...
+//	DOMAIN[,DOMAIN].../IPSET_NAME[,IPSET_NAME]...
 //
 // If ipsetConf is empty, msg and err are nil.  The error is of type
 // *aghos.UnsupportedError if the OS is not supported.

internal/aghnet/systemresolvers_windows.go

@@ -62,9 +62,8 @@ func writeExit(w io.WriteCloser) {
 // scanAddrs scans the DNS addresses from nslookup's output.  The expected
 // output of nslookup looks like this:
 //
-//   Default Server:  192-168-1-1.qualified.domain.ru
+//	Default Server:  192-168-1-1.qualified.domain.ru
-//   Address:  192.168.1.1
+//	Address:  192.168.1.1
-//
 func scanAddrs(s *bufio.Scanner) (addrs []string) {
 	for s.Scan() {
 		line := strings.TrimSpace(s.Text())

internal/aghos/os.go

@@ -121,13 +121,12 @@ func PIDByCommand(command string, except ...int) (pid int, err error) {
 }
 
 // parsePSOutput scans the output of ps searching the largest PID of the process
-// associated with cmdName ignoring PIDs from ignore.  A valid line from
+// associated with cmdName ignoring PIDs from ignore.  A valid line from r
-// r should look like these:
+// should look like these:
-//
-//    123 ./example-cmd
-//   1230 some/base/path/example-cmd
-//   3210 example-cmd
 //
+//	 123 ./example-cmd
+//	1230 some/base/path/example-cmd
+//	3210 example-cmd
 func parsePSOutput(r io.Reader, cmdName string, ignore []int) (largest, instNum int, err error) {
 	s := bufio.NewScanner(r)
 	for s.Scan() {

internal/dhcpd/routeradv.go

@@ -65,39 +65,42 @@ func hwAddrToLinkLayerAddr(hwa net.HardwareAddr) (lla []byte, err error) {
 }
 
 // Create an ICMPv6.RouterAdvertisement packet with all necessary options.
+// Data scheme:
 //
-// ICMPv6:
+//	ICMPv6:
-// type[1]
+//	- type[1]
-// code[1]
+//	- code[1]
-// chksum[2]
+//	- chksum[2]
-// body (RouterAdvertisement):
+//	- body (RouterAdvertisement):
-//   Cur Hop Limit[1]
+//	  - Cur Hop Limit[1]
-//   Flags[1]: MO......
+//	  - Flags[1]: MO......
-//   Router Lifetime[2]
+//	  - Router Lifetime[2]
-//   Reachable Time[4]
+//	  - Reachable Time[4]
-//   Retrans Timer[4]
+//	  - Retrans Timer[4]
-//   Option=Prefix Information(3):
+//	  - Option=Prefix Information(3):
-//     Type[1]
+//	    - Type[1]
-//     Length * 8bytes[1]
+//	    - Length * 8bytes[1]
-//     Prefix Length[1]
+//	    - Prefix Length[1]
-//     Flags[1]: LA......
+//	    - Flags[1]: LA......
-//     Valid Lifetime[4]
+//	    - Valid Lifetime[4]
-//     Preferred Lifetime[4]
+//	    - Preferred Lifetime[4]
-//     Reserved[4]
+//	    - Reserved[4]
-//     Prefix[16]
+//	    - Prefix[16]
-//   Option=MTU(5):
+//	  - Option=MTU(5):
-//     Type[1]
+//	    - Type[1]
-//     Length * 8bytes[1]
+//	    - Length * 8bytes[1]
-//     Reserved[2]
+//	    - Reserved[2]
-//     MTU[4]
+//	    - MTU[4]
-//   Option=Source link-layer address(1):
+//	  - Option=Source link-layer address(1):
-//     Link-Layer Address[8/24]
+//	    - Link-Layer Address[8/24]
-//   Option=Recursive DNS Server(25):
+//	  - Option=Recursive DNS Server(25):
-//     Type[1]
+//	    - Type[1]
-//     Length * 8bytes[1]
+//	    - Length * 8bytes[1]
-//     Reserved[2]
+//	    - Reserved[2]
-//     Lifetime[4]
+//	    - Lifetime[4]
-//     Addresses of IPv6 Recursive DNS Servers[16]
+//	    - Addresses of IPv6 Recursive DNS Servers[16]
+//
+// TODO(a.garipov): Replace with an existing implementation from a dependency.
 func createICMPv6RAPacket(params icmpv6RA) (data []byte, err error) {
 	var lla []byte
 	lla, err = hwAddrToLinkLayerAddr(params.sourceLinkLayerAddress)

internal/home/filter.go

@@ -267,7 +267,8 @@ func (f *Filtering) periodicallyRefreshFilters() {
 // Refresh filters
 // flags: filterRefresh*
 // important:
-//  TRUE: ignore the fact that we're currently updating the filters
+//
+// TRUE: ignore the fact that we're currently updating the filters
 func (f *Filtering) refreshFilters(flags int, important bool) (int, error) {
 	set := atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1)
 	if !important && !set {
@@ -363,25 +364,24 @@ const (
 	filterRefreshBlocklists = 4 // update block-lists
 )
 
-// Checks filters updates if necessary
+// refreshFiltersIfNecessary checks filters and updates them if necessary.  If
-// If force is true, it ignores the filter.LastUpdated field value
+// force is true, it ignores the filter.LastUpdated field value.
-// flags: filterRefresh*
 //
 // Algorithm:
-// . Get the list of filters to be updated
-// . For each filter run the download and checksum check operation
-//  . Store downloaded data in a temporary file inside data/filters directory
-// . For each filter:
-//  . If filter data hasn't changed, just set new update time on file
-//  . If filter data has changed:
-//    . rename the temporary file (<temp> -> 1.txt)
-//      Note that this method works only on UNIX.
-//      On Windows we don't pass files to filtering - we pass the whole data.
-//  . Pass new filters to filtering object - it analyzes new data while the old filters are still active
-//  . filtering activates new filters
 //
-// Return the number of updated filters
+//  1. Get the list of filters to be updated.  For each filter, run the download
-// Return TRUE - there was a network error and nothing could be updated
+//     and checksum check operation.  Store downloaded data in a temporary file
+//     inside data/filters directory
+//
+//  2. For each filter, if filter data hasn't changed, just set new update time
+//     on file.  Otherwise, rename the temporary file (<temp> -> 1.txt).  Note
+//     that this method works only on Unix systems.  On Windows, don't pass
+//     files to filtering, pass the whole data.
+//
+// refreshFiltersIfNecessary returns the number of updated filters.  It also
+// returns true if there was a network error and nothing could be updated.
+//
+// TODO(a.garipov, e.burkov): What the hell?
 func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) {
 	log.Debug("Filters: updating...")
 

internal/home/home.go

@@ -741,11 +741,10 @@ func loadOptions() options {
 
 // printWebAddrs prints addresses built from proto, addr, and an appropriate
 // port.  At least one address is printed with the value of port.  If the value
-// of betaPort is 0, the second address is not printed.  The output example:
+// of betaPort is 0, the second address is not printed.  Output example:
-//
-//   Go to http://127.0.0.1:80
-//   Go to http://127.0.0.1:3000 (BETA)
 //
+//	Go to http://127.0.0.1:80
+//	Go to http://127.0.0.1:3000 (BETA)
 func printWebAddrs(proto, addr string, port, betaPort int) {
 	const (
 		hostMsg     = "Go to %s://%s"

internal/home/service.go

@@ -159,15 +159,16 @@ func sendSigReload() {
 }
 
 // handleServiceControlAction one of the possible control actions:
-// install -- installs a service/daemon
+//
-// uninstall -- uninstalls it
+//   - install:  Installs a service/daemon.
-// status -- prints the service status
+//   - uninstall:  Uninstalls it.
-// start -- starts the previously installed service
+//   - status:  Prints the service status.
-// stop -- stops the previously installed service
+//   - start:  Starts the previously installed service.
-// restart - restarts the previously installed service
+//   - stop:  Stops the previously installed service.
-// run - this is a special command that is not supposed to be used directly
+//   - restart:  Restarts the previously installed service.
-// it is specified when we register a service, and it indicates to the app
+//   - run:  This is a special command that is not supposed to be used directly
-// that it is being run as a service/daemon.
+//     it is specified when we register a service, and it indicates to the app
+//     that it is being run as a service/daemon.
 func handleServiceControlAction(opts options, clientBuildFS fs.FS) {
 	// Call chooseSystem explicitly to introduce OpenBSD support for service
 	// package.  It's a noop for other GOOS values.
@@ -397,12 +398,11 @@ var launchdConfig = `<?xml version='1.0' encoding='UTF-8'?>
 // the systemdScript constant in file service_systemd_linux.go in module
 // github.com/kardianos/service.  The following changes have been made:
 //
-// 1.  The RestartSec setting is set to a lower value of 10 to make sure we
+//  1. The RestartSec setting is set to a lower value of 10 to make sure we
 //     always restart quickly.
 //
-// 2.  The ExecStartPre setting is added to make sure that the log directory is
+//  2. The ExecStartPre setting is added to make sure that the log directory is
 //     always created to prevent the 209/STDOUT errors.
-//
 const systemdScript = `[Unit]
 Description={{.Description}}
 ConditionFileIsExecutable={{.Path|cmdEscape}}

internal/home/tls.go

@@ -568,10 +568,9 @@ func validatePkey(data *tlsConfigStatus, pkey string) error {
 	return nil
 }
 
-// Process certificate data and its private key.
+// validateCertificates processes certificate data and its private key.  All
-// All parameters are optional.
+// parameters are optional.  On error, validateCertificates returns a partially
-// On error, return partially set object
+// set object with field WarningValidation containing error description.
-//  with 'WarningValidation' field containing error description.
 func validateCertificates(certChain, pkey, serverName string) tlsConfigStatus {
 	var data tlsConfigStatus
 

internal/home/upgrade.go

@@ -240,8 +240,9 @@ func upgradeSchema3to4(diskConf yobj) error {
 
 // Replace "auth_name", "auth_pass" string settings with an array:
 // users:
-// - name: "..."
+//   - name: "..."
-//   password: "..."
+//     password: "..."
+//
 // ...
 func upgradeSchema4to5(diskConf yobj) error {
 	log.Printf("%s(): called", funcName())
@@ -288,16 +289,18 @@ func upgradeSchema4to5(diskConf yobj) error {
 
 // clients:
 // ...
-//   ip: 127.0.0.1
+//
-//   mac: ...
+//	ip: 127.0.0.1
+//	mac: ...
 //
 // ->
 //
 // clients:
 // ...
-//   ids:
+//
-//   - 127.0.0.1
+//	ids:
-//   - ...
+//	- 127.0.0.1
+//	- ...
 func upgradeSchema5to6(diskConf yobj) error {
 	log.Printf("%s(): called", funcName())
 
@@ -355,19 +358,21 @@ func upgradeSchema5to6(diskConf yobj) error {
 }
 
 // dhcp:
-//   enabled: false
+//
-//   interface_name: vboxnet0
+//	enabled: false
-//   gateway_ip: 192.168.56.1
+//	interface_name: vboxnet0
-//   ...
+//	gateway_ip: 192.168.56.1
+//	...
 //
 // ->
 //
 // dhcp:
-//   enabled: false
+//
-//   interface_name: vboxnet0
+//	enabled: false
-//   dhcpv4:
+//	interface_name: vboxnet0
-//     gateway_ip: 192.168.56.1
+//	dhcpv4:
-//     ...
+//	  gateway_ip: 192.168.56.1
+//	  ...
 func upgradeSchema6to7(diskConf yobj) error {
 	log.Printf("Upgrade yaml: 6 to 7")
 
@@ -443,15 +448,14 @@ func upgradeSchema6to7(diskConf yobj) error {
 
 // upgradeSchema7to8 performs the following changes:
 //
-//   # BEFORE:
+//	# BEFORE:
-//   'dns':
+//	'dns':
-//     'bind_host': '127.0.0.1'
+//	  'bind_host': '127.0.0.1'
-//
-//   # AFTER:
-//   'dns':
-//     'bind_hosts':
-//     - '127.0.0.1'
 //
+//	# AFTER:
+//	'dns':
+//	  'bind_hosts':
+//	  - '127.0.0.1'
 func upgradeSchema7to8(diskConf yobj) (err error) {
 	log.Printf("Upgrade yaml: 7 to 8")
 
@@ -481,14 +485,13 @@ func upgradeSchema7to8(diskConf yobj) (err error) {
 
 // upgradeSchema8to9 performs the following changes:
 //
-//   # BEFORE:
+//	# BEFORE:
-//   'dns':
+//	'dns':
-//     'autohost_tld': 'lan'
+//	  'autohost_tld': 'lan'
-//
-//   # AFTER:
-//   'dns':
-//     'local_domain_name': 'lan'
 //
+//	# AFTER:
+//	'dns':
+//	  'local_domain_name': 'lan'
 func upgradeSchema8to9(diskConf yobj) (err error) {
 	log.Printf("Upgrade yaml: 8 to 9")
 
@@ -564,16 +567,15 @@ func addQUICPort(ups string, port int) (withPort string) {
 
 // upgradeSchema9to10 performs the following changes:
 //
-//   # BEFORE:
+//	# BEFORE:
-//   'dns':
+//	'dns':
-//     'upstream_dns':
+//	  'upstream_dns':
-//      - 'quic://some-upstream.com'
+//	   - 'quic://some-upstream.com'
-//
-//   # AFTER:
-//   'dns':
-//     'upstream_dns':
-//      - 'quic://some-upstream.com:784'
 //
+//	# AFTER:
+//	'dns':
+//	  'upstream_dns':
+//	   - 'quic://some-upstream.com:784'
 func upgradeSchema9to10(diskConf yobj) (err error) {
 	log.Printf("Upgrade yaml: 9 to 10")
 
@@ -623,15 +625,14 @@ func upgradeSchema9to10(diskConf yobj) (err error) {
 
 // upgradeSchema10to11 performs the following changes:
 //
-//   # BEFORE:
+//	# BEFORE:
-//   'rlimit_nofile': 42
+//	'rlimit_nofile': 42
-//
-//   # AFTER:
-//   'os':
-//     'group': ''
-//     'rlimit_nofile': 42
-//     'user': ''
 //
+//	# AFTER:
+//	'os':
+//	  'group': ''
+//	  'rlimit_nofile': 42
+//	  'user': ''
 func upgradeSchema10to11(diskConf yobj) (err error) {
 	log.Printf("Upgrade yaml: 10 to 11")
 
@@ -658,12 +659,11 @@ func upgradeSchema10to11(diskConf yobj) (err error) {
 
 // upgradeSchema11to12 performs the following changes:
 //
-//   # BEFORE:
+//	# BEFORE:
-//   'querylog_interval': 90
+//	'querylog_interval': 90
-//
-//   # AFTER:
-//   'querylog_interval': '2160h'
 //
+//	# AFTER:
+//	'querylog_interval': '2160h'
 func upgradeSchema11to12(diskConf yobj) (err error) {
 	log.Printf("Upgrade yaml: 11 to 12")
 	diskConf["schema_version"] = 12
@@ -698,16 +698,15 @@ func upgradeSchema11to12(diskConf yobj) (err error) {
 
 // upgradeSchema12to13 performs the following changes:
 //
-//   # BEFORE:
+//	# BEFORE:
-//   'dns':
+//	'dns':
-//     # …
+//	  # …
-//     'local_domain_name': 'lan'
+//	  'local_domain_name': 'lan'
-//
-//   # AFTER:
-//   'dhcp':
-//     # …
-//     'local_domain_name': 'lan'
 //
+//	# AFTER:
+//	'dhcp':
+//	  # …
+//	  'local_domain_name': 'lan'
 func upgradeSchema12to13(diskConf yobj) (err error) {
 	log.Printf("Upgrade yaml: 12 to 13")
 	diskConf["schema_version"] = 13
@@ -744,23 +743,22 @@ func upgradeSchema12to13(diskConf yobj) (err error) {
 
 // upgradeSchema13to14 performs the following changes:
 //
-//   # BEFORE:
+//	# BEFORE:
-//   'clients':
+//	'clients':
-//   - 'name': 'client-name'
+//	- 'name': 'client-name'
-//     # …
+//	  # …
-//
-//   # AFTER:
-//   'clients':
-//     'persistent':
-//     - 'name': 'client-name'
-//       # …
-//     'runtime_sources':
-//       'whois': true
-//       'arp': true
-//       'rdns': true
-//       'dhcp': true
-//       'hosts': true
 //
+//	# AFTER:
+//	'clients':
+//	  'persistent':
+//	  - 'name': 'client-name'
+//	    # …
+//	  'runtime_sources':
+//	    'whois': true
+//	    'arp': true
+//	    'rdns': true
+//	    'dhcp': true
+//	    'hosts': true
 func upgradeSchema13to14(diskConf yobj) (err error) {
 	log.Printf("Upgrade yaml: 13 to 14")
 	diskConf["schema_version"] = 14

internal/stats/stats.go

@@ -423,9 +423,9 @@ func (s *StatsCtx) flush() (cont bool, sleepFor time.Duration) {
 
 // periodicFlush checks and flushes the unit to the database if the freshly
 // generated unit ID differs from the current's ID.  Flushing process includes:
-//  - swapping the current unit with the new empty one;
+//   - swapping the current unit with the new empty one;
-//  - writing the current unit to the database;
+//   - writing the current unit to the database;
-//  - removing the stale unit from the database.
+//   - removing the stale unit from the database.
 func (s *StatsCtx) periodicFlush() {
 	for cont, sleepFor := true, time.Duration(0); cont; time.Sleep(sleepFor) {
 		cont, sleepFor = s.flush()

internal/stats/unit.go

@@ -353,33 +353,25 @@ func topsCollector(units []*unitDB, max int, pg pairsGetter) []map[string]uint64
 	return convertTopSlice(a2)
 }
 
-/* Algorithm:
+// getData returns the statistics data using the following algorithm:
-. Prepare array of N units, where N is the value of "limit" configuration setting
+//
- . Load data for the most recent units from file
+//  1. Prepare a slice of N units, where N is the value of "limit" configuration
-   If a unit with required ID doesn't exist, just add an empty unit
+//     setting.  Load data for the most recent units from the file.  If a unit
- . Get data for the current unit
+//     with required ID doesn't exist, just add an empty unit.  Get data for the
-. Process data from the units and prepare an output map object:
+//     current unit.
- * per time unit counters:
+//
-  * DNS-queries/time-unit
+//  2. Process data from the units and prepare an output map object, including
-  * blocked/time-unit
+//     per time unit counters (DNS queries per time-unit, blocked queries per
-  * safebrowsing-blocked/time-unit
+//     time unit, etc.).  If the time unit is hour, just add values from each
-  * parental-blocked/time-unit
+//     unit to the slice; otherwise, the time unit is day, so aggregate per-hour
-  If time-unit is an hour, just add values from each unit to an array.
+//     data into days.
-  If time-unit is a day, aggregate per-hour data into days.
+//
- * top counters:
+//     To get the top counters (queries per domain, queries per blocked domain,
-  * queries/domain
+//     etc.), first sum up data for all units into a single map.  Then,  get the
-  * queries/blocked-domain
+//     pairs with the highest numbers.
-  * queries/client
+//
-  To get these values we first sum up data for all units into a single map.
+//     The total counters (DNS queries, blocked, etc.) are just the sum of data
-  Then we get the pairs with the highest numbers (the values are sorted in descending order)
+//     for all units.
- * total counters:
-  * DNS-queries
-  * blocked
-  * safebrowsing-blocked
-  * safesearch-blocked
-  * parental-blocked
-  These values are just the sum of data for all units.
-*/
 func (s *StatsCtx) getData(limit uint32) (StatsResp, bool) {
 	if limit == 0 {
 		return StatsResp{