Net, Dht and Configuration changes.

* set PortForward in NetStateBox when the Network has been setup.
 * add GeneralConfig to rsConfig external interface.
 * enabled ADVANCED configuration option.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4500 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/pqi/p3netmgr.cc

@@ -1779,6 +1779,13 @@ void p3NetMgrIMPL::updateNetStateBox_startup()
 #endif
 			mNetStateBox.setAddressWebIP(false, &tmpip);
 		}
+
+
+		/* finally - if the user has set Forwarded, pass it on */
+		if (mNetMode & RS_NET_MODE_TRY_EXT)
+		{
+			mNetStateBox.setPortForwarded(true, 0); // Port unknown for now.
+		}
 	}
 }
 

libretroshare/src/pqi/pqinetstatebox.cc

@@ -105,6 +105,19 @@ void pqiNetStateBox::setAddressWebIP(bool active, struct sockaddr_in *addr)
 }
 
 
+void pqiNetStateBox::setPortForwarded(bool active, uint16_t port)
+{
+	if ((!mPortForwardSet) || (mPortForwarded != port))
+
+	{
+		mPortForwardSet = true;
+		mPortForwarded = port;
+
+		mStatusOkay = false;
+	}
+}
+
+
 void pqiNetStateBox::setDhtState(bool on, bool active)
 {
 	if ((!mDhtSet) || (mDhtActive != active) || (mDhtOn != on))
@@ -197,8 +210,8 @@ void pqiNetStateBox::reset()
 	mWebIPActive = false;
 	//struct sockaddr_in mWebIPAddr;
 
-	mPortForwardedSet = false;
+	mPortForwardSet = false;
-	mPortForwarded = 0;
+	mPortForwarded = false;
 	
 	mDhtSet = false;
 	mDhtActive = false;
@@ -412,7 +425,7 @@ void pqiNetStateBox::determineNetworkState()
 	
 					//mExtAddrStable = true;
 				}
-				else if (mPortForwardedSet)
+				else if (mPortForwardSet)
 				{
 					mNetworkMode = RSNET_NETWORK_BEHINDNAT;
 					// Use Fallback Guess.
@@ -476,7 +489,7 @@ void pqiNetStateBox::determineNetworkState()
 				//mExtAddrStable = true;
 				mNetStateMode = RSNET_NETSTATE_WARNING_NODHT;
 			}
-			else if (mPortForwardedSet)
+			else if (mPortForwardSet)
 			{
 				mNetworkMode = RSNET_NETWORK_BEHINDNAT;
 				mNatTypeMode = RSNET_NATTYPE_UNKNOWN;

libretroshare/src/pqi/pqinetstatebox.h

@@ -28,6 +28,8 @@ class pqiNetStateBox
 	void setAddressNatPMP(bool active, struct sockaddr_in *addr);
 	void setAddressWebIP(bool active, struct sockaddr_in *addr);
 
+	void setPortForwarded(bool active, uint16_t port);
+
 	void setDhtState(bool dhtOn, bool dhtActive);
 
 	uint32_t getNetStateMode();
@@ -89,7 +91,7 @@ class pqiNetStateBox
 	bool mWebIPActive;
 	time_t mWebIPTS;
 
-	bool mPortForwardedSet;
+	bool mPortForwardSet;
 	uint16_t  mPortForwarded;
 };
 

libretroshare/src/retroshare/rsconfig.h

@@ -112,7 +112,8 @@ extern RsServerConfig *rsConfig;
 
 
 
-
+// Must Match up with strings internal to Retroshare.
+#define RS_CONFIG_ADVANCED		0x0101
 
 
 class RsConfigStartup
@@ -236,6 +237,9 @@ virtual uint32_t getNatTypeMode() = 0;
 virtual uint32_t getNatHoleMode() = 0;
 virtual uint32_t getConnectModes() = 0;
 
+virtual bool getConfigurationOption(uint32_t key, std::string &opt) = 0;
+virtual bool setConfigurationOption(uint32_t key, const std::string &opt) = 0;
+
 
 };
 

libretroshare/src/rsserver/p3serverconfig.cc

@@ -28,13 +28,15 @@
 RsServerConfig *rsConfig = NULL;
 
 
