From 2d456c2106652dc9c8bd9a562a954bc4e62f362a Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Sat, 23 Nov 2019 21:09:31 -0500
Subject: [PATCH] review feedback: rename a key

---
 irc/connection_limits/limiter.go        | 6 +++---
 irc/connection_limits/limiter_test.go   | 2 +-
 irc/connection_limits/throttler_test.go | 2 +-
 oragono.yaml                            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/irc/connection_limits/limiter.go b/irc/connection_limits/limiter.go
index 646aa798..208eb4cf 100644
--- a/irc/connection_limits/limiter.go
+++ b/irc/connection_limits/limiter.go
@@ -33,7 +33,7 @@ type customLimit struct {
 // rawLimiterConfig contains all the YAML-visible fields;
 // LimiterConfig contains additional denormalized private fields
 type rawLimiterConfig struct {
-	Limit         bool
+	Count         bool
 	MaxConcurrent int `yaml:"max-concurrent-connections"`
 
 	Throttle     bool
@@ -156,7 +156,7 @@ func (cl *Limiter) AddClient(addr net.IP) error {
 	}
 
 	// now check limiter
-	if cl.config.Limit {
+	if cl.config.Count {
 		count := cl.limiter[addrString] + 1
 		if count > maxConcurrent {
 			return ErrLimitExceeded
@@ -172,7 +172,7 @@ func (cl *Limiter) RemoveClient(addr net.IP) {
 	cl.Lock()
 	defer cl.Unlock()
 
-	if !cl.config.Limit || utils.IPInNets(addr, cl.config.exemptedNets) {
+	if !cl.config.Count || utils.IPInNets(addr, cl.config.exemptedNets) {
 		return
 	}
 
diff --git a/irc/connection_limits/limiter_test.go b/irc/connection_limits/limiter_test.go
index c789f2ae..8ef74c14 100644
--- a/irc/connection_limits/limiter_test.go
+++ b/irc/connection_limits/limiter_test.go
@@ -19,7 +19,7 @@ func easyParseIP(ipstr string) (result net.IP) {
 
 var baseConfig = LimiterConfig{
 	rawLimiterConfig: rawLimiterConfig{
-		Limit:         true,
+		Count:         true,
 		MaxConcurrent: 4,
 
 		Throttle:     true,
diff --git a/irc/connection_limits/throttler_test.go b/irc/connection_limits/throttler_test.go
index 313a55f0..093c02bf 100644
--- a/irc/connection_limits/throttler_test.go
+++ b/irc/connection_limits/throttler_test.go
@@ -67,7 +67,7 @@ func makeTestThrottler(v4len, v6len int) *Limiter {
 	maxConnections := 3
 	config := LimiterConfig{
 		rawLimiterConfig: rawLimiterConfig{
-			Limit:        false,
+			Count:        false,
 			Throttle:     true,
 			CidrLenIPv4:  v4len,
 			CidrLenIPv6:  v6len,
diff --git a/oragono.yaml b/oragono.yaml
index 1f27b060..34430483 100644
--- a/oragono.yaml
+++ b/oragono.yaml
@@ -146,8 +146,8 @@ server:
 
     # IP-based DoS protection
     ip-limits:
-        # whether to enforce limits on the total number of concurrent connections per IP/CIDR
-        limit: true
+        # whether to limit the total count of concurrent connections per IP/CIDR
+        count: true
         # maximum concurrent connections per IP/CIDR
         max-concurrent-connections: 16