* More bugfixes for file transfer.

* Added File Transfer / ExtraList to channels.
 * fixed mutex deadlock.
 * added slow transfer for background tf.
 * added checks to FileRequest to accumulate peers.
 * added ExtraList callback.
 * etc, etc.



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

libretroshare/src/rsserver/p3face-startup.cc

@@ -645,6 +645,7 @@ int RsServer::StartupRetroShare(RsInit *config)
 	std::string config_dir = config->basedir;
         std::string localcachedir = config_dir + "/cache/local";
 	std::string remotecachedir = config_dir + "/cache/remote";
+	std::string channelsdir = config_dir + "/channels";
 
 	mRanking = new p3Ranking(mConnMgr, RS_SERVICE_TYPE_RANK,     /* declaration of cache enable service rank */
 			mCacheStrapper, mCacheTransfer,
@@ -681,8 +682,8 @@ int RsServer::StartupRetroShare(RsInit *config)
 	pqih -> addService(mForums);  /* This must be also ticked as a service */
 
 	p3Channels *mChannels = new p3Channels(RS_SERVICE_TYPE_CHANNEL,
-			mCacheStrapper, mCacheTransfer,
-			localcachedir, remotecachedir, localcachedir);
+			mCacheStrapper, mCacheTransfer, rsFiles,
+			localcachedir, remotecachedir, channelsdir);
 
         CachePair cp5(mChannels, mChannels, CacheId(RS_SERVICE_TYPE_CHANNEL, 0));
 	mCacheStrapper -> addCachePair(cp5);

libretroshare/src/rsserver/p3face.h

@@ -27,7 +27,7 @@
  */
 
 //#include "server/filedexserver.h"
-#include "ft/ftserver.h";
+#include "ft/ftserver.h"
 //#include "pqi/pqissl.h"
 
 #include "pqi/p3cfgmgr.h"

libretroshare/src/rsserver/p3peers.cc

@@ -31,6 +31,15 @@
 #include <fstream>
 #include <sstream>
 
+/**************** PQI_USE_XPGP ******************/
+#if defined(PQI_USE_XPGP)
+        #include "pqi/authxpgp.h"
+#else /* X509 Certificates */
+/**************** PQI_USE_XPGP ******************/
+	#include "pqi/authssl.h"
+#endif /* X509 Certificates */
+/**************** PQI_USE_XPGP ******************/
+
 
 RsPeers *rsPeers = NULL;