adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #103 from squat/ignore_kilo_ip_when_finding_internal_ips

Browse Source 
pkg/mesh/mesh.go: ignore Kilo IP during discovery
This commit is contained in:
Lucas Servén Marín 2021-01-20 11:08:58 +01:00 committed by GitHub
commit 92825ba0c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/mesh/mesh.go
View File

@ -108,15 +108,6 @@ func New(backend Backend, enc encapsulation.Encapsulator, granularity Granularit
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to query netlink for CNI device: %v", err) return nil, fmt.Errorf("failed to query netlink for CNI device: %v", err)
} }
privateIP, publicIP, err := getIP(hostname, enc.Index(), cniIndex)
if err != nil {
return nil, fmt.Errorf("failed to find public IP: %v", err)
}
ifaces, err := interfacesForIP(privateIP)
if err != nil {
return nil, fmt.Errorf("failed to find interface for private IP: %v", err)
}
privIface := ifaces[0].Index
var kiloIface int var kiloIface int
if createIface { if createIface {
kiloIface, _, err = wireguard.New(iface) kiloIface, _, err = wireguard.New(iface)
@ -130,6 +121,15 @@ func New(backend Backend, enc encapsulation.Encapsulator, granularity Granularit
} }
kiloIface = link.Attrs().Index kiloIface = link.Attrs().Index
} }
privateIP, publicIP, err := getIP(hostname, kiloIface, enc.Index(), cniIndex)
if err != nil {
return nil, fmt.Errorf("failed to find public IP: %v", err)
}
ifaces, err := interfacesForIP(privateIP)
if err != nil {
return nil, fmt.Errorf("failed to find interface for private IP: %v", err)
}
privIface := ifaces[0].Index
if enc.Strategy() != encapsulation.Never { if enc.Strategy() != encapsulation.Never {
if err := enc.Init(privIface); err != nil { if err := enc.Init(privIface); err != nil {
return nil, fmt.Errorf("failed to initialize encapsulator: %v", err) return nil, fmt.Errorf("failed to initialize encapsulator: %v", err)