charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve SceneID generation via RNGCryptoServiceProvider (#812)

Browse Source 
* Improve SceneID generation

* Update NetworkIdentity.cs
This commit is contained in:
MichalPetryka 2019-04-14 14:16:19 +02:00 committed by vis2k
parent b9247a78b6
commit fea09a6b74
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Mirror/Runtime/NetworkIdentity.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Security.Cryptography;
using UnityEngine; using UnityEngine;
using UnityEngine.Serialization; using UnityEngine.Serialization;
#if UNITY_EDITOR #if UNITY_EDITOR
@ -217,6 +218,17 @@ bool ThisIsASceneObjectWithPrefabParent(out GameObject prefab)
return true; return true;
} }
static uint GetRandomUInt()
{
// use Crypto RNG to avoid having time based duplicates
using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
{
byte[] bytes = new byte[4];
rng.GetBytes(bytes);
return BitConverter.ToUInt32(bytes, 0);
}
}
// persistent sceneId assignment // persistent sceneId assignment
// (because scene objects have no persistent unique ID in Unity) // (because scene objects have no persistent unique ID in Unity)
// //
@ -295,9 +307,7 @@ void AssignSceneID()
Undo.RecordObject(this, "Generated SceneId"); Undo.RecordObject(this, "Generated SceneId");
// generate random sceneId part (0x00000000FFFFFFFF) // generate random sceneId part (0x00000000FFFFFFFF)
// -> exclude '0' because that's for unassigned sceneIDs uint randomId = GetRandomUInt();
// TODO use 0,uint.max later. Random.Range only has int version.
uint randomId = (uint)UnityEngine.Random.Range(1, int.MaxValue);
// only assign if not a duplicate of an existing scene id // only assign if not a duplicate of an existing scene id
// (small chance, but possible) // (small chance, but possible)