feat: ThreadedEncryptionKcpTransport (#3933)

* code style * feat: ThreadedEncryptionTransport * Threaded Encryption Kcp * older c# support
MirrorNetworking · Nov 25, 2024 · 26049d9 · 26049d9
1 parent a06d076
commit 26049d9
Show file tree

Hide file tree

Showing 8 changed files with 622 additions and 392 deletions.
diff --git a/Assets/Mirror/Tests/Editor/Transports/EncryptionTransportTransportTest.cs b/Assets/Mirror/Tests/Editor/Transports/EncryptionTransportTransportTest.cs
@@ -22,7 +22,7 @@ public void Setup()
             GameObject gameObject = new GameObject();
 
             encryption = gameObject.AddComponent<EncryptionTransport>();
-            encryption.inner = inner;
+            encryption.Inner = inner;
         }
 
         [TearDown]

diff --git a/Assets/Mirror/Transports/Encryption/Editor/EncryptionTransportInspector.cs b/Assets/Mirror/Transports/Encryption/Editor/EncryptionTransportInspector.cs
@@ -17,20 +17,26 @@ public class EncryptionTransportInspector : UnityEditor.Editor
 
         void OnEnable()
         {
-            innerProperty = serializedObject.FindProperty("inner");
-            clientValidatesServerPubKeyProperty = serializedObject.FindProperty("clientValidateServerPubKey");
-            clientTrustedPubKeySignaturesProperty = serializedObject.FindProperty("clientTrustedPubKeySignatures");
-            serverKeypairPathProperty = serializedObject.FindProperty("serverKeypairPath");
-            serverLoadKeyPairFromFileProperty = serializedObject.FindProperty("serverLoadKeyPairFromFile");
+            innerProperty = serializedObject.FindProperty("Inner");
+            clientValidatesServerPubKeyProperty = serializedObject.FindProperty("ClientValidateServerPubKey");
+            clientTrustedPubKeySignaturesProperty = serializedObject.FindProperty("ClientTrustedPubKeySignatures");
+            serverKeypairPathProperty = serializedObject.FindProperty("ServerKeypairPath");
+            serverLoadKeyPairFromFileProperty = serializedObject.FindProperty("ServerLoadKeyPairFromFile");
         }
 
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
 
-            EditorGUILayout.LabelField("Common", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(innerProperty);
-            EditorGUILayout.Separator();
+            // Draw default inspector for the parent class
+            DrawDefaultInspector();
+            EditorGUILayout.LabelField("Encryption Settings", EditorStyles.boldLabel);
+            if (innerProperty != null)
+            {
+                EditorGUILayout.LabelField("Common", EditorStyles.boldLabel);
+                EditorGUILayout.PropertyField(innerProperty);
+                EditorGUILayout.Separator();
+            }
             // Client Section
             EditorGUILayout.LabelField("Client", EditorStyles.boldLabel);
             EditorGUILayout.HelpBox("Validating the servers public key is essential for complete man-in-the-middle (MITM) safety, but might not be feasible for all modes of hosting.", MessageType.Info);
@@ -77,5 +83,8 @@ public override void OnInspectorGUI()
 
             serializedObject.ApplyModifiedProperties();
         }
+
+        [CustomEditor(typeof(ThreadedEncryptionKcpTransport), true)]
+        class EncryptionThreadedTransportInspector : EncryptionTransportInspector {}
     }
 }