From b7a6ee45606287c7f866216c6cafdd7377fe36e6 Mon Sep 17 00:00:00 2001 From: kdysput Date: Wed, 3 Jul 2024 14:43:33 +0200 Subject: [PATCH] Use valid guid if its avaialble --- Backtrace/Model/JsonData/BacktraceAttributes.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Backtrace/Model/JsonData/BacktraceAttributes.cs b/Backtrace/Model/JsonData/BacktraceAttributes.cs index 0979c1a..a6ea306 100644 --- a/Backtrace/Model/JsonData/BacktraceAttributes.cs +++ b/Backtrace/Model/JsonData/BacktraceAttributes.cs @@ -181,18 +181,19 @@ private Guid GenerateMachineId() } var networkInterface = NetworkInterface.GetAllNetworkInterfaces() - .FirstOrDefault(n => n.OperationalStatus == OperationalStatus.Up); + .FirstOrDefault(n => + n.OperationalStatus == OperationalStatus.Up + && !string.IsNullOrEmpty(n.GetPhysicalAddress()?.ToString()) + ); - PhysicalAddress physicalAddr = null; - string macAddress = null; - if (networkInterface == null - || (physicalAddr = networkInterface.GetPhysicalAddress()) == null - || string.IsNullOrEmpty(macAddress = physicalAddr.ToString())) + if (networkInterface == null) { guid = Guid.NewGuid(); return guid; } + string macAddress = networkInterface.GetPhysicalAddress().ToString(); + string hex = macAddress.Replace(":", string.Empty); var value = Convert.ToInt64(hex, 16); guid = GuidExtensions.FromLong(value);