Using uuid instead of integers.

conf.go

@@ -26,6 +26,7 @@ func init() {
 		os.Exit(1)
 	}
 
+	a.MulticastConfig.MaxDatagramSize = len("75568770-cee4-4506-a790-036e232fb1b3")
 	MulticastEntity.MIpAddr = a.MulticastConfig.MIPAddr
 	MulticastEntity.MPort = a.MulticastConfig.MPort
 	MulticastEntity.MaxDatagramSize = a.MulticastConfig.MaxDatagramSize

go.mod

@@ -4,12 +4,12 @@ go 1.21
 
 require (
 	github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
+	github.com/google/uuid v1.3.0
 	github.com/milosgajdos/tenus v0.0.3
 )
 
 require (
 	github.com/docker/libcontainer v2.2.1+incompatible // indirect
-	github.com/google/uuid v1.2.0 // indirect
 	golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect

go.sum

@@ -4,6 +4,8 @@ github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwb
 github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
 github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/milosgajdos/tenus v0.0.3 h1:jmaJzwaY1DUyYVD0lM4U+uvP2kkEg1VahDqRFxIkVBE=
 github.com/milosgajdos/tenus v0.0.3/go.mod h1:eIjx29vNeDOYWJuCnaHY2r4fq5egetV26ry3on7p8qY=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E=

interface.go

@@ -3,12 +3,11 @@ package main
 import (
 	"fmt"
 	"log"
-	"math/rand"
 	"net"
 	"time"
 
 	"github.com/go-ping/ping"
-
+	"github.com/google/uuid"
 	"github.com/milosgajdos/tenus"
 )
 
@@ -45,8 +44,18 @@ func (b *AbstractBridge) RefreshArp() {
 
 func (b *AbstractBridge) initializeHierarchy() {
 
-	b.hIerarchyNumber = rand.Int63()
-	log.Println("Initialized host number: ", b.hIerarchyNumber)
+	var err error
+	var tmpuuid uuid.UUID
+	tmpuuid, err = uuid.NewRandom()
+	b.hIerarchyNumber = tmpuuid.String()
+
+	if err == nil {
+		log.Println("Initialized secure host ID: ", b.hIerarchyNumber)
+	} else {
+		log.Println("Error happened with random UUID: ", err.Error())
+		log.Println("Initialized to less secure host ID: ", b.hIerarchyNumber)
+		b.hIerarchyNumber = uuid.NewString()
+	}
 
 }
 

memory.go

@@ -1,14 +1,14 @@
 package main
 
 import (
-	"fmt"
+	"log"
 	"runtime"
 	"time"
 )
 
 func init() {
 
-	fmt.Println("Garbage Collector Thread Starting")
+	log.Println("Garbage Collector Thread Starting")
 
 	go memoryCleanerThread()
 
@@ -18,9 +18,9 @@ func memoryCleanerThread() {
 
 	for {
 		time.Sleep(10 * time.Minute)
-		fmt.Println("Time to clean memory...")
+		log.Println("Time to clean memory...")
 		runtime.GC()
-		fmt.Println("Garbage Collection done.")
+		log.Println("Garbage Collection done.")
 	}
 
 }

orchestrator.go

@@ -3,13 +3,11 @@ package main
 import (
 	"fmt"
 	"log"
-	"regexp"
 	"slices"
-	"strconv"
 	"time"
 )
 
-func (mip *AbstractMulticast) AddUniqueAndSort(hier int64) {
+func (mip *AbstractMulticast) AddUniqueAndSort(hier string) {
 
 	if slices.Contains(mip.HierarchyArray, hier) {
 		log.Println("Element already in the array: ", hier)
@@ -20,7 +18,7 @@ func (mip *AbstractMulticast) AddUniqueAndSort(hier int64) {
 
 }
 
-func (mip *AbstractMulticast) IsAlpha(hier int64) bool {
+func (mip *AbstractMulticast) IsAlpha(hier string) bool {
 
 	slices.Sort(mip.HierarchyArray)
 	indexMax := len(mip.HierarchyArray) - 1
@@ -47,7 +45,7 @@ func (mip *AbstractMulticast) WriteNumberToMulticast(br AbstractBridge) {
 
 	log.Println("Initiating ticker")
 
-	bstNumber := fmt.Sprintf("%d", br.hIerarchyNumber)
+	bstNumber := br.hIerarchyNumber
 
 	for range time.Tick(1 * time.Second) {
 
@@ -98,27 +96,14 @@ func (b *AbstractBridge) HierarchyReLocator(entity AbstractMulticast) {
 
 	entity.AddUniqueAndSort(b.hIerarchyNumber)
 
-	re := regexp.MustCompile("[0-9]+")
-
 	for bstNumber := range BstChannel {
 
-		cleanStr := re.FindAllString(bstNumber, -1)
-		if cleanStr == nil {
-			log.Println("No numbers in multicast: ", bstNumber)
-			continue
-		} else {
-			log.Println("Extracted numbers in multicast: ", cleanStr)
-			bstNumber = cleanStr[0]
-		}
-
-		brdNumber, err := strconv.ParseInt(bstNumber, 10, 64)
-		if err != nil {
+		if len(bstNumber) < 36 {
 			log.Println("Garbage received on multicast: ", bstNumber)
-			log.Println("Cannot convert to int64:", err.Error())
 			continue
 		} else {
-			log.Println("Adding received:", brdNumber)
-			entity.AddUniqueAndSort(brdNumber)
+			log.Println("Adding received:", bstNumber)
+			entity.AddUniqueAndSort(bstNumber)
 		}
 
 		// finished feeding the new number

types.go

@@ -5,7 +5,7 @@ import "net"
 type AbstractBridge struct {
 	ExistingInterface string
 	BridgeIpCIDR      string
-	hIerarchyNumber   int64
+	hIerarchyNumber   string
 	GArp              *Gratuitous
 }
 
@@ -17,7 +17,7 @@ type AbstractMulticast struct {
 	MRaddr          *net.UDPAddr
 	Wconn           *net.UDPConn
 	Rconn           *net.UDPConn
-	HierarchyArray  []int64
+	HierarchyArray  []string
 }
 
 type AbstractConfig struct {

vendor/github.com/google/uuid/null.go

@@ -0,0 +1,118 @@
+// Copyright 2021 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"bytes"
+	"database/sql/driver"
+	"encoding/json"
+	"fmt"
+)
+
+var jsonNull = []byte("null")
+
+// NullUUID represents a UUID that may be null.
+// NullUUID implements the SQL driver.Scanner interface so
+// it can be used as a scan destination:
+//
+//  var u uuid.NullUUID
+//  err := db.QueryRow("SELECT name FROM foo WHERE id=?", id).Scan(&u)
+//  ...
+//  if u.Valid {
+//     // use u.UUID
+//  } else {
+//     // NULL value
+//  }
+//
+type NullUUID struct {
+	UUID  UUID
+	Valid bool // Valid is true if UUID is not NULL
+}
+
+// Scan implements the SQL driver.Scanner interface.
+func (nu *NullUUID) Scan(value interface{}) error {
+	if value == nil {
+		nu.UUID, nu.Valid = Nil, false
+		return nil
+	}
+
+	err := nu.UUID.Scan(value)
+	if err != nil {
+		nu.Valid = false
+		return err
+	}
+
+	nu.Valid = true
+	return nil
+}
+
+// Value implements the driver Valuer interface.
+func (nu NullUUID) Value() (driver.Value, error) {
+	if !nu.Valid {
+		return nil, nil
+	}
+	// Delegate to UUID Value function
+	return nu.UUID.Value()
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler.
+func (nu NullUUID) MarshalBinary() ([]byte, error) {
+	if nu.Valid {
+		return nu.UUID[:], nil
+	}
+
+	return []byte(nil), nil
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler.
+func (nu *NullUUID) UnmarshalBinary(data []byte) error {
+	if len(data) != 16 {
+		return fmt.Errorf("invalid UUID (got %d bytes)", len(data))
+	}
+	copy(nu.UUID[:], data)
+	nu.Valid = true
+	return nil
+}
+
+// MarshalText implements encoding.TextMarshaler.
+func (nu NullUUID) MarshalText() ([]byte, error) {
+	if nu.Valid {
+		return nu.UUID.MarshalText()
+	}
+
+	return jsonNull, nil
+}
+
+// UnmarshalText implements encoding.TextUnmarshaler.
+func (nu *NullUUID) UnmarshalText(data []byte) error {
+	id, err := ParseBytes(data)
+	if err != nil {
+		nu.Valid = false
+		return err
+	}
+	nu.UUID = id
+	nu.Valid = true
+	return nil
+}
+
+// MarshalJSON implements json.Marshaler.
+func (nu NullUUID) MarshalJSON() ([]byte, error) {
+	if nu.Valid {
+		return json.Marshal(nu.UUID)
+	}
+
+	return jsonNull, nil
+}
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (nu *NullUUID) UnmarshalJSON(data []byte) error {
+	if bytes.Equal(data, jsonNull) {
+		*nu = NullUUID{}
+		return nil // valid null UUID
+	}
+	err := json.Unmarshal(data, &nu.UUID)
+	nu.Valid = err == nil
+	return err
+}

vendor/github.com/google/uuid/uuid.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"io"
 	"strings"
+	"sync"
 )
 
 // A UUID is a 128 bit (16 byte) Universal Unique IDentifier as defined in RFC
@@ -33,7 +34,15 @@ const (
 	Future                    // Reserved for future definition.
 )
 
-var rander = rand.Reader // random function
+const randPoolSize = 16 * 16
+
+var (
+	rander      = rand.Reader // random function
+	poolEnabled = false
+	poolMu      sync.Mutex
+	poolPos     = randPoolSize     // protected with poolMu
+	pool        [randPoolSize]byte // protected with poolMu
+)
 
 type invalidLengthError struct{ len int }
 
@@ -41,6 +50,12 @@ func (err invalidLengthError) Error() string {
 	return fmt.Sprintf("invalid UUID length: %d", err.len)
 }
 
+// IsInvalidLengthError is matcher function for custom error invalidLengthError
+func IsInvalidLengthError(err error) bool {
+	_, ok := err.(invalidLengthError)
+	return ok
+}
+
 // Parse decodes s into a UUID or returns an error.  Both the standard UUID
 // forms of xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx and
 // urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx are decoded as well as the
@@ -249,3 +264,31 @@ func SetRand(r io.Reader) {
 	}
 	rander = r
 }
+
+// EnableRandPool enables internal randomness pool used for Random
+// (Version 4) UUID generation. The pool contains random bytes read from
+// the random number generator on demand in batches. Enabling the pool
+// may improve the UUID generation throughput significantly.
+//
+// Since the pool is stored on the Go heap, this feature may be a bad fit
+// for security sensitive applications.
+//
+// Both EnableRandPool and DisableRandPool are not thread-safe and should
+// only be called when there is no possibility that New or any other
+// UUID Version 4 generation function will be called concurrently.
+func EnableRandPool() {
+	poolEnabled = true
+}
+
+// DisableRandPool disables the randomness pool if it was previously
+// enabled with EnableRandPool.
+//
+// Both EnableRandPool and DisableRandPool are not thread-safe and should
+// only be called when there is no possibility that New or any other
+// UUID Version 4 generation function will be called concurrently.
+func DisableRandPool() {
+	poolEnabled = false
+	defer poolMu.Unlock()
+	poolMu.Lock()
+	poolPos = randPoolSize
+}

vendor/github.com/google/uuid/version4.go

@@ -27,6 +27,8 @@ func NewString() string {
 // The strength of the UUIDs is based on the strength of the crypto/rand
 // package.
 //
+// Uses the randomness pool if it was enabled with EnableRandPool.
+//
 // A note about uniqueness derived from the UUID Wikipedia entry:
 //
 //  Randomly generated UUIDs have 122 random bits.  One's annual risk of being
@@ -35,7 +37,10 @@ func NewString() string {
 //  equivalent to the odds of creating a few tens of trillions of UUIDs in a
 //  year and having one duplicate.
 func NewRandom() (UUID, error) {
-	return NewRandomFromReader(rander)
+	if !poolEnabled {
+		return NewRandomFromReader(rander)
+	}
+	return newRandomFromPool()
 }
 
 // NewRandomFromReader returns a UUID based on bytes read from a given io.Reader.
@@ -49,3 +54,23 @@ func NewRandomFromReader(r io.Reader) (UUID, error) {
 	uuid[8] = (uuid[8] & 0x3f) | 0x80 // Variant is 10
 	return uuid, nil
 }
+
+func newRandomFromPool() (UUID, error) {
+	var uuid UUID
+	poolMu.Lock()
+	if poolPos == randPoolSize {
+		_, err := io.ReadFull(rander, pool[:])
+		if err != nil {
+			poolMu.Unlock()
+			return Nil, err
+		}
+		poolPos = 0
+	}
+	copy(uuid[:], pool[poolPos:(poolPos+16)])
+	poolPos += 16
+	poolMu.Unlock()
+
+	uuid[6] = (uuid[6] & 0x0f) | 0x40 // Version 4
+	uuid[8] = (uuid[8] & 0x3f) | 0x80 // Variant is 10
+	return uuid, nil
+}

vendor/modules.txt

@@ -5,7 +5,7 @@ github.com/docker/libcontainer/system
 # github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
 ## explicit; go 1.14
 github.com/go-ping/ping
-# github.com/google/uuid v1.2.0
+# github.com/google/uuid v1.3.0
 ## explicit
 github.com/google/uuid
 # github.com/milosgajdos/tenus v0.0.3

zoreide.json

@@ -2,7 +2,7 @@
   "MulticastConfig": {
     "MIpAddr": "239.0.0.19",
     "MPort": "9898",
-    "MaxDatagramSize": 32
+    "MaxDatagramSize": 36
   },
   "InterfaceConfig": {
     "ExistingInterface": "eth0",