Added RsConfig class which will in the future support most of the interface from rsinit.h & rsiface.h

* Moved rsnetwork.h => rsconfig.h
 * Implemented Network functions (call p3NetMgr) in RsConfig.
 * Implemented UserLevel (New/Basic/Casual/Power) Levels
 * added p3PeerMgr::haveOnceConnected() function, for UserLevel support.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4431 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/rsserver/p3serverconfig.cc

@@ -0,0 +1,208 @@
+/*
+ * libretroshare/src/rsserver: p3serverconfig.h
+ *
+ * RetroShare C++ Interface.
+ *
+ * Copyright 2011-2011 by Robert Fernie.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+#include "rsserver/p3serverconfig.h"
+
+RsServerConfig *rsConfig = NULL;
+
+
+p3ServerConfig::p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr *netMgr)
+:configMtx("p3ServerConfig")
+{
+	mPeerMgr = peerMgr;
+	mLinkMgr = linkMgr;
+	mNetMgr = netMgr;
+
+	mUserLevel = RSCONFIG_USER_LEVEL_NEW; /* START LEVEL */
+
+	rsConfig = this;
+}
+
+
+p3ServerConfig::~p3ServerConfig() 
+{ 
+	return; 
+}
+
+	/* From RsIface::RsConfig */
+
+int 	p3ServerConfig::getConfigNetStatus(RsConfigNetStatus &status)
+{
+	return 0;
+}
+
+int 	p3ServerConfig::getConfigStartup(RsConfigStartup &params)
+{
+	return 0;
+}
+
+int 	p3ServerConfig::getConfigDataRates(RsConfigDataRates &params) 
+{
+	return 0;
+}
+
+
+	/* From RsInit */
+
+std::string      p3ServerConfig::RsConfigDirectory()
+{
+	return std::string();
+}
+
+std::string      p3ServerConfig::RsConfigKeysDirectory()
+{
+	return std::string();
+}
+
+
+std::string  p3ServerConfig::RsProfileConfigDirectory()
+{
+	return std::string();
+}
+
+bool         p3ServerConfig::getStartMinimised()
+{
+	return 0;
+}
+
+std::string  p3ServerConfig::getRetroShareLink()
+{
+	return std::string();
+}
+
+
+bool p3ServerConfig::getAutoLogin()
+{
+	return 0;
+}
+
+void p3ServerConfig::setAutoLogin(bool autoLogin)
+{
+	return;
+}
+
+bool p3ServerConfig::RsClearAutoLogin()
+{
+	return 0;
+}
+
+
+std::string p3ServerConfig::getRetroshareDataDirectory()
+{
+	return std::string();
+}
+
+	/* New Stuff */
+
+uint32_t p3ServerConfig::getUserLevel()
+{
+	uint32_t userLevel = RSCONFIG_USER_LEVEL_NEW;
+	{
+		RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
+		uint32_t userLevel = mUserLevel;
+	}
+
+	switch(userLevel)
+	{
+                case RSCONFIG_USER_LEVEL_OVERRIDE:
+			break;
+
+#define MIN_BASIC_FRIENDS 2
+			
+		// FALL THROUGH EVERYTHING.
+		default:
+		case RSCONFIG_USER_LEVEL_NEW:
+		{
+
+			if (mLinkMgr->getFriendCount() > MIN_BASIC_FRIENDS)
+			{
+                		userLevel = RSCONFIG_USER_LEVEL_BASIC;
+			}
+		}
+		case RSCONFIG_USER_LEVEL_BASIC:
+		{
+			/* check that we have some lastConnect > 0 */
+			if (mPeerMgr->haveOnceConnected())
+			{
+                		userLevel = RSCONFIG_USER_LEVEL_CASUAL;
+			}
+		}
+
+		case RSCONFIG_USER_LEVEL_CASUAL:
+                case RSCONFIG_USER_LEVEL_POWER:
+
+		{
+			/* check that the firewall is open */
+
+			uint32_t netMode = mNetMgr->getNetworkMode();
+			uint32_t firewallMode = mNetMgr->getNatHoleMode();
+
+			if ((RSNET_NETWORK_EXTERNALIP == netMode) ||
+			   ((RSNET_NETWORK_BEHINDNAT == netMode) &&
+			  	 	((RSNET_NATHOLE_UPNP == firewallMode) ||
+			   		(RSNET_NATHOLE_NATPMP == firewallMode) ||
+			   		(RSNET_NATHOLE_FORWARDED == firewallMode))))
+			{
+                		userLevel = RSCONFIG_USER_LEVEL_POWER;
+			}
+		}
+			break; /* for all */
+	}
+
+	{
+		RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
+		mUserLevel = userLevel;
+	}
+
+	return userLevel;
+}
+
+
+uint32_t p3ServerConfig::getNetState()
+{
+	return mNetMgr->getNetStateMode();
+}
+
+uint32_t p3ServerConfig::getNetworkMode()
+{
+	return mNetMgr->getNetworkMode();
+}
+
+uint32_t p3ServerConfig::getNatTypeMode()
+{
+	return mNetMgr->getNatTypeMode();
+}
+
+uint32_t p3ServerConfig::getNatHoleMode()
+{
+	return mNetMgr->getNatHoleMode();
+}
+
+uint32_t p3ServerConfig::getConnectModes()
+{
+	return mNetMgr->getConnectModes();
+}
+
+