-p3ServerConfig::p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr *netMgr)
+p3ServerConfig::p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr *netMgr, p3GeneralConfig *genCfg)
 :configMtx("p3ServerConfig")
 {
 	mPeerMgr = peerMgr;
 	mLinkMgr = linkMgr;
 	mNetMgr = netMgr;
 
+	mGeneralConfig = genCfg;
+
 	mUserLevel = RSCONFIG_USER_LEVEL_NEW; /* START LEVEL */
 
 	rsConfig = this;
@@ -46,6 +48,53 @@ p3ServerConfig::~p3ServerConfig()
 	return; 
 }
 
+
+#define RS_CONFIG_ADVANCED_STRING 	"AdvMode"
+
+bool p3ServerConfig::findConfigurationOption(uint32_t key, std::string &keystr)
+{
+	bool found = false;
+	switch(key)
+	{
+		case RS_CONFIG_ADVANCED:
+			keystr = RS_CONFIG_ADVANCED_STRING;
+			found = true;
+			break;
+	}
+	return found;
+}
+
+
+bool p3ServerConfig::getConfigurationOption(uint32_t key, std::string &opt)
+{
+	std::string strkey;
+	if (!findConfigurationOption(key, strkey))
+	{
+		std::cerr << "p3ServerConfig::getConfigurationOption() OPTION NOT VALID: " << key;
+		std::cerr << std::endl;
+		return false;
+	}
+
+	opt = mGeneralConfig->getSetting(strkey);
+	return true;
+}
+
+		
+bool p3ServerConfig::setConfigurationOption(uint32_t key, const std::string &opt)
+{
+	std::string strkey;
+	if (!findConfigurationOption(key, strkey))
+	{
+		std::cerr << "p3ServerConfig::setConfigurationOption() OPTION NOT VALID: " << key;
+		std::cerr << std::endl;
+		return false;
+	}
+
+	mGeneralConfig->setSetting(strkey, opt);
+	return true;
+}
+
+
 	/* From RsIface::RsConfig */
 
 int 	p3ServerConfig::getConfigNetStatus(RsConfigNetStatus &status)

libretroshare/src/rsserver/p3serverconfig.h

@@ -31,12 +31,18 @@
 #include "pqi/p3peermgr.h"
 #include "pqi/p3linkmgr.h"
 #include "pqi/p3netmgr.h"
+#include "pqi/p3cfgmgr.h"
+
+
+#define RS_CONFIG_ADVANCED_STRING       "AdvMode"
+
+
 
 class p3ServerConfig: public RsServerConfig
 {
 	public:
 
-	p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr *netMgr);
+	p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr *netMgr, p3GeneralConfig *genCfg);
 virtual ~p3ServerConfig();
 
 	/* From RsIface::RsConfig */
@@ -70,13 +76,19 @@ virtual uint32_t getNatTypeMode();
 virtual uint32_t getNatHoleMode();
 virtual uint32_t getConnectModes();
 
+virtual bool getConfigurationOption(uint32_t key, std::string &opt);
+virtual bool setConfigurationOption(uint32_t key, const std::string &opt);
+
 /********************* ABOVE is RsConfig Interface *******/
 
 	private:
 
+bool findConfigurationOption(uint32_t key, std::string &keystr);
+
 	p3PeerMgr *mPeerMgr;
 	p3LinkMgr *mLinkMgr;
 	p3NetMgr  *mNetMgr;
+	p3GeneralConfig *mGeneralConfig;
 
 	RsMutex configMtx;
 	uint32_t mUserLevel; // store last one... will later be a config Item too.

libretroshare/src/rsserver/rsinit.cc

@@ -2302,7 +2302,7 @@ int RsServer::StartupRetroShare()
 
 	rsPeers = new p3Peers(mLinkMgr, mPeerMgr, mNetMgr);
 	rsDisc  = new p3Discovery(ad);
-	rsConfig = new p3ServerConfig(mPeerMgr, mLinkMgr, mNetMgr);
+	rsConfig = new p3ServerConfig(mPeerMgr, mLinkMgr, mNetMgr, mGeneralConfig);
 
 #ifndef MINIMAL_LIBRS
 	rsMsgs  = new p3Msgs(msgSrv, chatSrv);