- some initial changes to try to get ftp working over the Internet with firewalls etc

source/shared_lib/include/platform/posix/socket.h

@@ -21,6 +21,7 @@
 #include <vector>
 #include "base_thread.h"
 #include "simple_threads.h"
+#include "types.h"
 
 using std::string;
 
@@ -49,6 +50,10 @@ using namespace Shared::PlatformCommon;
 
 namespace Shared{ namespace Platform {
 
+
+void AddUPNPPortForward(int internalPort, int externalPort);
+void RemoveUPNPPortForward(int internalPort, int externalPort);
+
 //
 // This interface describes the methods a callback object must implement
 // when signaled with detected servers
@@ -99,6 +104,7 @@ protected:
 	time_t lastDebugEvent;
 	static int broadcast_portno;
 	std::string ipAddress;
+	std::string connectedIpAddress;
 
 	SimpleTaskThread *pingThread;
 	std::map<string,double> pingCache;
@@ -149,6 +155,8 @@ public:
 	virtual std::string getIpAddress();
 	virtual void setIpAddress(std::string value) { ipAddress = value; }
 
+	uint32 getConnectedIPAddress(string IP="");
+
 	static bool isUPNP;
 
 protected:
@@ -219,6 +227,10 @@ public:
 
     void NETdiscoverUPnPDevices();
 
+    static bool enabledUPNP;
+    static bool upnp_add_redirect(int ports[2]);
+    static void upnp_rem_redirect(int ext_port);
+
 protected:
 
 	bool portBound;
@@ -227,15 +239,11 @@ protected:
 	static int externalPort;
 	static int ftpServerPort;
 
-	static bool enabledUPNP;
-
 	BroadCastSocketThread *broadCastThread;
 	void startBroadCastThread();
 	bool isBroadCastThreadRunning();
 
     static int upnp_init(void *param);
-    static bool upnp_add_redirect(int ports[4]);
-    static void upnp_rem_redirect(int ext_port);
 
     void NETaddRedirects(int ports[4]);
     void NETremRedirects(int ext_port);