davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-17 23:56:30 +09:00
Code Issues Releases Activity

Merge pull request #28 from MichaelDePiazzi/upnp-timeout

Browse Source 
UPnP discovery timeout
This commit is contained in:
lidgren
2015-07-27 10:30:20 +02:00
parent 1a8da2e00c 1560ba75d8
commit 2a0027ec91
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,6 +389,9 @@ namespace Lidgren.Network
} }
} }
if (m_upnp != null)
m_upnp.CheckForDiscoveryTimeout();
// //
// read from socket // read from socket
// //

15
Lidgren.Network/NetUPnP.cs
View File

@@ -71,6 +71,7 @@ namespace Lidgren.Network
"MAN:\"ssdp:discover\"\r\n" + "MAN:\"ssdp:discover\"\r\n" +
"MX:3\r\n\r\n"; "MX:3\r\n\r\n";
m_discoveryResponseDeadline = NetTime.Now + 6.0; // arbitrarily chosen number, router gets 6 seconds to respond
m_status = UPnPStatus.Discovering; m_status = UPnPStatus.Discovering;
byte[] arr = System.Text.Encoding.UTF8.GetBytes(str); byte[] arr = System.Text.Encoding.UTF8.GetBytes(str);
@@ -79,14 +80,16 @@ namespace Lidgren.Network
peer.Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true); peer.Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true);
peer.RawSend(arr, 0, arr.Length, new NetEndPoint(NetUtility.GetBroadcastAddress(), 1900)); peer.RawSend(arr, 0, arr.Length, new NetEndPoint(NetUtility.GetBroadcastAddress(), 1900));
peer.Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, false); peer.Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, false);
// allow some extra time for router to respond
NetUtility.Sleep(50);
m_discoveryResponseDeadline = NetTime.Now + 6.0; // arbitrarily chosen number, router gets 6 seconds to respond
m_status = UPnPStatus.Discovering;
} }
internal void CheckForDiscoveryTimeout()
{
if ((m_status != UPnPStatus.Discovering) || (NetTime.Now < m_discoveryResponseDeadline))
return;
m_peer.LogDebug("UPnP discovery timed out");
m_status = UPnPStatus.NotAvailable;
}
internal void ExtractServiceUrl(string resp) internal void ExtractServiceUrl(string resp)
{ {
#if !DEBUG #if !DEBUG