extern/smegmesh
1
0
Fork 1
mirror of https://github.com/tim-beatham/smegmesh.git synced 2024-12-04 21:50:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

81-processes

Browse Source 
- issue with client client traversal
This commit is contained in:
Tim Beatham 2024-01-04 22:08:14 +00:00
parent 4a92743880
commit 69b1790bb6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/mesh/config.go
View File

@ -1,6 +1,7 @@
package mesh package mesh
import ( import (
"fmt"
"net" "net"
"slices" "slices"
"strings" "strings"
@ -233,8 +234,8 @@ func (m *WgMeshConfigApplyer) getClientConfig(params *GetConfigParams) (*wgtypes
routesForMesh := lib.Map(lib.MapValues(params.routes), func(rns []routeNode) []routeNode { routesForMesh := lib.Map(lib.MapValues(params.routes), func(rns []routeNode) []routeNode {
return lib.Filter(rns, func(rn routeNode) bool { return lib.Filter(rns, func(rn routeNode) bool {
ip, _, _ := net.ParseCIDR(rn.gateway) _, ipNet, _ := net.ParseCIDR(rn.gateway)
return meshNet.Contains(ip) return meshNet.Contains(ipNet.IP) || ipNet.Contains(meshNet.IP)
}) })
}) })
@ -253,6 +254,10 @@ func (m *WgMeshConfigApplyer) getClientConfig(params *GetConfigParams) (*wgtypes
return nil, err return nil, err
} }
if len(params.peers) == 0 {
return nil, fmt.Errorf("no peers in the mesh")
}
peer := m.getCorrespondingPeer(params.peers, self) peer := m.getCorrespondingPeer(params.peers, self)
pubKey, _ := peer.GetPublicKey() pubKey, _ := peer.GetPublicKey()