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

74-perform-dad

Browse Source 
- Fixing nil pointer dereference
This commit is contained in:
Tim Beatham 2024-01-02 00:13:04 +00:00
parent 90cfe820d2
commit d0b1913796
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/mesh/manager.go
View File

@ -288,12 +288,12 @@ func (s *MeshManagerImpl) AddSelf(params *AddSelfParams) error {
collisionCount := uint8(0) collisionCount := uint8(0)
var nodeIP *net.IPNet var nodeIP net.IP
// Perform Duplicate Address Detection with the nodes // Perform Duplicate Address Detection with the nodes
// that are already in the network // that are already in the network
for { for {
nodeIP, err := s.ipAllocator.GetIP(pubKey, params.MeshId, collisionCount) generatedIP, err := s.ipAllocator.GetIP(pubKey, params.MeshId, collisionCount)
if err != nil { if err != nil {
return err return err
@ -313,13 +313,14 @@ func (s *MeshManagerImpl) AddSelf(params *AddSelfParams) error {
if lib.Contains(lib.MapValues(snapshot.GetNodes()), proposition) { if lib.Contains(lib.MapValues(snapshot.GetNodes()), proposition) {
collisionCount++ collisionCount++
} else { } else {
nodeIP = generatedIP
break break
} }
} }
node := s.nodeFactory.Build(&MeshNodeFactoryParams{ node := s.nodeFactory.Build(&MeshNodeFactoryParams{
PublicKey: &pubKey, PublicKey: &pubKey,
NodeIP: nodeIP.IP, NodeIP: nodeIP,
WgPort: params.WgPort, WgPort: params.WgPort,
Endpoint: params.Endpoint, Endpoint: params.Endpoint,
MeshConfig: mesh.GetConfiguration(), MeshConfig: mesh.GetConfiguration(),