GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various issues and began testing and creating examples for the wiki

Browse Source
This commit is contained in:
Albin Corén 2018-01-06 12:26:28 +01:00
parent 9321efe569
commit 01edd4c168
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MLAPI/Data/NetworkingConfiguration.cs
View File

@ -1,7 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
namespace MLAPI namespace MLAPI
@ -11,11 +13,11 @@ namespace MLAPI
public ushort ProtocolVersion = 0; public ushort ProtocolVersion = 0;
public Dictionary<string, QosType> Channels = new Dictionary<string, QosType>(); public Dictionary<string, QosType> Channels = new Dictionary<string, QosType>();
public List<string> MessageTypes = new List<string>(); public List<string> MessageTypes = new List<string>();
public int MessageBufferSize = 65536; public int MessageBufferSize = 65535;
public int MaxMessagesPerFrame = 150; public int MaxMessagesPerFrame = 150;
public int MaxConnections = 100; public int MaxConnections = 100;
public int Port = 7777; public int Port = 7777;
public string Address; public string Address = "127.0.0.1";
public int ClientConnectionBufferTimeout = 10; public int ClientConnectionBufferTimeout = 10;
public bool ConnectionApproval = false; public bool ConnectionApproval = false;
public Action<byte[], int, Action<int, bool>> ConnectionApprovalCallback; public Action<byte[], int, Action<int, bool>> ConnectionApprovalCallback;
@ -27,7 +29,6 @@ namespace MLAPI
//TODO //TODO
public bool EncryptMessages = false; public bool EncryptMessages = false;
//Cached config hash //Cached config hash
private byte[] ConfigHash = null; private byte[] ConfigHash = null;
public byte[] GetConfig(bool cache = true) public byte[] GetConfig(bool cache = true)
@ -68,7 +69,7 @@ namespace MLAPI
public bool CompareConfig(byte[] hash) public bool CompareConfig(byte[] hash)
{ {
return hash == GetConfig(); return hash.SequenceEqual(GetConfig());
} }
} }
} }

4
MLAPI/MLAPI.csproj
View File

@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -37,7 +38,8 @@
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="UnityEngine"> <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll</HintPath> <HintPath>..\..\..\..\..\..\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

46
MLAPI/MonoBehaviours/Core/NetworkingManager.cs
View File

