go.d dnsmasqdhcp: simplify parseDHCPRangeValue (#18401)
Ilya Mashchenko committed
Aug 24, 2024 at 18:49 UTC
f02adc90539a612ba576fcbd59b8fc7f59de0ad5
2 files changed
+8
-6
src/go/plugin/go.d/modules/dnsmasq_dhcp/dhcp_test.go
+4
@@ -193,6 +193,10 @@ func TestDnsmasqDHCP_parseDHCPRangeValue(t *testing.T) {
193
wantFail: true,
194
input: "1234::,ra-stateless",
195
},
196
+ "invalid": {
197
+ wantFail: true,
198
+ input: "192.168.0.0",
199
+ },
200
}
201
202
for name, test := range tests {
src/go/plugin/go.d/modules/dnsmasq_dhcp/parse_configuration.go
+4
-6
@@ -108,14 +108,12 @@ func parseDHCPRangeValue(s string) (r string) {
108
var start, end net.IP
109
parts := strings.Split(s, ",")
110
111
- for i, v := range parts {
112
- if start = net.ParseIP(strings.TrimSpace(v)); start == nil {
111
+ for _, v := range parts {
112
+ if start == nil {
113
+ start = net.ParseIP(v)
114
continue
115
}
115
- if len(parts) < i+1 {
116
- return ""
117
- }
118
- if end = net.ParseIP(parts[i+1]); end == nil || iprange.New(start, end) == nil {
116
+ if end = net.ParseIP(v); end == nil || iprange.New(start, end) == nil {
117
return ""
118
}
119
return fmt.Sprintf("%s-%s", start, end)