9cd0552ddd
If you pass just an IP address to "-s" or "-d", the iptables command will fill in the correct mask automatically. Originally, the proxier was just hardcoding "/32" for all of these, which was unnecessary but simple. But when IPv6 support was added, the code was made more complicated to deal with the fact that the "/32" needed to be "/128" in the IPv6 case, so it would parse the IPs to figure out which family they were, which in turn involved adding some checks in case the parsing fails (even though that "can't happen" and the old code didn't check for invalid IPs, even though that would break the iptables-restore if there had been any). Anyway, all of that is unnecessary because we can just pass the IP strings to iptables directly rather than parsing and unparsing them first. (The diff to proxier_test.go is just deleting "/32" everywhere.)
65 lines
1.7 KiB
Go
65 lines
1.7 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package util
|
|
|
|
import (
|
|
"net"
|
|
"strconv"
|
|
|
|
"k8s.io/klog/v2"
|
|
netutils "k8s.io/utils/net"
|
|
)
|
|
|
|
// IPPart returns just the IP part of an IP or IP:port or endpoint string. If the IP
|
|
// part is an IPv6 address enclosed in brackets (e.g. "[fd00:1::5]:9999"),
|
|
// then the brackets are stripped as well.
|
|
func IPPart(s string) string {
|
|
if ip := netutils.ParseIPSloppy(s); ip != nil {
|
|
// IP address without port
|
|
return s
|
|
}
|
|
// Must be IP:port
|
|
host, _, err := net.SplitHostPort(s)
|
|
if err != nil {
|
|
klog.ErrorS(err, "Failed to parse host-port", "input", s)
|
|
return ""
|
|
}
|
|
// Check if host string is a valid IP address
|
|
ip := netutils.ParseIPSloppy(host)
|
|
if ip == nil {
|
|
klog.ErrorS(nil, "Failed to parse IP", "input", host)
|
|
return ""
|
|
}
|
|
return ip.String()
|
|
}
|
|
|
|
// PortPart returns just the port part of an endpoint string.
|
|
func PortPart(s string) (int, error) {
|
|
// Must be IP:port
|
|
_, port, err := net.SplitHostPort(s)
|
|
if err != nil {
|
|
klog.ErrorS(err, "Failed to parse host-port", "input", s)
|
|
return -1, err
|
|
}
|
|
portNumber, err := strconv.Atoi(port)
|
|
if err != nil {
|
|
klog.ErrorS(err, "Failed to parse port", "input", port)
|
|
return -1, err
|
|
}
|
|
return portNumber, nil
|
|
}
|