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

- added ftp port # as an ini setting and added to UPNP for router auto-config

Browse Source 
- added new language string for message box to prompt map file downloads
This commit is contained in:
Mark Vejvoda
2010-12-29 20:28:25 +00:00
parent be9d8859d4
commit 4fb1b1092f
13 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/feathery_ftp/ftp.h
View File

@@ -178,7 +178,7 @@ extern int ftpSend(socket_t s, const void *data, int len);
extern int ftpReceive(socket_t s, void *data, int len);
extern socket_t ftpEstablishDataConnection(int passive, ip_t *ip, port_t *port);
extern socket_t ftpAcceptDataConnection(socket_t listner);
extern socket_t ftpCreateServerSocket(void);
extern socket_t ftpCreateServerSocket(int portNumber);
extern socket_t ftpAcceptServerConnection(socket_t server, ip_t *remoteIP, port_t *remotePort);
extern int ftpTrackSocket(socket_t s);
extern int ftpUntrackSocket(socket_t s);

2
source/shared_lib/include/feathery_ftp/ftpIfc.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
int ftpCreateAccount(const char* name, const char* passw, const char* root, int accRights);
int ftpStart(void);
int ftpStart(int portNumber);
int ftpShutdown(void);
void ftpExecute(void);
int ftpState(void);

3
source/shared_lib/include/platform/posix/miniftpclient.h
View File

@@ -39,6 +39,7 @@ public:
class FTPClientThread : public BaseThread
{
protected:
int portNumber;
string serverUrl;
FTPClientCallbackInterface *pCBObject;
std::pair<string,string> mapsPath;
@@ -49,7 +50,7 @@ protected:
public:
FTPClientThread(string serverUrl, std::pair<string,string> mapsPath, FTPClientCallbackInterface *pCBObject);
FTPClientThread(int portNumber,string serverUrl, std::pair<string,string> mapsPath, FTPClientCallbackInterface *pCBObject);
virtual void execute();
virtual void signalQuit();
virtual bool shutdownAndWait();

3
source/shared_lib/include/platform/posix/miniftpserver.h
View File

@@ -30,10 +30,11 @@ class FTPServerThread : public BaseThread
{
protected:
std::pair<string,string> mapsPath;
int portNumber;
public:
FTPServerThread(std::pair<string,string> mapsPath);
FTPServerThread(std::pair<string,string> mapsPath, int portNumber);
virtual void execute();
virtual void signalQuit();
virtual bool shutdownAndWait();

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

@@ -212,6 +212,9 @@ public:
static void setExternalPort(int port) { externalPort = port; }
static int getExternalPort() { return externalPort; }
static void setFTPServerPort(int port) { ftpServerPort = port; }
static int getFTPServerPort() { return ftpServerPort; }
virtual void disconnectSocket();
void NETdiscoverUPnPDevices();
@@ -222,6 +225,7 @@ protected:
int boundPort;
static int externalPort;
static int ftpServerPort;
static bool enabledUPNP;
@@ -230,10 +234,10 @@ protected:
bool isBroadCastThreadRunning();
static int upnp_init(void *param);
static bool upnp_add_redirect(int ports[2]);
static bool upnp_add_redirect(int ports[4]);
static void upnp_rem_redirect(int ext_port);
void NETaddRedirects(int ports[2]);
void NETaddRedirects(int ports[4]);
void NETremRedirects(int ext_port);
};