mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-17 07:49:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved Traversal Client code over from old netplay

Browse source 
Moved over gui code for copying host code
added gui to netplay diag setup to switch between direct and traversal connection
This commit is contained in:
Ziek 2015-02-02 01:56:53 -08:00
commit 4cdc307b87
12 changed files with 1240 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Core/Core/NetPlayServer.h
View file

@ -9,18 +9,20 @@
#include <sstream>
#include <unordered_set>
#include "enet/enet.h"
#include "Common/Thread.h"
#include "Common/TraversalClient.h"
#include "Common/Timer.h"
#include "Core/NetPlayProto.h"
#include <SFML/Network/Packet.hpp>
class NetPlayServer
class NetPlayUI;
class NetPlayServer : public TraversalClientClient
{
public:
void ThreadFunc();
NetPlayServer(const u16 port);
NetPlayServer(const u16 port, bool traversal);
~NetPlayServer();
bool ChangeGame(const std::string& game);
@ -42,6 +44,10 @@ public:
u16 GetPort();
void SetNetPlayUI(NetPlayUI* dialog);
std::unordered_set<std::string> GetInterfaceSet();
std::string GetInterfaceHost(const std::string inter);
bool is_connected;
#ifdef USE_UPNP
@ -71,8 +77,12 @@ private:
unsigned int OnConnect(ENetPeer* socket);
unsigned int OnDisconnect(Client& player);
unsigned int OnData(sf::Packet& packet, Client& player);
virtual void OnTraversalStateChanged();
virtual void OnConnectReady(ENetAddress addr) {}
virtual void OnConnectFailed(u8 reason) {}
void UpdatePadMapping();
void UpdateWiimoteMapping();
std::vector<std::pair<std::string, std::string>> GetInterfaceListInternal();
NetSettings m_settings;
@ -99,6 +109,8 @@ private:
std::thread m_thread;
ENetHost* m_server;
TraversalClient* m_traversal_client;
NetPlayUI* m_dialog;
#ifdef USE_UPNP
static void mapPortThread(const u16 port);