davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-16 15:16:33 +09:00
Code Issues Releases Activity

initializing network (including binding to socket) moved out from network thread, enabling catching of exceptions

Browse Source 
ConnectionReset on reading handled properly (by disconnecting) when only one connection
readonly added to various members
This commit is contained in:
lidgren
2010-08-11 18:34:15 +00:00
parent 4fef27d175
commit 38bb13b3a7
11 changed files with 83 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Lidgren.Network/NetConnection.Handshake.cs
View File

@@ -149,7 +149,7 @@ namespace Lidgren.Network
return;
}
private void FinishDisconnect()
internal void FinishDisconnect()
{
m_owner.VerifyNetworkThread();

16
Lidgren.Network/NetConnection.Reliability.cs
View File

@@ -25,8 +25,8 @@ namespace Lidgren.Network
{
public partial class NetConnection
{
private int[] m_nextSendSequenceNumber;
private ushort[] m_lastReceivedSequenced;
private readonly int[] m_nextSendSequenceNumber;
private readonly ushort[] m_lastReceivedSequenced;
internal readonly List<NetSending> m_unackedSends = new List<NetSending>();
@@ -57,17 +57,7 @@ namespace Lidgren.Network
}
return retval;
}
private void InitializeReliability()
{
int num = ((int)NetMessageType.UserReliableOrdered + NetConstants.NetChannelsPerDeliveryMethod) - (int)NetMessageType.UserSequenced;
m_nextSendSequenceNumber = new int[num];
m_lastReceivedSequenced = new ushort[num];
for (int i = 0; i < m_lastReceivedSequenced.Length; i++)
m_lastReceivedSequenced[i] = ushort.MaxValue;
m_nextForceAckTime = double.MaxValue;
}
internal ushort GetSendSequenceNumber(NetMessageType mtp)
{
if (mtp < NetMessageType.UserSequenced)

16
Lidgren.Network/NetConnection.cs
View File

@@ -38,12 +38,12 @@ namespace Lidgren.Network
internal NetConnectionStatus m_visibleStatus;
private double m_lastSentUnsentMessages;
private float m_throttleDebt;
private NetPeerConfiguration m_peerConfiguration;
private readonly NetPeerConfiguration m_peerConfiguration;
internal NetConnectionStatistics m_statistics;
private int m_lesserHeartbeats;
private int m_nextFragmentGroupId;
internal long m_remoteUniqueIdentifier;
private Dictionary<int, NetIncomingMessage> m_fragmentGroups;
private readonly Dictionary<int, NetIncomingMessage> m_fragmentGroups;
private int m_handshakeAttempts;
internal PendingConnectionStatus m_pendingStatus = PendingConnectionStatus.NotPending;
@@ -99,7 +99,13 @@ namespace Lidgren.Network
m_lastSendRespondedTo = now;
m_statistics = new NetConnectionStatistics(this);
InitializeReliability();
//InitializeReliability();
int num = ((int)NetMessageType.UserReliableOrdered + NetConstants.NetChannelsPerDeliveryMethod) - (int)NetMessageType.UserSequenced;
m_nextSendSequenceNumber = new int[num];
m_lastReceivedSequenced = new ushort[num];
for (int i = 0; i < m_lastReceivedSequenced.Length; i++)
m_lastReceivedSequenced[i] = ushort.MaxValue;
m_nextForceAckTime = double.MaxValue;
}
// run on network thread
@@ -286,6 +292,7 @@ namespace Lidgren.Network
}
}
// when sending disconnect we can finish our own disconnect
if (send.MessageType == NetMessageType.Library && msg.m_libType == NetMessageLibraryType.Disconnect)
{
FinishDisconnect();
@@ -706,6 +713,9 @@ namespace Lidgren.Network
m_owner.LogVerbose("Disconnect requested for " + this);
m_disconnectByeMessage = byeMessage;
if (m_status != NetConnectionStatus.Disconnected && m_status != NetConnectionStatus.None)
SetStatus(NetConnectionStatus.Disconnecting, byeMessage);
// loosen up throttling
m_throttleDebt = -m_owner.m_configuration.m_throttlePeakBytes;

6
Lidgren.Network/NetEncryption.cs
View File

@@ -216,14 +216,14 @@ namespace Lidgren.Network
/// </summary>
public static byte[] ComputeClientPublicKey(byte[] clientPrivateKey) // a
{
BigInteger salt = new BigInteger(clientPrivateKey);
BigInteger a = new BigInteger(clientPrivateKey);
BigInteger retval = g.ModPow(salt, N);
BigInteger retval = g.ModPow(a, N);
string gs = NetUtility.ToHexString(g.GetBytes());
Console.WriteLine("SALT: " + NetUtility.ToHexString(salt.GetBytes()));
Console.WriteLine("a: " + NetUtility.ToHexString(a.GetBytes()));
Console.WriteLine("A: " + NetUtility.ToHexString(retval.GetBytes()));
return retval.GetBytes();

2
Lidgren.Network/NetIncomingMessage.Read.cs
View File

@@ -28,7 +28,7 @@ namespace Lidgren.Network
{
private const string c_readOverflowError = "Trying to read past the buffer size - likely caused by mismatching Write/Reads, different size or order.";
private static Dictionary<Type, MethodInfo> s_readMethods;
private static readonly Dictionary<Type, MethodInfo> s_readMethods;
private int m_readPosition;

6
Lidgren.Network/NetPeer.ConnectionApproval.cs
View File

@@ -64,6 +64,8 @@ namespace Lidgren.Network
{
LogWarning("Pending connection still in pending state after 10 seconds; forgot to Approve/Deny?");
m_pendingConnections.Remove(conn);
if (m_pendingConnections.Count < 1)
m_pendingConnections = null;
return;
}
break;
@@ -71,12 +73,16 @@ namespace Lidgren.Network
// accept connection
AcceptConnection(conn);
m_pendingConnections.Remove(conn);
if (m_pendingConnections.Count < 1)
m_pendingConnections = null;
return;
case PendingConnectionStatus.Denied:
// send disconnected
NetOutgoingMessage bye = CreateLibraryMessage(NetMessageLibraryType.Disconnect, conn.m_pendingDenialReason);
SendUnconnectedLibrary(bye, conn.m_remoteEndpoint);
m_pendingConnections.Remove(conn);
if (m_pendingConnections.Count < 1)
m_pendingConnections = null;
return;
}
}

112
Lidgren.Network/NetPeer.Internal.cs
View File

@@ -70,12 +70,11 @@ namespace Lidgren.Network
//
// Network loop
//
private void Run()
private void InitializeNetwork()
{
//
// Initialize
//
VerifyNetworkThread();
InitializeRecycling();
@@ -94,8 +93,7 @@ namespace Lidgren.Network
// random bytes is better than nothing
NetRandom.Instance.NextBytes(m_macAddressBytes);
#endif
LogDebug("Network thread started");
LogDebug("Initializing Network");
lock (m_initializeLock)
{
@@ -106,77 +104,50 @@ namespace Lidgren.Network
// bind to socket
IPEndPoint iep = null;
try
{
iep = new IPEndPoint(m_configuration.LocalAddress, m_configuration.Port);
EndPoint ep = (EndPoint)iep;
m_socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
m_socket.ReceiveBufferSize = m_configuration.ReceiveBufferSize;
m_socket.SendBufferSize = m_configuration.SendBufferSize;
m_socket.Blocking = false;
m_socket.Bind(ep);
iep = new IPEndPoint(m_configuration.LocalAddress, m_configuration.Port);
EndPoint ep = (EndPoint)iep;
IPEndPoint boundEp = m_socket.LocalEndPoint as IPEndPoint;
LogDebug("Socket bound to " + boundEp + ": " + m_socket.IsBound);
m_socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
m_socket.ReceiveBufferSize = m_configuration.ReceiveBufferSize;
m_socket.SendBufferSize = m_configuration.SendBufferSize;
m_socket.Blocking = false;
m_socket.Bind(ep);
m_listenPort = boundEp.Port;
IPEndPoint boundEp = m_socket.LocalEndPoint as IPEndPoint;
LogDebug("Socket bound to " + boundEp + ": " + m_socket.IsBound);
int first = (pa == null ? this.GetHashCode() : pa.GetHashCode());
int second = boundEp.GetHashCode();
m_listenPort = boundEp.Port;
byte[] raw = new byte[8];
raw[0] = (byte)first;
raw[1] = (byte)(first << 8);
raw[2] = (byte)(first << 16);
raw[3] = (byte)(first << 24);
raw[4] = (byte)second;
raw[5] = (byte)(second << 8);
raw[6] = (byte)(second << 16);
raw[7] = (byte)(second << 24);
m_uniqueIdentifier = BitConverter.ToInt64(NetSha.Hash(raw), 0);
int first = (pa == null ? this.GetHashCode() : pa.GetHashCode());
int second = boundEp.GetHashCode();
m_receiveBuffer = new byte[m_configuration.ReceiveBufferSize];
m_sendBuffer = new byte[m_configuration.SendBufferSize];
byte[] raw = new byte[8];
raw[0] = (byte)first;
raw[1] = (byte)(first << 8);
raw[2] = (byte)(first << 16);
raw[3] = (byte)(first << 24);
raw[4] = (byte)second;
raw[5] = (byte)(second << 8);
raw[6] = (byte)(second << 16);
raw[7] = (byte)(second << 24);
m_uniqueIdentifier = BitConverter.ToInt64(NetSha.Hash(raw), 0);
// only set Running if everything succeeds
m_status = NetPeerStatus.Running;
m_receiveBuffer = new byte[m_configuration.ReceiveBufferSize];
m_sendBuffer = new byte[m_configuration.SendBufferSize];
LogVerbose("Initialization done");
}
#if DEBUG
catch(Exception)
{
throw;
}
#else
catch (SocketException sex)
{
// catastrophic failure; we can't know what's been initialized, try to back out
m_status = NetPeerStatus.NotRunning;
LogVerbose("Initialization done");
if (sex.SocketErrorCode == SocketError.AddressAlreadyInUse)
LogError("Failed to bind to port " + (iep == null ? "Null" : iep.ToString()) + " - Address already in use!");
else
LogError(sex.Message);
LogError("Lidgren could not initialize properly; please call Start() again");
// exit thread
return;
}
catch (Exception ex)
{
// catastrophic failure; we can't know what's been initialized, try to back out
m_status = NetPeerStatus.NotRunning;
LogError(ex.Message);
LogError("Lidgren could not initialize properly; please call Start() again");
// exit thread
return;
}
#endif
// only set Running if everything succeeds
m_status = NetPeerStatus.Running;
}
}
private void NetworkLoop()
{
VerifyNetworkThread();
LogDebug("Network thread started");
//
// Network loop
@@ -329,6 +300,17 @@ namespace Lidgren.Network
// connection reset by peer, aka connection forcibly closed aka "ICMP port unreachable"
// we should shut down the connection; but m_senderRemote seemingly cannot be trusted, so which connection should we shut down?!
//LogWarning("Connection reset by peer, seemingly from " + m_senderRemote);
lock (m_connections)
{
if (m_connections.Count == 1)
{
// only one connection; let's shut it down, unless already in progress
m_connections[0].Disconnect("Connection forcibly closed");
m_connections[0].ExecuteDisconnect(false);
m_connections[0].FinishDisconnect();
}
}
return;
}

6
Lidgren.Network/NetPeer.Recycling.cs
View File

@@ -26,9 +26,9 @@ namespace Lidgren.Network
{
internal int m_storedBytes;
private int m_maxStoredBytes;
private List<byte[]> m_storagePool = new List<byte[]>();
private NetQueue<NetIncomingMessage> m_incomingMessagesPool = new NetQueue<NetIncomingMessage>(16);
private NetQueue<NetOutgoingMessage> m_outgoingMessagesPool = new NetQueue<NetOutgoingMessage>(16);
private readonly List<byte[]> m_storagePool = new List<byte[]>();
private readonly NetQueue<NetIncomingMessage> m_incomingMessagesPool = new NetQueue<NetIncomingMessage>(16);
private readonly NetQueue<NetOutgoingMessage> m_outgoingMessagesPool = new NetQueue<NetOutgoingMessage>(16);
private void InitializeRecycling()
{

6
Lidgren.Network/NetPeer.cs
View File

@@ -140,14 +140,16 @@ namespace Lidgren.Network
m_configuration.VerifyAndLock();
InitializeNetwork();
// start network thread
m_networkThread = new Thread(new ThreadStart(Run));
m_networkThread = new Thread(new ThreadStart(NetworkLoop));
m_networkThread.Name = "Lidgren network thread";
m_networkThread.IsBackground = true;
m_networkThread.Start();
// allow some time for network thread to start up in case they call Connect() immediately
Thread.Sleep(3);
Thread.Sleep(10);
}
/// <summary>

2
Samples/ChatClient/Program.cs
View File

@@ -64,7 +64,7 @@ namespace ChatClient
NetOutgoingMessage om = Client.CreateMessage();
om.WriteAllFields(cm);
Client.SendMessage(om, NetDeliveryMethod.ReliableOrdered, 8);
Client.SendMessage(om, NetDeliveryMethod.ReliableOrdered, 1);
}
static void AppLoop(object sender, EventArgs e)

2
Samples/ChatServer/Program.cs
View File

@@ -79,7 +79,7 @@ namespace ChatServer
NetOutgoingMessage om = Server.CreateMessage();
om.WriteAllProperties(cm, System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
Display("Forwarding text from " + cm.Sender + " to all clients: " + cm.Text);
Display("Forwarding text from " + cm.Sender + " (seqchan " + msg.SequenceChannel + ") to all clients: " + cm.Text);
Server.SendMessage(om, Server.Connections, NetDeliveryMethod.ReliableOrdered, 0);
break;