mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-08 09:26:27 +02:00
Code Issues Projects Releases Wiki Activity

- plenty of code cleanup (some refactoring of socket / UPNP code)

Browse Source 
- FTP console output now only shows when --verbose used
This commit is contained in:
Mark Vejvoda
2010-12-31 08:21:26 +00:00
parent bd12b10e29
commit d176053da9
12 changed files with 198 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/shared_lib/include/platform/posix/socket.h
View File

@@ -51,8 +51,11 @@ using namespace Shared::PlatformCommon;
namespace Shared{ namespace Platform {
void AddUPNPPortForward(int internalPort, int externalPort);
void RemoveUPNPPortForward(int internalPort, int externalPort);
// The callback Interface used by the UPNP discovery process
class UPNPInitInterface {
public:
virtual void UPNPInitStatus(bool result) = 0;
};
//
// This interface describes the methods a callback object must implement
@@ -157,8 +160,6 @@ public:
uint32 getConnectedIPAddress(string IP="");
static bool isUPNP;
protected:
static void throwException(string str);
};
@@ -204,7 +205,21 @@ public:
// =====================================================
// class ServerSocket
// =====================================================
class ServerSocket: public Socket{
class ServerSocket: public Socket, public UPNPInitInterface {
protected:
bool portBound;
int boundPort;
static int externalPort;
static int ftpServerPort;
SDL_Thread *upnpdiscoverThread;
virtual void UPNPInitStatus(bool result);
BroadCastSocketThread *broadCastThread;
void startBroadCastThread();
bool isBroadCastThreadRunning();
public:
ServerSocket();
virtual ~ServerSocket();
@@ -226,27 +241,28 @@ public:
virtual void disconnectSocket();
void NETdiscoverUPnPDevices();
};
// =====================================================
// class UPNP_Tools
// =====================================================
class UPNP_Tools {
public:
static bool isUPNP;
static bool enabledUPNP;
static bool upnp_add_redirect(int ports[2]);
static void upnp_rem_redirect(int ext_port);
protected:
bool portBound;
int boundPort;
static int externalPort;
static int ftpServerPort;
BroadCastSocketThread *broadCastThread;
void startBroadCastThread();
bool isBroadCastThreadRunning();
static int upnp_init(void *param);
void NETaddRedirects(int ports[4]);
void NETremRedirects(int ext_port);
static bool upnp_add_redirect(int ports[2]);
static void upnp_rem_redirect(int ext_port);
static void NETaddRedirects(int ports[4]);
static void NETremRedirects(int ext_port);
static void AddUPNPPortForward(int internalPort, int externalPort);
static void RemoveUPNPPortForward(int internalPort, int externalPort);
};
}}//end namespace