piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Netplay:Traversal] Add "Force Netplay Listen Port" feature that was in old netplay branch

Browse Source
This commit is contained in:
CastellaFactory
2015-09-20 20:08:37 +09:00
parent 63c373c843
commit 1f83a3d146
5 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Common/TraversalClient.cpp
View File

@ -318,17 +318,19 @@ std::unique_ptr<ENetHost> g_MainNetHost;
// need to know not just what port it's on, but whether it was
// explicitly requested.
static std::string g_OldServer;
static u16 g_OldPort;
static u16 g_OldServerPort;
static u16 g_OldListenPort;
bool EnsureTraversalClient(const std::string& server, u16 port)
bool EnsureTraversalClient(const std::string& server, u16 server_port, u16 listen_port)
{
if (!g_MainNetHost || !g_TraversalClient || server != g_OldServer || port != g_OldPort)
if (!g_MainNetHost || !g_TraversalClient || server != g_OldServer || server_port != g_OldServerPort || listen_port != g_OldListenPort)
{
g_OldServer = server;
g_OldPort = port ;
g_OldServerPort = server_port;
g_OldListenPort = listen_port;
ENetAddress addr = { ENET_HOST_ANY, 0 };
ENetAddress addr = { ENET_HOST_ANY, listen_port };
ENetHost* host = enet_host_create(
&addr, // address
50, // peerCount
@ -341,7 +343,7 @@ bool EnsureTraversalClient(const std::string& server, u16 port)
return false;
}
g_MainNetHost.reset(host);
g_TraversalClient.reset(new TraversalClient(g_MainNetHost.get(), server, port));
g_TraversalClient.reset(new TraversalClient(g_MainNetHost.get(), server, server_port));
}
return true;
}