From aa2c004615f57f42556fb4d524a52ee78b889674 Mon Sep 17 00:00:00 2001
From: vis2k <info@noobtuts.com>
Date: Wed, 22 Aug 2018 13:06:43 +0200
Subject: [PATCH] TransportLayers renamed to Transport and Transport.cs moved
 into it

---
 .../UnityEngine.Networking-Editor.csproj      | 26 ++++++++--------
 .../LLAPITransport.cs                         |  7 ++---
 .../Telepathy/Client.cs                       |  0
 .../Telepathy/Common.cs                       |  0
 .../Telepathy/EventType.cs                    |  0
 .../Telepathy/LICENSE                         |  0
 .../Telepathy/Logger.cs                       |  0
 .../Telepathy/Message.cs                      |  0
 .../Telepathy/NetworkStreamExtensions.cs      |  0
 .../Telepathy/README.md                       |  0
 .../Telepathy/SafeCounter.cs                  |  0
 .../Telepathy/SafeDictionary.cs               |  0
 .../Telepathy/SafeQueue.cs                    |  0
 .../Telepathy/Server.cs                       |  0
 .../TelepathyTransport.cs                     |  0
 .../Runtime/{ => Transport}/Transport.cs      |  0
 .../Runtime/UnityEngine.Networking.csproj     | 30 +++++++++----------
 17 files changed, 31 insertions(+), 32 deletions(-)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/LLAPITransport.cs (97%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/Client.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/Common.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/EventType.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/LICENSE (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/Logger.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/Message.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/NetworkStreamExtensions.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/README.md (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/SafeCounter.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/SafeDictionary.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/SafeQueue.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/Telepathy/Server.cs (100%)
 rename Unity-Technologies-networking/Runtime/{TransportLayers => Transport}/TelepathyTransport.cs (100%)
 rename Unity-Technologies-networking/Runtime/{ => Transport}/Transport.cs (100%)

diff --git a/Unity-Technologies-networking/Runtime-Editor/UnityEngine.Networking-Editor.csproj b/Unity-Technologies-networking/Runtime-Editor/UnityEngine.Networking-Editor.csproj
index 1668dd6c6..2c79402c5 100644
--- a/Unity-Technologies-networking/Runtime-Editor/UnityEngine.Networking-Editor.csproj
+++ b/Unity-Technologies-networking/Runtime-Editor/UnityEngine.Networking-Editor.csproj
@@ -65,24 +65,24 @@
     <Compile Include="..\Runtime\NetworkManagerHUD.cs" />
     <Compile Include="..\Runtime\NetworkBehaviour.cs" />
     <Compile Include="..\Runtime\NetworkIdentity.cs" />
-    <Compile Include="..\Runtime\Transport.cs" />
     <Compile Include="..\Runtime\UNetwork.cs" />
     <Compile Include="..\Runtime\NetworkReader.cs" />
     <Compile Include="..\Runtime\NetworkServer.cs" />
     <Compile Include="..\Runtime\SyncList.cs" />
     <Compile Include="..\Runtime\NetworkWriter.cs" />
-    <Compile Include="..\Runtime\TransportLayers/LLAPITransport.cs" />
-    <Compile Include="..\Runtime\TransportLayers/TelepathyTransport.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/Client.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/Common.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/EventType.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/Logger.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/Message.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/NetworkStreamExtensions.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/SafeCounter.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/SafeDictionary.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/SafeQueue.cs" />
-    <Compile Include="..\Runtime\TransportLayers/Telepathy/Server.cs" />
+    <Compile Include="..\Runtime\Transport\Transport.cs" />
+    <Compile Include="..\Runtime\Transport\LLAPITransport.cs" />
+    <Compile Include="..\Runtime\Transport\TelepathyTransport.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\Client.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\Common.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\EventType.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\Logger.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\Message.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\NetworkStreamExtensions.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\SafeCounter.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\SafeDictionary.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\SafeQueue.cs" />
+    <Compile Include="..\Runtime\Transport\Telepathy\Server.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/LLAPITransport.cs b/Unity-Technologies-networking/Runtime/Transport/LLAPITransport.cs
similarity index 97%
rename from Unity-Technologies-networking/Runtime/TransportLayers/LLAPITransport.cs
rename to Unity-Technologies-networking/Runtime/Transport/LLAPITransport.cs
index f05fd19ba..ab3085246 100644
--- a/Unity-Technologies-networking/Runtime/TransportLayers/LLAPITransport.cs
+++ b/Unity-Technologies-networking/Runtime/Transport/LLAPITransport.cs
@@ -164,10 +164,9 @@ public void ServerStart(string address, int port, int maxConnections)
 
         public void ServerStartWebsockets(string address, int port, int maxConnections)
         {
-            /*hostTopology = new HostTopology(connectionConfig, maxConnections);
-            NetworkTransport.Init(globalConfig);
-            serverHostId = NetworkTransport.AddWebsocketHost(hostTopology, port, address);
-            Debug.Log("LLAPITransport.ServerStartWebsockets addr=" + address + "port=" + port + " max=" + maxConnections + " hostid=" + serverHostId);*/
+            HostTopology topology = new HostTopology(connectionConfig, maxConnections);
+            serverHostId = NetworkTransport.AddWebsocketHost(topology, port);
+            Debug.Log("LLAPITransport.ServerStartWebsockets addr=" + address + "port=" + port + " max=" + maxConnections + " hostid=" + serverHostId);
         }
 
         public bool ServerSend(int connectionId, byte[] data)
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Client.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/Client.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Client.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/Client.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Common.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/Common.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Common.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/Common.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/EventType.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/EventType.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/EventType.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/EventType.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/LICENSE b/Unity-Technologies-networking/Runtime/Transport/Telepathy/LICENSE
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/LICENSE
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/LICENSE
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Logger.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/Logger.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Logger.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/Logger.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Message.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/Message.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Message.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/Message.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/NetworkStreamExtensions.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/NetworkStreamExtensions.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/NetworkStreamExtensions.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/NetworkStreamExtensions.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/README.md b/Unity-Technologies-networking/Runtime/Transport/Telepathy/README.md
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/README.md
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/README.md
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/SafeCounter.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/SafeCounter.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/SafeCounter.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/SafeCounter.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/SafeDictionary.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/SafeDictionary.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/SafeDictionary.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/SafeDictionary.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/SafeQueue.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/SafeQueue.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/SafeQueue.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/SafeQueue.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Server.cs b/Unity-Technologies-networking/Runtime/Transport/Telepathy/Server.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/Telepathy/Server.cs
rename to Unity-Technologies-networking/Runtime/Transport/Telepathy/Server.cs
diff --git a/Unity-Technologies-networking/Runtime/TransportLayers/TelepathyTransport.cs b/Unity-Technologies-networking/Runtime/Transport/TelepathyTransport.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/TransportLayers/TelepathyTransport.cs
rename to Unity-Technologies-networking/Runtime/Transport/TelepathyTransport.cs
diff --git a/Unity-Technologies-networking/Runtime/Transport.cs b/Unity-Technologies-networking/Runtime/Transport/Transport.cs
similarity index 100%
rename from Unity-Technologies-networking/Runtime/Transport.cs
rename to Unity-Technologies-networking/Runtime/Transport/Transport.cs
diff --git a/Unity-Technologies-networking/Runtime/UnityEngine.Networking.csproj b/Unity-Technologies-networking/Runtime/UnityEngine.Networking.csproj
index 7987c9335..edc59c0d9 100644
--- a/Unity-Technologies-networking/Runtime/UnityEngine.Networking.csproj
+++ b/Unity-Technologies-networking/Runtime/UnityEngine.Networking.csproj
@@ -64,19 +64,19 @@
     <Compile Include="NetworkManagerHUD.cs" />
     <Compile Include="NetworkBehaviour.cs" />
     <Compile Include="NetworkIdentity.cs" />
-    <Compile Include="Transport.cs" />
-    <Compile Include="TransportLayers\LLAPITransport.cs" />
-    <Compile Include="TransportLayers\TelepathyTransport.cs" />
-    <Compile Include="TransportLayers\Telepathy\Client.cs" />
-    <Compile Include="TransportLayers\Telepathy\Common.cs" />
-    <Compile Include="TransportLayers\Telepathy\EventType.cs" />
-    <Compile Include="TransportLayers\Telepathy\Logger.cs" />
-    <Compile Include="TransportLayers\Telepathy\Message.cs" />
-    <Compile Include="TransportLayers\Telepathy\NetworkStreamExtensions.cs" />
-    <Compile Include="TransportLayers\Telepathy\SafeCounter.cs" />
-    <Compile Include="TransportLayers\Telepathy\SafeDictionary.cs" />
-    <Compile Include="TransportLayers\Telepathy\SafeQueue.cs" />
-    <Compile Include="TransportLayers\Telepathy\Server.cs" />
+    <Compile Include="Transport\LLAPITransport.cs" />
+    <Compile Include="Transport\TelepathyTransport.cs" />
+    <Compile Include="Transport\Telepathy\Client.cs" />
+    <Compile Include="Transport\Telepathy\Common.cs" />
+    <Compile Include="Transport\Telepathy\EventType.cs" />
+    <Compile Include="Transport\Telepathy\Logger.cs" />
+    <Compile Include="Transport\Telepathy\Message.cs" />
+    <Compile Include="Transport\Telepathy\NetworkStreamExtensions.cs" />
+    <Compile Include="Transport\Telepathy\SafeCounter.cs" />
+    <Compile Include="Transport\Telepathy\SafeDictionary.cs" />
+    <Compile Include="Transport\Telepathy\SafeQueue.cs" />
+    <Compile Include="Transport\Telepathy\Server.cs" />
+    <Compile Include="Transport\Transport.cs" />
     <Compile Include="UNetwork.cs" />
     <Compile Include="NetworkReader.cs" />
     <Compile Include="NetworkServer.cs" />
@@ -84,8 +84,8 @@
     <Compile Include="NetworkWriter.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="TransportLayers\Telepathy\LICENSE" />
-    <Content Include="TransportLayers\Telepathy\README.md" />
+    <Content Include="Transport\Telepathy\LICENSE" />
+    <Content Include="Transport\Telepathy\README.md" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">