diff --git a/Lidgren.Network/NetBuffer.Read.cs b/Lidgren.Network/NetBuffer.Read.cs index aa51722..0107c7c 100644 --- a/Lidgren.Network/NetBuffer.Read.cs +++ b/Lidgren.Network/NetBuffer.Read.cs @@ -618,7 +618,7 @@ namespace Lidgren.Network /// /// Reads a stored IPv4 endpoint description /// - public IPEndPoint ReadIPEndpoint() + public IPEndPoint ReadIPEndPoint() { byte len = ReadByte(); byte[] addressBytes = ReadBytes(len); diff --git a/Lidgren.Network/NetClient.cs b/Lidgren.Network/NetClient.cs index 1cde783..8094318 100644 --- a/Lidgren.Network/NetClient.cs +++ b/Lidgren.Network/NetClient.cs @@ -77,10 +77,10 @@ namespace Lidgren.Network /// /// Connect to a remote server /// - /// The remote endpoint to connect to + /// The remote endpoint to connect to /// The hail message to pass /// server connection, or null if already connected - public override NetConnection Connect(IPEndPoint remoteEndpoint, NetOutgoingMessage hailMessage) + public override NetConnection Connect(IPEndPoint remoteEndPoint, NetOutgoingMessage hailMessage) { lock (m_connections) { @@ -90,7 +90,7 @@ namespace Lidgren.Network return null; } } - return base.Connect(remoteEndpoint, hailMessage); + return base.Connect(remoteEndPoint, hailMessage); } /// diff --git a/Lidgren.Network/NetConnection.Handshake.cs b/Lidgren.Network/NetConnection.Handshake.cs index bf65458..9166904 100644 --- a/Lidgren.Network/NetConnection.Handshake.cs +++ b/Lidgren.Network/NetConnection.Handshake.cs @@ -111,7 +111,7 @@ namespace Lidgren.Network // in case we're still in handshake lock (m_peer.m_handshakes) - m_peer.m_handshakes.Remove(m_remoteEndpoint); + m_peer.m_handshakes.Remove(m_remoteEndPoint); m_disconnectRequested = false; m_connectRequested = false; @@ -130,7 +130,7 @@ namespace Lidgren.Network WriteLocalHail(om); - m_peer.SendLibrary(om, m_remoteEndpoint); + m_peer.SendLibrary(om, m_remoteEndPoint); m_connectRequested = false; m_lastHandshakeSendTime = now; @@ -155,9 +155,9 @@ namespace Lidgren.Network WriteLocalHail(om); if (onLibraryThread) - m_peer.SendLibrary(om, m_remoteEndpoint); + m_peer.SendLibrary(om, m_remoteEndPoint); else - m_peer.m_unsentUnconnectedMessages.Enqueue(new NetTuple(m_remoteEndpoint, om)); + m_peer.m_unsentUnconnectedMessages.Enqueue(new NetTuple(m_remoteEndPoint, om)); m_lastHandshakeSendTime = now; m_handshakeAttempts++; @@ -176,9 +176,9 @@ namespace Lidgren.Network NetOutgoingMessage om = m_peer.CreateMessage(reason); om.m_messageType = NetMessageType.Disconnect; if (onLibraryThread) - m_peer.SendLibrary(om, m_remoteEndpoint); + m_peer.SendLibrary(om, m_remoteEndPoint); else - m_peer.m_unsentUnconnectedMessages.Enqueue(new NetTuple(m_remoteEndpoint, om)); + m_peer.m_unsentUnconnectedMessages.Enqueue(new NetTuple(m_remoteEndPoint, om)); } private void WriteLocalHail(NetOutgoingMessage om) @@ -200,7 +200,7 @@ namespace Lidgren.Network NetOutgoingMessage om = m_peer.CreateMessage(0); om.m_messageType = NetMessageType.ConnectionEstablished; om.Write((float)NetTime.Now); - m_peer.SendLibrary(om, m_remoteEndpoint); + m_peer.SendLibrary(om, m_remoteEndPoint); m_handshakeAttempts = 0; @@ -260,7 +260,7 @@ namespace Lidgren.Network SendDisconnect(reason, false); // remove from handshakes - m_peer.m_handshakes.Remove(m_remoteEndpoint); // TODO: make this more thread safe? we're on user thread + m_peer.m_handshakes.Remove(m_remoteEndPoint); // TODO: make this more thread safe? we're on user thread } internal void ReceivedHandshake(double now, NetMessageType tp, int ptr, int payloadLength) @@ -293,7 +293,7 @@ namespace Lidgren.Network NetIncomingMessage appMsg = m_peer.CreateIncomingMessage(NetIncomingMessageType.ConnectionApproval, (m_remoteHailMessage == null ? 0 : m_remoteHailMessage.LengthBytes)); appMsg.m_receiveTime = now; appMsg.m_senderConnection = this; - appMsg.m_senderEndpoint = this.m_remoteEndpoint; + appMsg.m_senderEndPoint = this.m_remoteEndPoint; if (m_remoteHailMessage != null) appMsg.Write(m_remoteHailMessage.m_data, 0, m_remoteHailMessage.LengthBytes); SetStatus(NetConnectionStatus.RespondedAwaitingApproval, "Awaiting approval"); @@ -401,11 +401,11 @@ namespace Lidgren.Network break; case NetMessageType.Discovery: - m_peer.HandleIncomingDiscoveryRequest(now, m_remoteEndpoint, ptr, payloadLength); + m_peer.HandleIncomingDiscoveryRequest(now, m_remoteEndPoint, ptr, payloadLength); return; case NetMessageType.DiscoveryResponse: - m_peer.HandleIncomingDiscoveryResponse(now, m_remoteEndpoint, ptr, payloadLength); + m_peer.HandleIncomingDiscoveryResponse(now, m_remoteEndPoint, ptr, payloadLength); return; case NetMessageType.Ping: diff --git a/Lidgren.Network/NetConnection.Latency.cs b/Lidgren.Network/NetConnection.Latency.cs index df677f9..bbcfe37 100644 --- a/Lidgren.Network/NetConnection.Latency.cs +++ b/Lidgren.Network/NetConnection.Latency.cs @@ -71,7 +71,7 @@ namespace Lidgren.Network int len = om.Encode(m_peer.m_sendBuffer, 0, 0); bool connectionReset; - m_peer.SendPacket(len, m_remoteEndpoint, 1, out connectionReset); + m_peer.SendPacket(len, m_remoteEndPoint, 1, out connectionReset); m_statistics.PacketSent(len, 1); } @@ -88,7 +88,7 @@ namespace Lidgren.Network int len = om.Encode(m_peer.m_sendBuffer, 0, 0); bool connectionReset; - m_peer.SendPacket(len, m_remoteEndpoint, 1, out connectionReset); + m_peer.SendPacket(len, m_remoteEndPoint, 1, out connectionReset); m_statistics.PacketSent(len, 1); } @@ -138,7 +138,7 @@ namespace Lidgren.Network { NetIncomingMessage update = m_peer.CreateIncomingMessage(NetIncomingMessageType.ConnectionLatencyUpdated, 4); update.m_senderConnection = this; - update.m_senderEndpoint = this.m_remoteEndpoint; + update.m_senderEndPoint = this.m_remoteEndPoint; update.Write(rtt); m_peer.ReleaseMessage(update); } diff --git a/Lidgren.Network/NetConnection.MTU.cs b/Lidgren.Network/NetConnection.MTU.cs index 927441f..0cfe1f2 100644 --- a/Lidgren.Network/NetConnection.MTU.cs +++ b/Lidgren.Network/NetConnection.MTU.cs @@ -104,7 +104,7 @@ namespace Lidgren.Network om.m_messageType = NetMessageType.ExpandMTURequest; int len = om.Encode(m_peer.m_sendBuffer, 0, 0); - bool ok = m_peer.SendMTUPacket(len, m_remoteEndpoint); + bool ok = m_peer.SendMTUPacket(len, m_remoteEndPoint); if (ok == false) { //m_peer.LogDebug("Send MTU failed for size " + size); @@ -148,7 +148,7 @@ namespace Lidgren.Network om.m_messageType = NetMessageType.ExpandMTUSuccess; int len = om.Encode(m_peer.m_sendBuffer, 0, 0); bool connectionReset; - m_peer.SendPacket(len, m_remoteEndpoint, 1, out connectionReset); + m_peer.SendPacket(len, m_remoteEndPoint, 1, out connectionReset); // m_peer.LogDebug("Received MTU expand request for " + size + " bytes"); diff --git a/Lidgren.Network/NetConnection.cs b/Lidgren.Network/NetConnection.cs index 97fa96f..311481f 100644 --- a/Lidgren.Network/NetConnection.cs +++ b/Lidgren.Network/NetConnection.cs @@ -8,14 +8,14 @@ namespace Lidgren.Network /// /// Represents a connection to a remote peer /// - [DebuggerDisplay("RemoteUniqueIdentifier={RemoteUniqueIdentifier} RemoteEndpoint={RemoteEndpoint}")] + [DebuggerDisplay("RemoteUniqueIdentifier={RemoteUniqueIdentifier} RemoteEndPoint={remoteEndPoint}")] public partial class NetConnection { internal NetPeer m_peer; internal NetPeerConfiguration m_peerConfiguration; internal NetConnectionStatus m_status; internal NetConnectionStatus m_visibleStatus; - internal IPEndPoint m_remoteEndpoint; + internal IPEndPoint m_remoteEndPoint; internal NetSenderChannelBase[] m_sendChannels; internal NetReceiverChannelBase[] m_receiveChannels; internal NetOutgoingMessage m_localHailMessage; @@ -54,7 +54,7 @@ namespace Lidgren.Network /// /// Gets the remote endpoint for the connection /// - public IPEndPoint RemoteEndpoint { get { return m_remoteEndpoint; } } + public IPEndPoint RemoteEndPoint { get { return m_remoteEndPoint; } } /// /// Gets the unique identifier of the remote NetPeer for this connection @@ -75,13 +75,13 @@ namespace Lidgren.Network return 0.02f + (avgRtt * 2.0f); // 20 ms + double rtt } - internal NetConnection(NetPeer peer, IPEndPoint remoteEndpoint) + internal NetConnection(NetPeer peer, IPEndPoint remoteEndPoint) { m_peer = peer; m_peerConfiguration = m_peer.Configuration; m_status = NetConnectionStatus.None; m_visibleStatus = NetConnectionStatus.None; - m_remoteEndpoint = remoteEndpoint; + m_remoteEndPoint = remoteEndPoint; m_sendChannels = new NetSenderChannelBase[NetConstants.NumTotalChannels]; m_receiveChannels = new NetReceiverChannelBase[NetConstants.NumTotalChannels]; m_queuedOutgoingAcks = new NetQueue>(4); @@ -94,10 +94,9 @@ namespace Lidgren.Network /// /// Change the internal endpoint to this new one. Used when, during handshake, a switch in port is detected (due to NAT) /// - internal void MutateEndpoint(IPEndPoint endpoint) + internal void MutateEndPoint(IPEndPoint endPoint) { - m_remoteEndpoint = endpoint; - + m_remoteEndPoint = endPoint; } internal void SetStatus(NetConnectionStatus status, string reason) @@ -121,7 +120,7 @@ namespace Lidgren.Network { NetIncomingMessage info = m_peer.CreateIncomingMessage(NetIncomingMessageType.StatusChanged, 4 + reason.Length + (reason.Length > 126 ? 2 : 1)); info.m_senderConnection = this; - info.m_senderEndpoint = m_remoteEndpoint; + info.m_senderEndPoint = m_remoteEndPoint; info.Write((byte)m_status); info.Write(reason); m_peer.ReleaseMessage(info); @@ -216,7 +215,7 @@ namespace Lidgren.Network { // send packet and go for another round of acks NetException.Assert(m_sendBufferWritePtr > 0 && m_sendBufferNumMessages > 0); - m_peer.SendPacket(m_sendBufferWritePtr, m_remoteEndpoint, m_sendBufferNumMessages, out connectionReset); + m_peer.SendPacket(m_sendBufferWritePtr, m_remoteEndPoint, m_sendBufferNumMessages, out connectionReset); m_statistics.PacketSent(m_sendBufferWritePtr, 1); m_sendBufferWritePtr = 0; m_sendBufferNumMessages = 0; @@ -259,7 +258,7 @@ namespace Lidgren.Network { m_peer.VerifyNetworkThread(); NetException.Assert(m_sendBufferWritePtr > 0 && m_sendBufferNumMessages > 0); - m_peer.SendPacket(m_sendBufferWritePtr, m_remoteEndpoint, m_sendBufferNumMessages, out connectionReset); + m_peer.SendPacket(m_sendBufferWritePtr, m_remoteEndPoint, m_sendBufferNumMessages, out connectionReset); m_statistics.PacketSent(m_sendBufferWritePtr, m_sendBufferNumMessages); m_sendBufferWritePtr = 0; m_sendBufferNumMessages = 0; @@ -280,7 +279,7 @@ namespace Lidgren.Network { bool connReset; // TODO: handle connection reset NetException.Assert(m_sendBufferWritePtr > 0 && m_sendBufferNumMessages > 0); // or else the message should have been fragmented earlier - m_peer.SendPacket(m_sendBufferWritePtr, m_remoteEndpoint, m_sendBufferNumMessages, out connReset); + m_peer.SendPacket(m_sendBufferWritePtr, m_remoteEndPoint, m_sendBufferNumMessages, out connReset); m_statistics.PacketSent(m_sendBufferWritePtr, m_sendBufferNumMessages); m_sendBufferWritePtr = 0; m_sendBufferNumMessages = 0; @@ -500,7 +499,7 @@ namespace Lidgren.Network /// public override string ToString() { - return "[NetConnection to " + m_remoteEndpoint + "]"; + return "[NetConnection to " + m_remoteEndPoint + "]"; } } } diff --git a/Lidgren.Network/NetIncomingMessage.cs b/Lidgren.Network/NetIncomingMessage.cs index 168d60c..4885a30 100644 --- a/Lidgren.Network/NetIncomingMessage.cs +++ b/Lidgren.Network/NetIncomingMessage.cs @@ -29,7 +29,7 @@ namespace Lidgren.Network public sealed class NetIncomingMessage : NetBuffer { internal NetIncomingMessageType m_incomingMessageType; - internal IPEndPoint m_senderEndpoint; + internal IPEndPoint m_senderEndPoint; internal NetConnection m_senderConnection; internal int m_sequenceNumber; internal NetMessageType m_receivedMessageType; @@ -54,7 +54,7 @@ namespace Lidgren.Network /// /// IPEndPoint of sender, if any /// - public IPEndPoint SenderEndpoint { get { return m_senderEndpoint; } } + public IPEndPoint SenderEndPoint { get { return m_senderEndPoint; } } /// /// NetConnection of sender, if any diff --git a/Lidgren.Network/NetNatIntroduction.cs b/Lidgren.Network/NetNatIntroduction.cs index 7d1ff75..438a088 100644 --- a/Lidgren.Network/NetNatIntroduction.cs +++ b/Lidgren.Network/NetNatIntroduction.cs @@ -48,8 +48,8 @@ namespace Lidgren.Network NetIncomingMessage tmp = SetupReadHelperMessage(ptr, 1000); // never mind length byte hostByte = tmp.ReadByte(); - IPEndPoint remoteInternal = tmp.ReadIPEndpoint(); - IPEndPoint remoteExternal = tmp.ReadIPEndpoint(); + IPEndPoint remoteInternal = tmp.ReadIPEndPoint(); + IPEndPoint remoteExternal = tmp.ReadIPEndPoint(); string token = tmp.ReadString(); bool isHost = (hostByte != 0); @@ -78,7 +78,7 @@ namespace Lidgren.Network /// /// Called when receiving a NatPunchMessage from a remote endpoint /// - private void HandleNatPunch(int ptr, IPEndPoint senderEndpoint) + private void HandleNatPunch(int ptr, IPEndPoint senderEndPoint) { NetIncomingMessage tmp = SetupReadHelperMessage(ptr, 1000); // never mind length @@ -86,18 +86,18 @@ namespace Lidgren.Network if (fromHostByte == 0) { // it's from client - LogDebug("NAT punch received from " + senderEndpoint + " we're host, so we ignore this"); + LogDebug("NAT punch received from " + senderEndPoint + " we're host, so we ignore this"); return; // don't alert hosts about nat punch successes; only clients } string token = tmp.ReadString(); - LogDebug("NAT punch received from " + senderEndpoint + " we're client, so we've succeeded - token is " + token); + LogDebug("NAT punch received from " + senderEndPoint + " we're client, so we've succeeded - token is " + token); // // Release punch success to client; enabling him to Connect() to msg.SenderIPEndPoint if token is ok // NetIncomingMessage punchSuccess = CreateIncomingMessage(NetIncomingMessageType.NatIntroductionSuccess, 10); - punchSuccess.m_senderEndpoint = senderEndpoint; + punchSuccess.m_senderEndPoint = senderEndPoint; punchSuccess.Write(token); ReleaseMessage(punchSuccess); } diff --git a/Lidgren.Network/NetPeer.Discovery.cs b/Lidgren.Network/NetPeer.Discovery.cs index c03225c..f3fe0e1 100644 --- a/Lidgren.Network/NetPeer.Discovery.cs +++ b/Lidgren.Network/NetPeer.Discovery.cs @@ -30,11 +30,11 @@ namespace Lidgren.Network /// /// Emit a discovery signal to a single known host /// - public void DiscoverKnownPeer(IPEndPoint endpoint) + public void DiscoverKnownPeer(IPEndPoint endPoint) { NetOutgoingMessage om = CreateMessage(0); om.m_messageType = NetMessageType.Discovery; - m_unsentUnconnectedMessages.Enqueue(new NetTuple(endpoint, om)); + m_unsentUnconnectedMessages.Enqueue(new NetTuple(endPoint, om)); } /// diff --git a/Lidgren.Network/NetPeer.Internal.cs b/Lidgren.Network/NetPeer.Internal.cs index 2a7a876..dbf449a 100644 --- a/Lidgren.Network/NetPeer.Internal.cs +++ b/Lidgren.Network/NetPeer.Internal.cs @@ -291,10 +291,10 @@ namespace Lidgren.Network { #if DEBUG // sanity check - if (conn.m_status == NetConnectionStatus.Disconnected && m_handshakes.ContainsKey(conn.RemoteEndpoint)) + if (conn.m_status == NetConnectionStatus.Disconnected && m_handshakes.ContainsKey(conn.RemoteEndPoint)) { LogWarning("Sanity fail! Handshakes list contained disconnected connection!"); - m_handshakes.Remove(conn.RemoteEndpoint); + m_handshakes.Remove(conn.RemoteEndPoint); } #endif break; // collection has been modified @@ -322,7 +322,7 @@ namespace Lidgren.Network // remove connection // m_connections.Remove(conn); - m_connectionLookup.Remove(conn.RemoteEndpoint); + m_connectionLookup.Remove(conn.RemoteEndPoint); break; // can't continue iteration here } } @@ -461,7 +461,7 @@ namespace Lidgren.Network msg.m_sequenceNumber = sequenceNumber; msg.m_receivedMessageType = tp; msg.m_senderConnection = sender; - msg.m_senderEndpoint = ipsender; + msg.m_senderEndPoint = ipsender; msg.m_bitLength = payloadBitLength; Buffer.BlockCopy(m_receiveBuffer, ptr, msg.m_data, 0, payloadByteLength); if (sender != null) @@ -509,7 +509,7 @@ namespace Lidgren.Network m_executeFlushSendQueue = true; } - internal void HandleIncomingDiscoveryRequest(double now, IPEndPoint senderEndpoint, int ptr, int payloadByteLength) + internal void HandleIncomingDiscoveryRequest(double now, IPEndPoint senderEndPoint, int ptr, int payloadByteLength) { if (m_configuration.IsMessageTypeEnabled(NetIncomingMessageType.DiscoveryRequest)) { @@ -518,12 +518,12 @@ namespace Lidgren.Network Buffer.BlockCopy(m_receiveBuffer, ptr, dm.m_data, 0, payloadByteLength); dm.m_receiveTime = now; dm.m_bitLength = payloadByteLength * 8; - dm.m_senderEndpoint = senderEndpoint; + dm.m_senderEndPoint = senderEndPoint; ReleaseMessage(dm); } } - internal void HandleIncomingDiscoveryResponse(double now, IPEndPoint senderEndpoint, int ptr, int payloadByteLength) + internal void HandleIncomingDiscoveryResponse(double now, IPEndPoint senderEndPoint, int ptr, int payloadByteLength) { if (m_configuration.IsMessageTypeEnabled(NetIncomingMessageType.DiscoveryResponse)) { @@ -532,15 +532,15 @@ namespace Lidgren.Network Buffer.BlockCopy(m_receiveBuffer, ptr, dr.m_data, 0, payloadByteLength); dr.m_receiveTime = now; dr.m_bitLength = payloadByteLength * 8; - dr.m_senderEndpoint = senderEndpoint; + dr.m_senderEndPoint = senderEndPoint; ReleaseMessage(dr); } } - private void ReceivedUnconnectedLibraryMessage(double now, IPEndPoint senderEndpoint, NetMessageType tp, int ptr, int payloadByteLength) + private void ReceivedUnconnectedLibraryMessage(double now, IPEndPoint senderEndPoint, NetMessageType tp, int ptr, int payloadByteLength) { NetConnection shake; - if (m_handshakes.TryGetValue(senderEndpoint, out shake)) + if (m_handshakes.TryGetValue(senderEndPoint, out shake)) { shake.ReceivedHandshake(now, tp, ptr, payloadByteLength); return; @@ -552,16 +552,16 @@ namespace Lidgren.Network switch (tp) { case NetMessageType.Discovery: - HandleIncomingDiscoveryRequest(now, senderEndpoint, ptr, payloadByteLength); + HandleIncomingDiscoveryRequest(now, senderEndPoint, ptr, payloadByteLength); return; case NetMessageType.DiscoveryResponse: - HandleIncomingDiscoveryResponse(now, senderEndpoint, ptr, payloadByteLength); + HandleIncomingDiscoveryResponse(now, senderEndPoint, ptr, payloadByteLength); return; case NetMessageType.NatIntroduction: HandleNatIntroduction(ptr); return; case NetMessageType.NatPunchMessage: - HandleNatPunch(ptr, senderEndpoint); + HandleNatPunch(ptr, senderEndPoint); return; case NetMessageType.ConnectResponse: @@ -569,7 +569,7 @@ namespace Lidgren.Network { foreach (var hs in m_handshakes) { - if (hs.Key.Address.Equals(senderEndpoint.Address)) + if (hs.Key.Address.Equals(senderEndPoint.Address)) { if (hs.Value.m_connectionInitiator) { @@ -582,11 +582,11 @@ namespace Lidgren.Network m_connectionLookup.Remove(hs.Key); m_handshakes.Remove(hs.Key); - LogDebug("Detected host port change; rerouting connection to " + senderEndpoint); - hsconn.MutateEndpoint(senderEndpoint); + LogDebug("Detected host port change; rerouting connection to " + senderEndPoint); + hsconn.MutateEndPoint(senderEndPoint); - m_connectionLookup.Add(senderEndpoint, hsconn); - m_handshakes.Add(senderEndpoint, hsconn); + m_connectionLookup.Add(senderEndPoint, hsconn); + m_handshakes.Add(senderEndPoint, hsconn); hsconn.ReceivedHandshake(now, tp, ptr, payloadByteLength); return; @@ -595,17 +595,17 @@ namespace Lidgren.Network } } - LogWarning("Received unhandled library message " + tp + " from " + senderEndpoint); + LogWarning("Received unhandled library message " + tp + " from " + senderEndPoint); return; case NetMessageType.Connect: // proceed break; case NetMessageType.Disconnect: // this is probably ok - LogVerbose("Received Disconnect from unconnected source: " + senderEndpoint); + LogVerbose("Received Disconnect from unconnected source: " + senderEndPoint); return; default: - LogWarning("Received unhandled library message " + tp + " from " + senderEndpoint); + LogWarning("Received unhandled library message " + tp + " from " + senderEndPoint); return; } @@ -617,14 +617,14 @@ namespace Lidgren.Network // server full NetOutgoingMessage full = CreateMessage("Server full"); full.m_messageType = NetMessageType.Disconnect; - SendLibrary(full, senderEndpoint); + SendLibrary(full, senderEndPoint); return; } // Ok, start handshake! - NetConnection conn = new NetConnection(this, senderEndpoint); + NetConnection conn = new NetConnection(this, senderEndPoint); conn.m_status = NetConnectionStatus.ReceivedInitiation; - m_handshakes.Add(senderEndpoint, conn); + m_handshakes.Add(senderEndPoint, conn); conn.ReceivedHandshake(now, tp, ptr, payloadByteLength); return; @@ -635,7 +635,7 @@ namespace Lidgren.Network // LogDebug("Accepted connection " + conn); conn.InitExpandMTU(NetTime.Now); - if (m_handshakes.Remove(conn.m_remoteEndpoint) == false) + if (m_handshakes.Remove(conn.m_remoteEndPoint) == false) LogWarning("AcceptConnection called but m_handshakes did not contain it!"); lock (m_connections) @@ -647,7 +647,7 @@ namespace Lidgren.Network else { m_connections.Add(conn); - m_connectionLookup.Add(conn.m_remoteEndpoint, conn); + m_connectionLookup.Add(conn.m_remoteEndPoint, conn); } } } diff --git a/Lidgren.Network/NetPeer.Send.cs b/Lidgren.Network/NetPeer.Send.cs index 5d4c7af..86e3323 100644 --- a/Lidgren.Network/NetPeer.Send.cs +++ b/Lidgren.Network/NetPeer.Send.cs @@ -217,7 +217,7 @@ namespace Lidgren.Network om.m_isFragment = false; om.m_receiveTime = NetTime.Now; om.m_senderConnection = null; - om.m_senderEndpoint = m_socket.LocalEndPoint as IPEndPoint; + om.m_senderEndPoint = m_socket.LocalEndPoint as IPEndPoint; om.m_bitLength = msg.LengthBits; ReleaseMessage(om); diff --git a/Lidgren.Network/NetPeer.cs b/Lidgren.Network/NetPeer.cs index 4cc57d4..5823c4c 100644 --- a/Lidgren.Network/NetPeer.cs +++ b/Lidgren.Network/NetPeer.cs @@ -240,29 +240,29 @@ namespace Lidgren.Network /// /// Create a connection to a remote endpoint /// - public NetConnection Connect(IPEndPoint remoteEndpoint) + public NetConnection Connect(IPEndPoint remoteEndPoint) { - return Connect(remoteEndpoint, null); + return Connect(remoteEndPoint, null); } /// /// Create a connection to a remote endpoint /// - public virtual NetConnection Connect(IPEndPoint remoteEndpoint, NetOutgoingMessage hailMessage) + public virtual NetConnection Connect(IPEndPoint remoteEndPoint, NetOutgoingMessage hailMessage) { - if (remoteEndpoint == null) - throw new ArgumentNullException("remoteEndpoint"); + if (remoteEndPoint == null) + throw new ArgumentNullException("remoteEndPoint"); lock (m_connections) { if (m_status == NetPeerStatus.NotRunning) throw new NetException("Must call Start() first"); - if (m_connectionLookup.ContainsKey(remoteEndpoint)) + if (m_connectionLookup.ContainsKey(remoteEndPoint)) throw new NetException("Already connected to that endpoint!"); NetConnection hs; - if (m_handshakes.TryGetValue(remoteEndpoint, out hs)) + if (m_handshakes.TryGetValue(remoteEndPoint, out hs)) { // already trying to connect to that endpoint; make another try switch (hs.m_status) @@ -283,7 +283,7 @@ namespace Lidgren.Network return hs; } - NetConnection conn = new NetConnection(this, remoteEndpoint); + NetConnection conn = new NetConnection(this, remoteEndPoint); conn.m_status = NetConnectionStatus.InitiatedConnect; conn.m_localHailMessage = hailMessage; @@ -291,7 +291,7 @@ namespace Lidgren.Network conn.m_connectRequested = true; conn.m_connectionInitiator = true; - m_handshakes.Add(remoteEndpoint, conn); + m_handshakes.Add(remoteEndPoint, conn); return conn; } diff --git a/Lidgren.Network/NetUtility.cs b/Lidgren.Network/NetUtility.cs index b8dd5bf..8b4d292 100644 --- a/Lidgren.Network/NetUtility.cs +++ b/Lidgren.Network/NetUtility.cs @@ -34,7 +34,7 @@ namespace Lidgren.Network /// public static class NetUtility { - public delegate void ResolveEndPointCallback(IPEndPoint endpoint); + public delegate void ResolveEndPointCallback(IPEndPoint endPoint); public delegate void ResolveAddressCallback(IPAddress adr); /// @@ -371,11 +371,11 @@ namespace Lidgren.Network /// /// Returns true if the IPEndPoint supplied is on the same subnet as this host /// - public static bool IsLocal(IPEndPoint endpoint) + public static bool IsLocal(IPEndPoint endPoint) { - if (endpoint == null) + if (endPoint == null) return false; - return IsLocal(endpoint.Address); + return IsLocal(endPoint.Address); } /// diff --git a/Samples/LibraryTestSamples/DurableSample/DurableClient/DurableClient.csproj b/Samples/LibraryTestSamples/DurableSample/DurableClient/DurableClient.csproj index b365130..bd893ed 100644 --- a/Samples/LibraryTestSamples/DurableSample/DurableClient/DurableClient.csproj +++ b/Samples/LibraryTestSamples/DurableSample/DurableClient/DurableClient.csproj @@ -72,8 +72,8 @@ {49BA1C69-6104-41AC-A5D8-B54FA9F696E8} Lidgren.Network - - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21} + + {773069DA-B66E-4667-ADCB-0D215AD8CF3E} SamplesCommon diff --git a/Samples/LibraryTestSamples/DurableSample/DurableClient/Program.cs b/Samples/LibraryTestSamples/DurableSample/DurableClient/Program.cs index 1cc8de3..84a569a 100644 --- a/Samples/LibraryTestSamples/DurableSample/DurableClient/Program.cs +++ b/Samples/LibraryTestSamples/DurableSample/DurableClient/Program.cs @@ -67,10 +67,10 @@ namespace DurableClient Display("Received data?!"); break; case NetIncomingMessageType.DiscoveryResponse: - Display("Got discovery response from " + msg.SenderEndpoint); + Display("Got discovery response from " + msg.SenderEndPoint); NetOutgoingMessage approval = Client.CreateMessage(); approval.Write("durableschmurable"); - Client.Connect(msg.SenderEndpoint, approval); + Client.Connect(msg.SenderEndPoint, approval); break; case NetIncomingMessageType.StatusChanged: diff --git a/Samples/LibraryTestSamples/DurableSample/DurableSample.sln b/Samples/LibraryTestSamples/DurableSample/DurableSample.sln index a7c57ab..ff85476 100644 --- a/Samples/LibraryTestSamples/DurableSample/DurableSample.sln +++ b/Samples/LibraryTestSamples/DurableSample/DurableSample.sln @@ -5,10 +5,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableClient", "DurableCli EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableServer", "DurableServer\DurableServer.csproj", "{5825BF6B-B344-4B00-8A25-95A42B89F7F9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj", "{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\..\..\Lidgren.Network\Lidgren.Network.csproj", "{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "..\..\SamplesCommon\SamplesCommon.csproj", "{773069DA-B66E-4667-ADCB-0D215AD8CF3E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,16 +39,6 @@ Global {5825BF6B-B344-4B00-8A25-95A42B89F7F9}.Release|Mixed Platforms.Build.0 = Release|x86 {5825BF6B-B344-4B00-8A25-95A42B89F7F9}.Release|x86.ActiveCfg = Release|x86 {5825BF6B-B344-4B00-8A25-95A42B89F7F9}.Release|x86.Build.0 = Release|x86 - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|x86.ActiveCfg = Debug|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Any CPU.Build.0 = Release|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|x86.ActiveCfg = Release|Any CPU {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -59,6 +49,16 @@ Global {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|x86.ActiveCfg = Release|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|x86.ActiveCfg = Debug|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.Build.0 = Release|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/LibraryTestSamples/DurableSample/DurableSample.suo b/Samples/LibraryTestSamples/DurableSample/DurableSample.suo index b5bdcc6..148de6d 100644 Binary files a/Samples/LibraryTestSamples/DurableSample/DurableSample.suo and b/Samples/LibraryTestSamples/DurableSample/DurableSample.suo differ diff --git a/Samples/LibraryTestSamples/DurableSample/DurableServer/DurableServer.csproj b/Samples/LibraryTestSamples/DurableSample/DurableServer/DurableServer.csproj index e6e3cad..c4671ea 100644 --- a/Samples/LibraryTestSamples/DurableSample/DurableServer/DurableServer.csproj +++ b/Samples/LibraryTestSamples/DurableSample/DurableServer/DurableServer.csproj @@ -72,8 +72,8 @@ {49BA1C69-6104-41AC-A5D8-B54FA9F696E8} Lidgren.Network - - {64D2482A-3C16-4D1F-A3F6-058FC3D73E21} + + {773069DA-B66E-4667-ADCB-0D215AD8CF3E} SamplesCommon diff --git a/Samples/LibraryTestSamples/DurableSample/DurableServer/Program.cs b/Samples/LibraryTestSamples/DurableSample/DurableServer/Program.cs index a20e15a..533005b 100644 --- a/Samples/LibraryTestSamples/DurableSample/DurableServer/Program.cs +++ b/Samples/LibraryTestSamples/DurableSample/DurableServer/Program.cs @@ -79,7 +79,7 @@ namespace DurableServer break; case NetIncomingMessageType.DiscoveryRequest: // just send a no-info response - Server.SendDiscoveryResponse(null, msg.SenderEndpoint); + Server.SendDiscoveryResponse(null, msg.SenderEndPoint); break; case NetIncomingMessageType.ConnectionApproval: string ok = msg.ReadString();