@ -34,8 +34,8 @@ namespace MLAPI
private Dictionary<ushort, int> messageHandlerCounter; private Dictionary<ushort, int> messageHandlerCounter;
private Dictionary<ushort, Stack<int>> releasedMessageHandlerCounters; private Dictionary<ushort, Stack<int>> releasedMessageHandlerCounters;
private int localConnectionId; private int localConnectionId;
public Scene PlayScene; public int PlaySceneIndex;
public Scene MenuScene; public int MenuSceneIndex;
private Dictionary<uint, NetworkedObject> spawnedObjects; private Dictionary<uint, NetworkedObject> spawnedObjects;
private List<uint> spawnedObjectIds; private List<uint> spawnedObjectIds;
private Stack<uint> releasedNetworkObjectIds; private Stack<uint> releasedNetworkObjectIds;
@ -212,7 +212,7 @@ namespace MLAPI
{ {
if(NetworkConfig.ConnectionApprovalCallback == null) if(NetworkConfig.ConnectionApprovalCallback == null)
{ {
Debug.LogWarning("MLAPI: No ConnectionApproval callback defined. Connection aproval will timeout"); Debug.LogWarning("MLAPI: No ConnectionApproval callback defined. Connection approval will timeout");
} }
} }
@ -229,17 +229,14 @@ namespace MLAPI
HashSet<string> channelNames = new HashSet<string>(); HashSet<string> channelNames = new HashSet<string>();
foreach (KeyValuePair<string, QosType> pair in NetworkConfig.Channels) foreach (KeyValuePair<string, QosType> pair in NetworkConfig.Channels)
{ {
if(pair.Key.StartsWith("MLAPI_")) if(channelNames.Contains(pair.Key))
{
Debug.LogWarning("MLAPI: Channel names are not allowed to start with MLAPI_. This is to prevent name conflicts");
continue;
}
else if(channelNames.Contains(pair.Key))
{ {
Debug.LogWarning("MLAPI: Duplicate channel name: " + pair.Key); Debug.LogWarning("MLAPI: Duplicate channel name: " + pair.Key);
continue; continue;
} }
channels.Add(pair.Key, cConfig.AddChannel(pair.Value)); int channelId = cConfig.AddChannel(pair.Value);
channels.Add(pair.Key, channelId);
channelNames.Add(pair.Key);
} }
//0-32 are reserved for MLAPI messages //0-32 are reserved for MLAPI messages
for (ushort i = 32; i < NetworkConfig.MessageTypes.Count; i++) for (ushort i = 32; i < NetworkConfig.MessageTypes.Count; i++)
@ -252,29 +249,31 @@ namespace MLAPI
public void StartServer(NetworkingConfiguration netConfig) public void StartServer(NetworkingConfiguration netConfig)
{ {
SceneManager.LoadScene(PlaySceneIndex);
ConnectionConfig cConfig = Init(netConfig); ConnectionConfig cConfig = Init(netConfig);
HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections); HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections);
hostId = NetworkTransport.AddHost(hostTopology, NetworkConfig.Port, null); hostId = NetworkTransport.AddHost(hostTopology, NetworkConfig.Port);
isServer = true; isServer = true;
isClient = false; isClient = false;
isListening = true; isListening = true;
SceneManager.LoadScene(PlayScene.buildIndex);
} }
public void StartClient(NetworkingConfiguration netConfig) public void StartClient(NetworkingConfiguration netConfig)
{ {
ConnectionConfig cConfig = Init(netConfig); ConnectionConfig cConfig = Init(netConfig);
HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections); HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections);
hostId = NetworkTransport.AddHost(hostTopology, 0); hostId = NetworkTransport.AddHost(hostTopology, 0, null);
//NetworkTransport.AddSceneId(PlaySceneIndex);
localConnectionId = NetworkTransport.Connect(hostId, NetworkConfig.Address, NetworkConfig.Port, 0, out error);
isServer = false; isServer = false;
isClient = true; isClient = true;
isListening = true; isListening = true;
localConnectionId = NetworkTransport.Connect(hostId, NetworkConfig.Address, NetworkConfig.Port, 0, out error);
} }
public void StartHost(NetworkingConfiguration netConfig) public void StartHost(NetworkingConfiguration netConfig)
{ {
SceneManager.LoadScene(PlaySceneIndex);
ConnectionConfig cConfig = Init(netConfig); ConnectionConfig cConfig = Init(netConfig);
HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections); HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections);
hostId = NetworkTransport.AddHost(hostTopology, NetworkConfig.Port, null); hostId = NetworkTransport.AddHost(hostTopology, NetworkConfig.Port, null);
@ -282,7 +281,6 @@ namespace MLAPI
isClient = true; isClient = true;
isListening = true; isListening = true;
connectedClients.Add(-1, new NetworkedClient() { ClientId = -1 }); connectedClients.Add(-1, new NetworkedClient() { ClientId = -1 });
SceneManager.LoadScene(PlayScene.buildIndex);
} }
private void OnEnable() private void OnEnable()
@ -316,12 +314,12 @@ namespace MLAPI
do do
{ {
messagesProcessed++; messagesProcessed++;
eventType = NetworkTransport.Receive(out hostId, out connectionId, out channelId, messageBuffer, NetworkConfig.MessageBufferSize, out receivedSize, out error); eventType = NetworkTransport.Receive(out hostId, out connectionId, out channelId, messageBuffer, messageBuffer.Length, out receivedSize, out error);
NetworkError networkError = (NetworkError)error; NetworkError networkError = (NetworkError)error;
if (networkError != NetworkError.Ok) if (networkError != NetworkError.Ok)
{ {
Debug.LogWarning("MLAPI: NetworkTransport receive error: " + networkError.ToString()); Debug.LogWarning("MLAPI: NetworkTransport receive error: " + networkError.ToString());
return; continue;
} }
switch (eventType) switch (eventType)
{ {
@ -342,12 +340,13 @@ namespace MLAPI
{ {
writer.Write(NetworkConfig.ConnectionData); writer.Write(NetworkConfig.ConnectionData);
} }
Send(connectionId, "MLAPI_CONNECTION_REQUEST", "MLAPI_RELIABLE_FRAGMENTED", writeStream.ToArray());
} }
Send(connectionId, "MLAPI_CONNECTION_REQUEST", "MLAPI_RELIABLE_FRAGMENTED", writeStream.ToArray());
} }
} }
break; break;
case NetworkEventType.DataEvent: case NetworkEventType.DataEvent:
Debug.Log("RECIEVE");
HandleIncomingData(connectionId, ref messageBuffer); HandleIncomingData(connectionId, ref messageBuffer);
break; break;
} }
@ -405,7 +404,7 @@ namespace MLAPI
using (BinaryReader messageReader = new BinaryReader(messageReadStream)) using (BinaryReader messageReader = new BinaryReader(messageReadStream))
{ {
byte[] configHash = messageReader.ReadBytes(32); byte[] configHash = messageReader.ReadBytes(32);
if (NetworkConfig.CompareConfig(configHash) == false) if (!NetworkConfig.CompareConfig(configHash))
{ {
Debug.LogWarning("MLAPI: NetworkConfiguration missmatch. The configuration between the server and client does not match."); Debug.LogWarning("MLAPI: NetworkConfiguration missmatch. The configuration between the server and client does not match.");
DisconnectClient(connectionId); DisconnectClient(connectionId);
@ -427,7 +426,7 @@ namespace MLAPI
case 1: //Server informs client it has been approved: case 1: //Server informs client it has been approved:
if (isClient) if (isClient)
{ {
SceneManager.LoadScene(PlayScene.buildIndex); SceneManager.LoadScene(PlaySceneIndex);
using (MemoryStream messageReadStream = new MemoryStream(reader.ReadBytes(int.MaxValue))) using (MemoryStream messageReadStream = new MemoryStream(reader.ReadBytes(int.MaxValue)))
{ {
using (BinaryReader messageReader = new BinaryReader(messageReadStream)) using (BinaryReader messageReader = new BinaryReader(messageReadStream))
@ -477,7 +476,9 @@ namespace MLAPI
{ {
writer.Write(messageTypes[messageType]); writer.Write(messageTypes[messageType]);
writer.Write(data); writer.Write(data);
NetworkTransport.Send(hostId, connectionId, channels[channelName], data, data.Length, out error); //2 bytes for message type
int size = data.Length + 2;
NetworkTransport.Send(hostId, connectionId, channels[channelName], stream.ToArray(), size, out error);
} }
} }
} }
@ -549,9 +550,8 @@ namespace MLAPI
writer.Write(spawnedObjects[spawnedObjectIds[i]].SpawnablePrefabId); writer.Write(spawnedObjects[spawnedObjectIds[i]].SpawnablePrefabId);
} }
} }
Send(connectionId, "MLAPI_CLIENT_LIST", "MLAPI_RELIABLE_FRAGMENTED", writeStream.ToArray());
} }
Send(connectionId, "MLAPI_CLIENT_LIST", "MLAPI_RELIABLE_FRAGMENTED", writeStream.ToArray());
} }
} }
else else