Compare commits

...
Author SHA1 Message Date
rkervella 5e6caaeaa8 Early return 2023-07-10 14:54:18 -07:00
rkervella 6aaf2f8005 Remove early return 2023-07-10 14:49:42 -07:00
rkervella 79d0f673dc Moar debug logs 2023-07-10 14:48:01 -07:00
rkervella db35485abf Try zero guid 2023-07-10 14:42:33 -07:00
rkervella 528e444641 Add debug messages 2023-07-10 14:03:09 -07:00
2 changed files with 25 additions and 0 deletions

No files matched your search

+22
View File
@@ -43,10 +43,17 @@ func UUIDFromMAC() string {
// {{if .Config.Debug}}
log.Printf("Generating host UUID from hardware addresses ...")
// {{end}}
return zeroGUID.String()
interfaces, err := net.Interfaces()
if err != nil {
// {{if .Config.Debug}}
log.Printf("Couldn't list net interfaces, returning zeroGUID: %v\n", err)
// {{end}}
return zeroGUID.String()
}
// {{if .Config.Debug}}
log.Printf("Got interfaces: %+v\n", interfaces)
// {{end}}
hardwareAddrs := []string{}
for _, iface := range interfaces {
if iface.HardwareAddr != nil {
@@ -54,16 +61,31 @@ func UUIDFromMAC() string {
}
}
if len(hardwareAddrs) == 0 {
// {{if .Config.Debug}}
log.Printf("No hardware addresses found (hardwareAddrs empty), returning zeroGUID\n")
// {{end}}
return zeroGUID.String()
}
// {{if .Config.Debug}}
log.Printf("Hardware addrs: %+v\n", hardwareAddrs)
// {{end}}
sort.Strings(hardwareAddrs) // Ensure deterministic order
digest := sha256.New()
for _, addr := range hardwareAddrs {
digest.Write([]byte(addr))
}
// {{if .Config.Debug}}
log.Printf("Digest: %+v\n", digest.Sum(nil)[:16])
// {{end}}
value, err := uuid.FromBytes(digest.Sum(nil)[:16]) // Must be 128-bits
if err != nil {
// {{if .Config.Debug}}
log.Printf("Couldn't generate UUID from hardware addresses, returning zeroGUID: %v\n", err)
// {{end}}
return zeroGUID.String()
}
// {{if .Config.Debug}}
log.Printf("UUID: %s\n", value.String())
// {{end}}
return value.String()
}
+3
View File
@@ -729,6 +729,9 @@ func registerSliver() *sliverpb.Register {
}
}
// {{if .Config.Debug}}
log.Printf("Generating UUID ...\n")
// {{end}}
// Retrieve UUID
uuid := hostuuid.GetUUID()
// {{if .Config.Debug}}