Skip to content

Commit 67989a4

Browse files
TwoTenPvPTwoTenPvP
committed
Added LiteNetLib support and a default transport option
1 parent f2bebd6 commit 67989a4

File tree

6 files changed

+264
-2
lines changed

6 files changed

+264
-2
lines changed

‎MLAPI/Data/NetworkConfig.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using MLAPI.NetworkingManagerComponents.Binary;
22
using MLAPI.NetworkingManagerComponents.Cryptography;
3-
using MLAPI.Data.Transports.UNET;
43
using System;
54
using System.Collections.Generic;
65
using UnityEngine;
6+
using MLAPI.Data.Transports;
77

88
namespace MLAPI.Data
99
{
@@ -18,9 +18,13 @@ public class NetworkConfig
1818
/// </summary>
1919
public ushort ProtocolVersion = 0;
2020
/// <summary>
21+
/// The transport to be used
22+
/// </summary>
23+
public DefaultTransport Transport = DefaultTransport.UNET;
24+
/// <summary>
2125
/// The transport hosts the sever uses
2226
/// </summary>
23-
public IUDPTransport NetworkTransport = new UnetTransport();
27+
public IUDPTransport NetworkTransport = null;
2428
/// <summary>
2529
/// Channels used by the NetworkedTransport
2630
/// </summary>

‎MLAPI/Data/Transports/DefaultTransport.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace MLAPI.Data.Transports
2+
{
3+
public enum DefaultTransport
4+
{
5+
UNET,
6+
LiteNetLib,
7+
Custom
8+
}
9+
}

‎MLAPI/Data/Transports/LiteNetLib/LiteNetLibTransport.cs

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
using LiteNetLib;
2+
using LiteNetLib.Utils;
3+
using MLAPI.MonoBehaviours.Core;
4+
using System.Collections.Generic;
5+
6+
namespace MLAPI.Data.Transports.LiteNetLib
7+
{
8+
public class LiteNetLibTransport : IUDPTransport, INetEventListener
9+
{
10+
public ChannelType InternalChannel => ChannelType.ReliableFragmentedSequenced;
11+
12+
public uint ServerNetId => (uint)serverPeer.ConnectId;
13+
14+
public uint HostDummyId => uint.MaxValue - 1;
15+
16+
public uint InvalidDummyId => uint.MaxValue - 2;
17+
18+
private NetManager man = null;
19+
private class LiteNetLibEvent
20+
{
21+
public NetEventType eventType;
22+
public NetPeer peer;
23+
public byte[] data;
24+
}
25+
private Queue<LiteNetLibEvent> pendingEvents = new Queue<LiteNetLibEvent>();
26+
private Dictionary<uint, NetPeer> connectedPeers = new Dictionary<uint, NetPeer>();
27+
private Dictionary<int, SendOptions> channels = new Dictionary<int, SendOptions>();
28+
private int channelCounter = 0;
29+
private NetPeer serverPeer;
30+
31+
public int AddChannel(ChannelType type, object settings)
32+
{
33+
SendOptions options = SendOptions.ReliableUnordered;
34+
switch (type)
35+
{
36+
case ChannelType.Unreliable:
37+
options = SendOptions.Unreliable;
38+
break;
39+
case ChannelType.UnreliableFragmented:
40+
options = SendOptions.Unreliable;
41+
break;
42+
case ChannelType.UnreliableSequenced:
43+
options = SendOptions.Sequenced;
44+
break;
45+
case ChannelType.Reliable:
46+
options = SendOptions.ReliableUnordered;
47+
break;
48+
case ChannelType.ReliableFragmented:
49+
options = SendOptions.ReliableUnordered;
50+
break;
51+
case ChannelType.ReliableSequenced:
52+
options = SendOptions.ReliableOrdered;
53+
break;
54+
case ChannelType.StateUpdate:
55+
options = SendOptions.Unreliable;
56+
break;
57+
case ChannelType.ReliableStateUpdate:
58+
options = SendOptions.ReliableUnordered;
59+
break;
60+
case ChannelType.AllCostDelivery:
61+
options = SendOptions.ReliableOrdered;
62+
break;
63+
case ChannelType.UnreliableFragmentedSequenced:
64+
options = SendOptions.Unreliable;
65+
break;
66+
case ChannelType.ReliableFragmentedSequenced:
67+
options = SendOptions.ReliableOrdered;
68+
break;
69+
default:
70+
options = SendOptions.ReliableUnordered;
71+
break;
72+
}
73+
channels.Add(channelCounter, options);
74+
channelCounter++;
75+
return channelCounter - 1;
76+
}
77+
78+
public void Connect(string address, int port, object settings, out byte error)
79+
{
80+
man = new NetManager(this, string.Empty);
81+
man.Start();
82+
serverPeer = man.Connect(NetworkingManager.singleton.NetworkConfig.ConnectAddress, NetworkingManager.singleton.NetworkConfig.ConnectPort);
83+
error = 0;
84+
}
85+
86+
public void DisconnectClient(uint clientId)
87+
{
88+
man.DisconnectPeer(connectedPeers[clientId]);
89+
}
90+
91+
public void DisconnectFromServer()
92+
{
93+
man.DisconnectPeer(serverPeer);
94+
}
95+
96+
public int GetCurrentRTT(uint clientId, out byte error)
97+
{
98+
error = 0;
99+
return connectedPeers[clientId].Ping;
100+
}
101+
102+
public int GetNetworkTimestamp()
103+
{
104+
return 0;
105+
}
106+
107+
public int GetRemoteDelayTimeMS(uint clientId, int remoteTimestamp, out byte error)
108+
{
109+
error = 0;
110+
return connectedPeers[clientId].Ping;
111+
}
112+
113+
public object GetSettings()
114+
{
115+
return null;
116+
}
117+
118+
public NetEventType PollReceive(out uint clientId, out int channelId, ref byte[] data, int bufferSize, out int receivedSize, out byte error)
119+
{
120+
error = 0;
121+
man.PollEvents();
122+
if (pendingEvents.Count == 0)
123+
{
124+
receivedSize = 0;
125+
channelId = 0;
126+
clientId = 0;
127+
return NetEventType.Nothing;
128+
}
129+
LiteNetLibEvent evnt = pendingEvents.Dequeue();
130+
switch (evnt.eventType)
131+
{
132+
case NetEventType.Data:
133+
clientId = (uint)evnt.peer.ConnectId;
134+
receivedSize = evnt.data.Length;
135+
data = evnt.data;
136+
channelId = 0;
137+
return NetEventType.Data;
138+
case NetEventType.Connect:
139+
clientId = (uint)evnt.peer.ConnectId;
140+
connectedPeers.Add(clientId, evnt.peer);
141+
channelId = 0;
142+
receivedSize = 0;
143+
return NetEventType.Connect;
144+
case NetEventType.Disconnect:
145+
clientId = (uint)evnt.peer.ConnectId;
146+
connectedPeers.Remove(clientId);
147+
channelId = 0;
148+
receivedSize = 0;
149+
return NetEventType.Disconnect;
150+
case NetEventType.Nothing:
151+
receivedSize = 0;
152+
channelId = 0;
153+
clientId = 0;
154+
return NetEventType.Nothing;
155+
default:
156+
receivedSize = 0;
157+
channelId = 0;
158+
clientId = 0;
159+
return NetEventType.Nothing;
160+
}
161+
}
162+
163+
public void QueueMessageForSending(uint clientId, ref byte[] dataBuffer, int dataSize, int channelId, bool skipQueue, out byte error)
164+
{
165+
error = 0;
166+
connectedPeers[clientId].Send(dataBuffer, 0, dataSize, channels[channelId]);
167+
}
168+
169+
public void RegisterServerListenSocket(object settings)
170+
{
171+
man = new NetManager(this, NetworkingManager.singleton.NetworkConfig.MaxConnections, string.Empty);
172+
man.Start(NetworkingManager.singleton.NetworkConfig.ConnectPort);
173+
}
174+
175+
public void SendQueue(uint clientId, out byte error)
176+
{
177+
error = 0;
178+
return;
179+
}
180+
181+
public void Shutdown()
182+
{
183+
man.Stop();
184+
man = null;
185+
}
186+
187+
//*LITE NET LIB EVENTS BELOW*//
188+
189+
public void OnPeerConnected(NetPeer peer)
190+
{
191+
pendingEvents.Enqueue(new LiteNetLibEvent()
192+
{
193+
eventType = NetEventType.Connect,
194+
peer = peer
195+
});
196+
}
197+
198+
public void OnPeerDisconnected(NetPeer peer, DisconnectInfo disconnectInfo)
199+
{
200+
pendingEvents.Enqueue(new LiteNetLibEvent()
201+
{
202+
eventType = NetEventType.Disconnect,
203+
peer = peer
204+
});
205+
}
206+
207+
public void OnNetworkError(NetEndPoint endPoint, int socketErrorCode)
208+
{
209+
return;
210+
}
211+
212+
public void OnNetworkReceive(NetPeer peer, NetDataReader reader)
213+
{
214+
pendingEvents.Enqueue(new LiteNetLibEvent()
215+
{
216+
eventType = NetEventType.Data,
217+
peer = peer,
218+
data = reader.Data
219+
});
220+
}
221+
222+
public void OnNetworkReceiveUnconnected(NetEndPoint remoteEndPoint, NetDataReader reader, UnconnectedMessageType messageType)
223+
{
224+
return;
225+
}
226+
227+
public void OnNetworkLatencyUpdate(NetPeer peer, int latency)
228+
{
229+
return;
230+
}
231+
}
232+
}

‎MLAPI/MLAPI.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
<Reference Include="IntXLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1744b76c74eaee1e, processorArchitecture=MSIL">
5555
<HintPath>..\packages\IntX.1.0.1.0\lib\net20\IntXLib.dll</HintPath>
5656
</Reference>
57+
<Reference Include="LiteNetLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
58+
<HintPath>..\packages\LiteNetLib.0.7.7.1\lib\net35\LiteNetLib.dll</HintPath>
59+
</Reference>
5760
<Reference Include="System" />
5861
<Reference Include="System.Core" />
5962
<Reference Include="System.Xml.Linq" />
@@ -76,7 +79,9 @@
7679
<Compile Include="Data\FieldType.cs" />
7780
<Compile Include="Attributes\SyncedVar.cs" />
7881
<Compile Include="Data\FixedQueue.cs" />
82+
<Compile Include="Data\Transports\DefaultTransport.cs" />
7983
<Compile Include="Data\Transports\IUDPTransport.cs" />
84+
<Compile Include="Data\Transports\LiteNetLib\LiteNetLibTransport.cs" />
8085
<Compile Include="Data\Transports\NetEventType.cs" />
8186
<Compile Include="Data\NetworkConfig.cs" />
8287
<Compile Include="Data\NetworkedPrefab.cs" />

‎MLAPI/MonoBehaviours/Core/NetworkingManager.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
using MLAPI.NetworkingManagerComponents.Core;
1010
using UnityEngine.SceneManagement;
1111
using MLAPI.NetworkingManagerComponents.Binary;
12+
using MLAPI.Data.Transports;
13+
using MLAPI.Data.Transports.UNET;
14+
using MLAPI.Data.Transports.LiteNetLib;
1215

1316
namespace MLAPI.MonoBehaviours.Core
1417
{
@@ -234,6 +237,14 @@ private object Init(bool server)
234237
NetworkSceneManager.sceneIndexToString = new Dictionary<uint, string>();
235238
NetworkSceneManager.sceneNameToIndex = new Dictionary<string, uint>();
236239
InternalMessageHandler.FinalMessageBuffer = new byte[NetworkConfig.MessageBufferSize];
240+
241+
if (NetworkConfig.Transport == DefaultTransport.UNET)
242+
NetworkConfig.NetworkTransport = new UnetTransport();
243+
else if (NetworkConfig.Transport == DefaultTransport.LiteNetLib)
244+
NetworkConfig.NetworkTransport = new LiteNetLibTransport();
245+
else if (NetworkConfig.Transport == DefaultTransport.Custom && NetworkConfig.NetworkTransport == null)
246+
throw new NullReferenceException("The current NetworkTransport is null");
247+
237248
object settings = NetworkConfig.NetworkTransport.GetSettings(); //Gets a new "settings" object for the transport currently used.
238249

239250
if(NetworkConfig.HandleObjectSpawning)

‎MLAPI/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="IntX" version="1.0.1.0" targetFramework="net35" />
4+
<package id="LiteNetLib" version="0.7.7.1" targetFramework="net35" />
45
</packages>

0 commit comments

Comments
 (0)