zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-28 19:11:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-09-07 14:11:56 -04:00
parent d8bcf33701
commit ce58eed740
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logic/util.go
View File

@@ -171,7 +171,6 @@ func ShouldPublishPeerPorts(serverNode *models.Node) bool {
return false return false
} }
// NormalCidr - returns the first address of CIDR // NormalCidr - returns the first address of CIDR
func NormalizeCIDR(address string) (string, error) { func NormalizeCIDR(address string) (string, error) {
ip, IPNet, err := net.ParseCIDR(address) ip, IPNet, err := net.ParseCIDR(address)
@@ -186,6 +185,7 @@ func NormalizeCIDR(address string) (string, error) {
IPNet.IP = net4.NetworkAddress() IPNet.IP = net4.NetworkAddress()
} }
return IPNet.String(), nil return IPNet.String(), nil
}
func getNetworkProtocols(cidrs []string) (bool, bool) { func getNetworkProtocols(cidrs []string) (bool, bool) {
ipv4 := false ipv4 := false