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

Merge pull request #11382 from skyfloogle/traversal-fix-2

Browse Source 
Traversal: Use low TTL for probe packet
This commit is contained in:
Mai
2023-11-30 18:03:50 -05:00
committed by GitHub
parent d67f54b175 5c1c22bab9
commit d85cb749c0
13 changed files with 284 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -1591,14 +1591,16 @@ bool MainWindow::NetPlayHost(const UICommon::GameFile& game)
const std::string traversal_host = Config::Get(Config::NETPLAY_TRAVERSAL_SERVER);
const u16 traversal_port = Config::Get(Config::NETPLAY_TRAVERSAL_PORT);
const u16 traversal_port_alt = Config::Get(Config::NETPLAY_TRAVERSAL_PORT_ALT);
if (is_traversal)
host_port = Config::Get(Config::NETPLAY_LISTEN_PORT);
// Create Server
Settings::Instance().ResetNetPlayServer(new NetPlay::NetPlayServer(
host_port, use_upnp, m_netplay_dialog,
NetPlay::NetTraversalConfig{is_traversal, traversal_host, traversal_port}));
Settings::Instance().ResetNetPlayServer(
new NetPlay::NetPlayServer(host_port, use_upnp, m_netplay_dialog,
NetPlay::NetTraversalConfig{is_traversal, traversal_host,
traversal_port, traversal_port_alt}));
if (!Settings::Instance().GetNetPlayServer()->is_connected)
{

5
Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
View File

@ -1039,6 +1039,11 @@ void NetPlayDialog::OnGolferChanged(const bool is_golfer, const std::string& gol
DisplayMessage(tr("%1 is now golfing").arg(QString::fromStdString(golfer_name)), "");
}
void NetPlayDialog::OnTtlDetermined(u8 ttl)
{
DisplayMessage(tr("Using TTL %1 for probe packet").arg(QString::number(ttl)), "");
}
bool NetPlayDialog::IsRecording()
{
std::optional<bool> is_recording = RunOnObject(m_record_input_action, &QAction::isChecked);

1
Source/Core/DolphinQt/NetPlay/NetPlayDialog.h
View File

@ -71,6 +71,7 @@ public:
void OnTraversalStateChanged(Common::TraversalClient::State state) override;
void OnGameStartAborted() override;
void OnGolferChanged(bool is_golfer, const std::string& golfer_name) override;
void OnTtlDetermined(u8 ttl) override;
void OnIndexAdded(bool success, const std::string error) override;
void OnIndexRefreshFailed(const std::string error) override;