libretroshare/src/rsserver/p3serverconfig.h

@@ -0,0 +1,86 @@
+#ifndef LIBRETROSHARE_CONFIG_IMPLEMENTATION_H
+#define LIBRETROSHARE_CONFIG_IMPLEMENTATION_H
+
+/*
+ * libretroshare/src/rsserver: p3serverconfig.h
+ *
+ * RetroShare C++ Interface.
+ *
+ * Copyright 2011-2011 by Robert Fernie.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+
+#include "retroshare/rsconfig.h"
+#include "pqi/p3peermgr.h"
+#include "pqi/p3linkmgr.h"
+#include "pqi/p3netmgr.h"
+
+class p3ServerConfig: public RsServerConfig
+{
+	public:
+
+	p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr *netMgr);
+virtual ~p3ServerConfig();
+
+	/* From RsIface::RsConfig */
+
+virtual int 	getConfigNetStatus(RsConfigNetStatus &status);
+virtual int 	getConfigStartup(RsConfigStartup &params);
+virtual int 	getConfigDataRates(RsConfigDataRates &params);
+
+	/* From RsInit */
+
+virtual std::string      RsConfigDirectory();
+virtual std::string      RsConfigKeysDirectory();
+
+virtual std::string  RsProfileConfigDirectory();
+virtual bool         getStartMinimised();
+virtual std::string  getRetroShareLink();
+
+virtual bool getAutoLogin();
+virtual void setAutoLogin(bool autoLogin);
+virtual bool RsClearAutoLogin();
+
+virtual std::string getRetroshareDataDirectory();
+
+	/* New Stuff */
+
+virtual uint32_t getUserLevel();
+
+virtual uint32_t getNetState();
+virtual uint32_t getNetworkMode();
+virtual uint32_t getNatTypeMode();
+virtual uint32_t getNatHoleMode();
+virtual uint32_t getConnectModes();
+
+/********************* ABOVE is RsConfig Interface *******/
+
+	private:
+
+	p3PeerMgr *mPeerMgr;
+	p3LinkMgr *mLinkMgr;
+	p3NetMgr  *mNetMgr;
+
+	RsMutex configMtx;
+	uint32_t mUserLevel; // store last one... will later be a config Item too.
+
+};
+
+#endif

libretroshare/src/rsserver/rsinit.cc

@@ -1732,6 +1732,8 @@ RsTurtle *rsTurtle = NULL ;
 #include "rsserver/p3discovery.h"
 #include "rsserver/p3photo.h"
 #include "rsserver/p3status.h"
+#include "rsserver/p3serverconfig.h"
+
 #include "retroshare/rsgame.h"
 
 #include "pqi/p3notify.h" // HACK - moved to pqi for compilation order.
@@ -2300,6 +2302,7 @@ int RsServer::StartupRetroShare()
 
 	rsPeers = new p3Peers(mLinkMgr, mPeerMgr, mNetMgr);
 	rsDisc  = new p3Discovery(ad);
+	rsConfig = new p3ServerConfig(mPeerMgr, mLinkMgr, mNetMgr);
 
 #ifndef MINIMAL_LIBRS
 	rsMsgs  = new p3Msgs(msgSrv, chatSrv);