Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5898 from ligfx/extractupnp

Browse Source 
Common: extract UPnP namespace from NetPlayServer
This commit is contained in:
Leo Lam
2017-08-17 03:11:41 +08:00
committed by GitHub
parent 70931f460d 8702ffccc3
commit a53b01360c
13 changed files with 256 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/NetPlay/NetPlayLauncher.cpp
+8 -15
View File
@@ -23,8 +23,9 @@ bool NetPlayLauncher::Host(const NetPlayHostConfig& config)
return false;
}
netplay_server = new NetPlayServer(config.listen_port, config.use_traversal,
config.traversal_host, config.traversal_port);
netplay_server = new NetPlayServer(
config.listen_port, config.forward_port,
NetTraversalConfig{config.use_traversal, config.traversal_host, config.traversal_port});
if (!netplay_server->is_connected)
{
@@ -35,19 +36,11 @@ bool NetPlayLauncher::Host(const NetPlayHostConfig& config)
netplay_server->ChangeGame(config.game_name);
#ifdef USE_UPNP
if (config.forward_port)
{
netplay_server->TryPortmapping(config.listen_port);
}
#endif
npd = new NetPlayDialog(config.parent_window, config.game_list_ctrl, config.game_name, true);
NetPlayClient*& netplay_client = NetPlayDialog::GetNetPlayClient();
netplay_client =
new NetPlayClient("127.0.0.1", netplay_server->GetPort(), npd, config.player_name, false,
config.traversal_host, config.traversal_port);
netplay_client = new NetPlayClient("127.0.0.1", netplay_server->GetPort(), npd,
config.player_name, NetTraversalConfig{});
if (netplay_client->IsConnected())
{
@@ -76,9 +69,9 @@ bool NetPlayLauncher::Join(const NetPlayJoinConfig& config)
else
host = config.connect_host;
netplay_client =
new NetPlayClient(host, config.connect_port, npd, config.player_name, config.use_traversal,
config.traversal_host, config.traversal_port);
netplay_client = new NetPlayClient(
host, config.connect_port, npd, config.player_name,
NetTraversalConfig{config.use_traversal, config.traversal_host, config.traversal_port});
if (netplay_client->IsConnected())
{
npd->SetSize(config.window_pos);
Source/Core/DolphinWX/NetPlay/NetPlayLauncher.h
+1 -3
View File
@@ -34,9 +34,7 @@ public:
std::string game_name;
u16 listen_port = 0;
#ifdef USE_UPNP
bool forward_port;
#endif
bool forward_port = false;
};
class NetPlayJoinConfig : public NetPlayLaunchConfig