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

Merge pull request #2876 from CastellaFactory/master

Browse Source 
[Netplay] Add "Force Netplay Listen Port" feature that was in old netplay branch
This commit is contained in:
Markus Wick
2015-12-02 14:20:47 +01:00
parent b0dbb6ef46 7ddfe713d5
commit ec6a48ff76
5 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,17 +320,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
@ -343,7 +345,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;
}