Pull request 295: Fix conf names

Merge in GO/dnsproxy from fix-conf-names to master Squashed commit of the following: commit b8b5682 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Nov 7 14:13:25 2023 +0300 main: fix yaml conf fields names
AdguardTeam · Nov 7, 2023 · 254e5a8 · 254e5a8
1 parent 868c1de
commit 254e5a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config.yaml.dist b/config.yaml.dist
@@ -12,6 +12,8 @@ listen-ports:
   - 53
 max-go-routines: 0
 ratelimit: 0
+ratelimit-subnet-len-ipv4: 24
+ratelimit-subnet-len-ipv6: 64
 udp-buf-size: 0
 upstream:
   - "1.1.1.1:53"

diff --git a/main.go b/main.go
@@ -146,11 +146,11 @@ type Options struct {
 
 	// RatelimitSubnetLenIPv4 is a subnet length for IPv4 addresses used for
 	// rate limiting requests
-	RatelimitSubnetLenIPv4 int `yaml:"ratelimit-subnet-len-v4" long:"ratelimit-subnet-len-ipv4" description:"Ratelimit subnet length for IPv4." default:"24"`
+	RatelimitSubnetLenIPv4 int `yaml:"ratelimit-subnet-len-ipv4" long:"ratelimit-subnet-len-ipv4" description:"Ratelimit subnet length for IPv4." default:"24"`
 
 	// RatelimitSubnetLenIPv6 is a subnet length for IPv6 addresses used for
 	// rate limiting requests
-	RatelimitSubnetLenIPv6 int `yaml:"ratelimit-subnet-len-v6" long:"ratelimit-subnet-len-ipv6" description:"Ratelimit subnet length for IPv6." default:"64"`
+	RatelimitSubnetLenIPv6 int `yaml:"ratelimit-subnet-len-ipv6" long:"ratelimit-subnet-len-ipv6" description:"Ratelimit subnet length for IPv6." default:"64"`
 
 	// If true, refuse ANY requests
 	RefuseAny bool `yaml:"refuse-any" long:"refuse-any" description:"If specified, refuse ANY requests" optional:"yes" optional-value:"true"`