holm/smegmesh
1
0
Fork 0
forked from extern/smegmesh
Code Pull Requests Activity

81-serparate-procs

Browse Source 
- nil dereference again
This commit is contained in:
Tim Beatham 2024-01-04 22:29:30 +00:00
parent 69b1790bb6
commit 2b73d241b6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/ctrlserver/ctrlserver.go
View File

@ -107,7 +107,7 @@ func NewCtrlServer(params *NewCtrlServerParams) (*MeshCtrlServer, error) {
logging.Log.WriteErrorf(err.Error()) logging.Log.WriteErrorf(err.Error())
} }
return err return nil
}, 1) }, 1)
heartbeatTimer := lib.NewTimer(func() error { heartbeatTimer := lib.NewTimer(func() error {

4
pkg/mesh/config.go
View File

@ -234,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 {
_, ipNet, _ := net.ParseCIDR(rn.gateway) node, err := params.mesh.GetNode(rn.gateway)
return meshNet.Contains(ipNet.IP) || ipNet.Contains(meshNet.IP) return node != nil && err == nil
}) })
}) })