Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Device network address improvements (#16934)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2023-05-29 16:56:31 +02:00
committed by GitHub
parent 5e6d663575
commit d415b31dc0
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/DeviceNetwork/DeviceNet.cs
View File

@@ -228,7 +228,10 @@ public sealed class DeviceNet
prefix = string.IsNullOrWhiteSpace(prefix) ? null : Loc.GetString(prefix); prefix = string.IsNullOrWhiteSpace(prefix) ? null : Loc.GetString(prefix);
string address; string address;
do do
address = $"{prefix}{_random.Next():x}"; {
var num = _random.Next();
address = $"{prefix}{num >> 16:X4}-{num & 0xFFFF:X4}";
}
while (Devices.ContainsKey(address)); while (Devices.ContainsKey(address));
return address; return address;

12
Resources/Locale/en-US/devices/device-network.ftl
View File

@@ -21,14 +21,14 @@ device-frequency-prototype-name-surveillance-camera-general = General Cameras
device-frequency-prototype-name-surveillance-camera-entertainment = Entertainment Cameras device-frequency-prototype-name-surveillance-camera-entertainment = Entertainment Cameras
# prefixes for randomly generated device addresses # prefixes for randomly generated device addresses
device-address-prefix-vent = Vnt- device-address-prefix-vent = VNT-
device-address-prefix-scrubber = Scr- device-address-prefix-scrubber = SCR-
device-address-prefix-sensor = Sns- device-address-prefix-sensor = SNS-
#PDAs and terminals #PDAs and terminals
device-address-prefix-console = Cls- device-address-prefix-console = CLS-
device-address-prefix-fire-alarm = Fir- device-address-prefix-fire-alarm = FIR-
device-address-prefix-air-alarm = Air- device-address-prefix-air-alarm = AIR-
device-address-examine-message = The device's address is {$address}. device-address-examine-message = The device's address is {$address}.