extern/smegmesh
1
0
Fork 1
mirror of https://github.com/tim-beatham/smegmesh.git synced 2025-08-26 12:27:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

main

Browse Source 
- Fixing issue with nil pointer de-reference due to bad design of mesh
  manager.
- Going forward all references to GetSelf should be depracated. It
  introduces a race condition when leaving a mesh network
This commit is contained in:
Tim Beatham
2023-12-30 00:44:57 +00:00
parent b0893a0b8e
commit 2e6aed6f93
4 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/mesh/route.go
View File

@@ -24,7 +24,7 @@ func (r *RouteManagerImpl) UpdateRoutes() error {
continue
}
self, err := r.meshManager.GetSelf(mesh1.GetMeshId())
self, err := mesh1.GetNode(r.meshManager.GetPublicKey().String())
if err != nil {
return err
@@ -90,11 +90,20 @@ func (r *RouteManagerImpl) UpdateRoutes() error {
// Calculate the set different of each, working out routes to remove and to keep.
for meshId, meshRoutes := range routes {
mesh := r.meshManager.GetMesh(meshId)
self, _ := r.meshManager.GetSelf(meshId)
toRemove := make([]Route, 0)
mesh := meshes[meshId]
prevRoutes, _ := mesh.GetRoutes(NodeID(self))
self, err := mesh.GetNode(r.meshManager.GetPublicKey().String())
if err != nil {
return err
}
toRemove := make([]Route, 0)
prevRoutes, err := mesh.GetRoutes(NodeID(self))
if err != nil {
return err
}
for _, route := range prevRoutes {
if !lib.Contains(meshRoutes, func(r Route) bool {