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

Improved NetworkConfig init

Browse Source
This commit is contained in:
Albin Corén 2018-04-04 08:16:16 +02:00
parent 07178c6bcf
commit 5310c400c3
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,11 +274,22 @@ namespace MLAPI.MonoBehaviours.Core
if (NetworkConfig.Channels[i].Encrypted) if (NetworkConfig.Channels[i].Encrypted)
{ {
NetworkConfig.EncryptedChannels.Add(NetworkConfig.Channels[i].Name); NetworkConfig.EncryptedChannels.Add(NetworkConfig.Channels[i].Name);
NetworkConfig.EncryptedChannelsHashSet.Add(NetworkConfig.Channels[i].Name);
} }
} }
} }
if (NetworkConfig.AllowPassthroughMessages)
{
for (int i = 0; i < NetworkConfig.MessageTypes.Count; i++)
{
if (NetworkConfig.MessageTypes[i].Passthrough)
NetworkConfig.PassthroughMessageHashSet.Add(MessageManager.messageTypes[NetworkConfig.MessageTypes[i].Name]);
}
}
HashSet<string> channelNames = new HashSet<string>(); HashSet<string> channelNames = new HashSet<string>();
//Register internal channels
for (int i = 0; i < internalChannels.Count; i++) for (int i = 0; i < internalChannels.Count; i++)
{ {
if (channelNames.Contains(internalChannels[i].Name)) if (channelNames.Contains(internalChannels[i].Name))
@ -354,33 +365,7 @@ namespace MLAPI.MonoBehaviours.Core
NetworkSceneManager.SetCurrentSceneIndex(); NetworkSceneManager.SetCurrentSceneIndex();
} }
if(NetworkConfig.EnableEncryption) //Register user channels
{
List<string> channelNameList = NetworkConfig.Channels.Select(x => x.Name).ToList();
for (int i = 0; i < NetworkConfig.EncryptedChannels.Count; i++)
{
if (NetworkConfig.EncryptedChannelsHashSet.Contains(NetworkConfig.EncryptedChannels[i]))
{
Debug.LogWarning("MLAPI: Duplicate encrypted channel: " + NetworkConfig.EncryptedChannels[i]);
continue;
}
else if (!channelNameList.Contains(NetworkConfig.EncryptedChannels[i]))
{
Debug.LogWarning("MLAPI: Channel " + NetworkConfig.EncryptedChannels[i] + " doesn't exist");
}
NetworkConfig.EncryptedChannelsHashSet.Add(NetworkConfig.EncryptedChannels[i]);
}
}
if (NetworkConfig.AllowPassthroughMessages)
{
for (int i = 0; i < NetworkConfig.MessageTypes.Count; i++)
{
if (NetworkConfig.MessageTypes[i].Passthrough)
NetworkConfig.PassthroughMessageHashSet.Add(MessageManager.messageTypes[NetworkConfig.MessageTypes[i].Name]);
}
}
for (int i = 0; i < NetworkConfig.Channels.Count; i++) for (int i = 0; i < NetworkConfig.Channels.Count; i++)
{ {
if(channelNames.Contains(NetworkConfig.Channels[i].Name)) if(channelNames.Contains(NetworkConfig.Channels[i].Name))
@ -622,12 +607,6 @@ namespace MLAPI.MonoBehaviours.Core
NetworkTransport.Shutdown(); NetworkTransport.Shutdown();
} }
//Receive stuff
//internal int hostId;
//private int clientId;
//private int channelId;
//private int receivedSize;
//private byte error;
private float lastReceiveTickTime; private float lastReceiveTickTime;
private float lastSendTickTime; private float lastSendTickTime;
private float lastEventTickTime; private float lastEventTickTime;