go.d dnsmasqdhcp: simplify parseDHCPRangeValue (netdata#18401)

(cherry picked from commit f02adc9)
stelfrag · Sep 6, 2024 · b0c7c50 · b0c7c50
1 parent 86da19d
commit b0c7c50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/dhcp_test.go b/src/go/plugin/go.d/modules/dnsmasq_dhcp/dhcp_test.go
@@ -193,6 +193,10 @@ func TestDnsmasqDHCP_parseDHCPRangeValue(t *testing.T) {
 			wantFail: true,
 			input:    "1234::,ra-stateless",
 		},
+		"invalid": {
+			wantFail: true,
+			input:    "192.168.0.0",
+		},
 	}
 
 	for name, test := range tests {

diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/parse_configuration.go b/src/go/plugin/go.d/modules/dnsmasq_dhcp/parse_configuration.go
@@ -108,14 +108,12 @@ func parseDHCPRangeValue(s string) (r string) {
 	var start, end net.IP
 	parts := strings.Split(s, ",")
 
-	for i, v := range parts {
-		if start = net.ParseIP(strings.TrimSpace(v)); start == nil {
+	for _, v := range parts {
+		if start == nil {
+			start = net.ParseIP(v)
 			continue
 		}
-		if len(parts) < i+1 {
-			return ""
-		}
-		if end = net.ParseIP(parts[i+1]); end == nil || iprange.New(start, end) == nil {
+		if end = net.ParseIP(v); end == nil || iprange.New(start, end) == nil {
 			return ""
 		}
 		return fmt.Sprintf("%s-%s", start, end)