Starting to clean libretroshare

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/ammorais_branch@1341 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ammorais 2009-07-09 18:48:54 +00:00
parent 511e040dcb
commit a8838b25fd
13 changed files with 2815 additions and 330 deletions

View File

@ -0,0 +1,48 @@
#include "notifybase.h"
NotifyBase::NotifyBase()
{
}
NotifyBase::~NotifyBase()
{
}
void NotifyBase::notifyListPreChange(int list, int type)
{
(void) list;
(void) type;
}
void NotifyBase::notifyListChange(int list, int type)
{
(void) list;
(void) type;
}
void NotifyBase::notifyErrorMsg(int list, int sev, std::string msg)
{
(void) list;
(void) sev;
(void) msg;
}
void NotifyBase::notifyChat()
{
}
void NotifyBase::notifyChatStatus(const std::string& peer_id,const std::string& status_string)
{
}
void NotifyBase::notifyHashingInfo(std::string fileinfo)
{
(void)fileinfo;
}
void NotifyBase::notifyTurtleSearchResult(uint32_t search_id,const std::list<TurtleFileInfo>& files)
{
(void)files;
}

View File

@ -0,0 +1,36 @@
#ifndef NOTIFYBASE_H
#define NOTIFYBASE_H
const int NOTIFY_LIST_NEIGHBOURS = 1;
const int NOTIFY_LIST_FRIENDS = 2;
const int NOTIFY_LIST_DIRLIST = 3;
const int NOTIFY_LIST_SEARCHLIST = 4;
const int NOTIFY_LIST_MESSAGELIST = 5;
const int NOTIFY_LIST_CHANNELLIST = 6;
const int NOTIFY_LIST_TRANSFERLIST = 7;
const int NOTIFY_LIST_CONFIG = 8;
const int NOTIFY_TYPE_SAME = 0x01;
const int NOTIFY_TYPE_MOD = 0x02; /* general purpose, check all */
const int NOTIFY_TYPE_ADD = 0x04; /* flagged additions */
const int NOTIFY_TYPE_DEL = 0x08; /* flagged deletions */
class NotifyBase
{
public:
NotifyBase();
virtual ~NotifyBase();
virtual void notifyListPreChange(int list, int type);
virtual void notifyListChange(int list, int type);
virtual void notifyErrorMsg(int list, int sev, std::string msg);
virtual void notifyChat();
virtual void notifyChatStatus(const std::string& peer_id,const std::string& status_string);
virtual void notifyHashingInfo(std::string fileinfo);
virtual void notifyTurtleSearchResult(uint32_t search_id,const std::list<TurtleFileInfo>& files);
};
#endif // NOTIFYBASE_H

View File

@ -0,0 +1,21 @@
#include "rscontrol.h"
RsControl::RsControl(RsIface &i, NotifyBase &callback) :
cb(callback),
rsIface(i)
{
}
RsControl::~RsControl()
{
}
NotifyBase& RsControl::getNotify()
{
return cb;
}
RsIface& RsControl::getIface()
{
return rsIface;
}

View File

@ -0,0 +1,54 @@
#ifndef RSCONTROL_H
#define RSCONTROL_H
// Class RsControl - True Virtual
class RsControl /* The Main Interface Class - for controlling the server */
{
public:
RsControl(RsIface &i, NotifyBase &callback);
virtual ~RsControl();
/* Real Startup Fn */
virtual int StartupRetroShare() = 0;
/****************************************/
/* Flagging Persons / Channels / Files in or out of a set (CheckLists) */
virtual int SetInChat(std::string id, bool in) = 0; /* friend : chat msgs */
virtual int SetInMsg(std::string id, bool in) = 0; /* friend : msg receipients */
virtual int SetInBroadcast(std::string id, bool in) = 0; /* channel : channel broadcast */
virtual int SetInSubscribe(std::string id, bool in) = 0; /* channel : subscribed channels */
virtual int SetInRecommend(std::string id, bool in) = 0; /* file : recommended file */
virtual int ClearInChat() = 0;
virtual int ClearInMsg() = 0;
virtual int ClearInBroadcast() = 0;
virtual int ClearInSubscribe() = 0;
virtual int ClearInRecommend() = 0;
virtual bool IsInChat(std::string id) = 0; /* friend : chat msgs */
virtual bool IsInMsg(std::string id) = 0; /* friend : msg recpts*/
/****************************************/
/* Config */
virtual int ConfigSetDataRates( int totalDownload, int totalUpload ) = 0;
virtual int ConfigGetDataRates( float &inKb, float &outKb) = 0;
virtual int ConfigSetBootPrompt( bool on ) = 0;
virtual void ConfigFinalSave( ) = 0;
virtual void rsGlobalShutDown( ) = 0;
/****************************************/
NotifyBase &getNotify();
RsIface &getIface();
private:
NotifyBase &cb;
RsIface &rsIface;
};
#endif // RSCONTROL_H

View File

@ -0,0 +1,94 @@
/*
* "$Id: rsiface.cc,v 1.6 2007-04-15 18:45:23 rmf24 Exp $"
*
* RetroShare C++ Interface.
*
* Copyright 2004-2007 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 "rsiface.h"
#include "util/rsdir.h"
RsIface::RsIface(NotifyBase &callback) :
cb(callback)
{
}
RsIface::~RsIface()
{
}
const std::list<FileInfo>& RsIface::getRecommendList()
{
return mRecommendList;
}
const RsConfig& RsIface::getConfig()
{
return mConfig;
}
/* set to true */
bool RsIface::setChanged(DataFlags set)
{
if ((int) set < (int) NumOfFlags)
{
/* go for it */
mChanged[(int) set ] = true;
return true;
}
return false;
}
/* leaves it */
bool RsIface::getChanged(DataFlags set)
{
if ((int) set < (int) NumOfFlags)
{
/* go for it */
return mChanged[(int) set ];
}
return false;
}
/* resets it */
bool RsIface::hasChanged(DataFlags set)
{
if ((int) set < (int) NumOfFlags)
{
/* go for it */
if (mChanged[(int) set ])
{
mChanged[(int) set ] = false;
return true;
}
}
return false;
}
RsIface *createRsIface(NotifyBase &cb)
{
return new RsIfaceReal(cb);
}

View File

@ -0,0 +1,115 @@
#ifndef RETROSHARE_GUI_INTERFACE_H
#define RETROSHARE_GUI_INTERFACE_H
/*
* "$Id: rsiface.h,v 1.9 2007-04-21 19:08:51 rmf24 Exp $"
*
* RetroShare C++ Interface.
*
* Copyright 2004-2006 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 "rstypes.h"
#include "rscontrol.h"
#include <map>
class NotifyBase;
class RsIface;
class RsControl;
class RsInit;
struct TurtleFileInfo ;
/* declare single RsIface for everyone to use! */
// if it's declared here why does have the extern.TODO: To see it later
extern RsIface *rsiface;
extern RsControl *rsicontrol;
RsIface *createRsIface (NotifyBase &notify);
class RsIface /* The Main Interface Class - create a single one! */
{
public:
RsIface(NotifyBase &callback);
virtual ~RsIface();
/****************************************/
/* Stubs for Very Important Fns -> Locking Functions */
virtual void lockData() = 0;
virtual void unlockData() = 0;
const std::list<FileInfo> &getRecommendList();
const RsConfig &getConfig();
/****************************************/
/* Flags to indicate used or not */
enum DataFlags
{
Neighbour = 0,
Friend = 1,
DirLocal = 2, /* Not Used - QModel instead */
DirRemote = 3, /* Not Used - QModel instead */
Transfer = 4,
Message = 5,
Channel = 6,
Chat = 7,
Recommend = 8,
Config = 9,
NumOfFlags = 10
};
/*
* Operations for flags
*/
bool setChanged(DataFlags set); /* set to true */
bool getChanged(DataFlags set); /* leaves it */
bool hasChanged(DataFlags set); /* resets it */
private:
void fillLists(); /* create some dummy data to display */
/* Internals */
std::list<FileInfo> mRecommendList;
bool mChanged[NumOfFlags];
RsConfig mConfig;
NotifyBase &cb;
/* Classes which can update the Lists! */
friend class RsControl;
friend class RsServer;
};
#endif

View File

@ -0,0 +1,13 @@
INCLUDEPATH += $$PWD \
../$$PWP
DEPENDPATH += $$PWD
SOURCES = $$PWP/rsinit.cc \
$$PWP/rsiface.cc \
rscontrol.cc \
notifybase.cc \
rsifacereal.cc
HEADERS = $$PWP/rsinit.h \
$$PWP/rsiface.h \
rscontrol.h \
notifybase.h \
rsifacereal.h

View File

@ -0,0 +1,32 @@
#include "rsifacereal.h"
RsIfaceReal::RsIfaceReal(NotifyBase &callback) :
RsIface(callback)
{
}
RsIfaceReal(NotifyBase &callback) :
RsIface(callback)
{ return; }
virtual void lockData()
{
// std::cerr << "RsIfaceReal::lockData()" << std::endl;
return rsIfaceMutex.lock();
}
virtual void unlockData()
{
// std::cerr << "RsIfaceReal::unlockData()" << std::endl;
return rsIfaceMutex.unlock();
}
private:
RsMutex rsIfaceMutex;
};
RsIface *createRsIface(NotifyBase &cb)
{
return new RsIfaceReal(cb);
}

View File

@ -0,0 +1,22 @@
#ifndef RSIFACEREAL_H
#define RSIFACEREAL_H
/*************************** THE REAL RSIFACE (with MUTEXES) *******/
#include "util/rsthreads.h"
#include "rsiface.h"
#include "notifybase.h"
class RsIfaceReal: public RsIface
{
public:
RsIfaceReal(NotifyBase &callback);
virtual void lockData();
virtual void unlockData();
private:
RsMutex rsIfaceMutex;
};
#endif // RSIFACEREAL_H

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,82 @@
/* Initialisation Class (not publicly disclosed to RsIFace) */
/****
* #define RS_USE_PGPSSL 1
***/
#ifndef RSINIT_H
#define RSINIT_H
class RsInit
{
public:
/* Commandline/Directory options */
static const char *RsConfigDirectory() ;
static bool setStartMinimised() ;
static int InitRetroShare(int argcIgnored, char **argvIgnored) ;
static int LoadCertificates(bool autoLoginNT) ;
static bool ValidateCertificate(std::string &userName) ;
static bool ValidateTrustedUser(std::string fname, std::string &userName) ;
static bool LoadPassword(std::string passwd) ;
static bool RsGenerateCertificate(std::string name, std::string org, std::string loc, std::string country, std::string passwd, std::string &errString);
static void load_check_basedir() ;
static int create_configinit() ;
static bool RsStoreAutoLogin() ;
static bool RsTryAutoLogin() ;
static bool RsClearAutoLogin(std::string basedir) ;
static void InitRsConfig() ;
static std::string getHomePath() ;
/* PGPSSL init functions */
#ifdef RS_USE_PGPSSL
static bool LoadGPGPassword(std::string id, std::string passwd);
static int GetLogins(std::list<std::string> &pgpIds);
static int GetLoginDetails(std::string id, std::string &name, std::string &email);
static std::string gpgPasswd;
#endif
/* Key Parameters that must be set before
* RetroShare will start up:
*/
static std::string load_cert;
static std::string load_key;
static std::string passwd;
static bool havePasswd; /* for Commandline password */
static bool autoLogin; /* autoLogin allowed */
static bool startMinimised; /* Icon or Full Window */
/* Win/Unix Differences */
static char dirSeperator;
/* Directories */
static std::string basedir;
static std::string homePath;
/* Listening Port */
static bool forceExtPort;
static bool forceLocalAddr;
static unsigned short port;
static char inet[256];
/* Logging */
static bool haveLogFile;
static bool outStderr;
static bool haveDebugLevel;
static int debugLevel;
static char logfname[1024];
static bool firsttime_run;
static bool load_trustedpeer;
static std::string load_trustedpeer_file;
static bool udpListenerOnly;
};
#endif

View File

@ -1,340 +1,349 @@
include(_rsiface/rsiface.pri)
TEMPLATE = lib
CONFIG += static
TARGET = retroshare
CONFIG += release
################################# Linux ##########################################
profiling {
QMAKE_CXXFLAGS -= -fomit-frame-pointer
QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer
# ################################ Linux ##########################################
profiling {
QMAKE_CXXFLAGS -= -fomit-frame-pointer
QMAKE_CXXFLAGS *= -pg \
-g \
-fno-omit-frame-pointer
}
debug {
DEFINES *= DEBUG
# DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG
# DEFINES *= CHAT_DEBUG
DEFINES *= P3TURTLE_DEBUG \
CONTROL_DEBUG \
FT_DEBUG
QMAKE_CXXFLAGS *= -g
}
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
DESTDIR = lib.linux-g++
QMAKE_CXXFLAGS *= -Wall
QMAKE_CC = g++
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
DESTDIR = lib.linux-g++-64
QMAKE_CXXFLAGS *= -Wall
QMAKE_CC = g++
}
debug {
DEFINES *= DEBUG
# DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG
# DEFINES *= CHAT_DEBUG
DEFINES *= P3TURTLE_DEBUG CONTROL_DEBUG FT_DEBUG
QMAKE_CXXFLAGS *= -g
# ################### Cross compilation for windows under Linux ####################
win32-x-g++ {
OBJECTS_DIR = temp/win32xgcc/obj
DESTDIR = lib.win32xgcc
DEFINES *= WINDOWS_SYS \
WIN32 \
WIN_CROSS_UBUNTU
QMAKE_CXXFLAGS *= -Wmissing-include-dirs
QMAKE_CC = i586-mingw32msvc-g++
QMAKE_LIB = i586-mingw32msvc-ar
DEFINES *= STATICLIB \
WIN32
INCLUDEPATH *= /usr/i586-mingw32msvc/include \
${HOME}/.wine/drive_c/pthreads/include/
}
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
DESTDIR = lib.linux-g++
QMAKE_CXXFLAGS *= -Wall
QMAKE_CC = g++
# ################################ Windows ##########################################
win32 {
QMAKE_CC = g++
OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc
DEFINES = WINDOWS_SYS \
WIN32 \
STATICLIB \
MINGW
DESTDIR = lib
SSL_DIR = ../../../../openssl-0.9.7g-xpgp-0.1c/include
UPNPC_DIR = ../../../../miniupnpc-1.0
PTHREADS_DIR = ../../../../pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../../zlib-1.2.3
INCLUDEPATH += . \
$${SSL_DIR} \
$${UPNPC_DIR} \
$${PTHREADS_DIR} \
$${ZLIB_DIR}
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
DESTDIR = lib.linux-g++-64
QMAKE_CXXFLAGS *= -Wall
QMAKE_CC = g++
}
#################### Cross compilation for windows under Linux ####################
win32-x-g++ {
OBJECTS_DIR = temp/win32xgcc/obj
DESTDIR = lib.win32xgcc
DEFINES *= WINDOWS_SYS WIN32 WIN_CROSS_UBUNTU
QMAKE_CXXFLAGS *= -Wmissing-include-dirs
QMAKE_CC = i586-mingw32msvc-g++
QMAKE_LIB = i586-mingw32msvc-ar
DEFINES *= STATICLIB WIN32
INCLUDEPATH *= /usr/i586-mingw32msvc/include ${HOME}/.wine/drive_c/pthreads/include/
}
################################# Windows ##########################################
win32 {
QMAKE_CC = g++
OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc
DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW
DESTDIR = lib
SSL_DIR = ../../../../openssl-0.9.7g-xpgp-0.1c/include
UPNPC_DIR = ../../../../miniupnpc-1.0
PTHREADS_DIR = ../../../../pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../../zlib-1.2.3
INCLUDEPATH += . $${SSL_DIR} $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR}
}
################################### COMMON stuff ##################################
DEFINES *= PQI_USE_XPGP MINIUPNPC_VERSION=10
SSL_DIR=../../../../openssl-0.9.7g-xpgp-0.1c
UPNPC_DIR=../../../../miniupnpc-1.0
INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR}
#DEPENDPATH += . \
# util \
# tcponudp \
# serialiser \
# pqi \
# dbase \
# services \
# dht \
# upnp \
# ft \
# rsserver
#INCLUDEPATH += . \
# util \
# tcponudp \
# serialiser \
# pqi \
# dbase \
# services \
# dht \
# upnp \
# ft \
# rsserver
# ################################## COMMON stuff ##################################
DEFINES *= PQI_USE_XPGP \
MINIUPNPC_VERSION=10
SSL_DIR = ../../../../openssl-0.9.7g-xpgp-0.1c
UPNPC_DIR = ../../../../miniupnpc-1.0
INCLUDEPATH += . \
$${SSL_DIR}/include \
$${UPNPC_DIR}
# DEPENDPATH += . \
# util \
# tcponudp \
# serialiser \
# pqi \
# dbase \
# services \
# dht \
# upnp \
# ft \
# rsserver
# INCLUDEPATH += . \
# util \
# tcponudp \
# serialiser \
# pqi \
# dbase \
# services \
# dht \
# upnp \
# ft \
# rsserver
# Input
HEADERS += dbase/cachestrapper.h \
dbase/fimonitor.h \
dbase/findex.h \
dbase/fistore.h \
dht/b64.h \
dht/dhtclient.h \
dht/opendht.h \
dht/opendhtmgr.h \
dht/opendhtstr.h \
ft/ftcontroller.h \
ft/ftdata.h \
ft/ftdatamultiplex.h \
ft/ftdbase.h \
ft/ftextralist.h \
ft/ftfilecreator.h \
ft/ftfileprovider.h \
ft/ftfilesearch.h \
ft/ftsearch.h \
ft/ftserver.h \
ft/fttransfermodule.h \
pqi/authssl.h \
pqi/authxpgp.h \
pqi/cleanupxpgp.h \
pqi/p3authmgr.h \
pqi/p3cfgmgr.h \
pqi/p3connmgr.h \
pqi/p3dhtmgr.h \
pqi/p3notify.h \
pqi/p3upnpmgr.h \
pqi/pqi.h \
pqi/pqi_base.h \
pqi/pqiarchive.h \
pqi/pqiassist.h \
pqi/pqibin.h \
pqi/pqihandler.h \
pqi/pqihash.h \
pqi/pqiindic.h \
pqi/pqilistener.h \
pqi/pqiloopback.h \
pqi/pqimonitor.h \
pqi/pqinetwork.h \
pqi/pqinotify.h \
pqi/pqiperson.h \
pqi/pqipersongrp.h \
pqi/pqisecurity.h \
pqi/pqiservice.h \
pqi/pqistore.h \
pqi/pqissl.h \
pqi/pqissllistener.h \
pqi/pqisslpersongrp.h \
pqi/pqissludp.h \
pqi/pqistreamer.h \
pqi/sslcert.h \
pqi/xpgpcert.h \
rsiface/rschannels.h \
rsiface/rsdisc.h \
rsiface/rsdistrib.h \
rsiface/rsexpr.h \
rsiface/rsfiles.h \
rsiface/rsforums.h \
rsiface/rsgame.h \
rsiface/rsiface.h \
rsiface/rsmsgs.h \
rsiface/rsnotify.h \
rsiface/rspeers.h \
rsiface/rsphoto.h \
rsiface/rsQblog.h \
rsiface/rsrank.h \
rsiface/rsstatus.h \
rsiface/rstypes.h \
rsserver/p3Blog.h \
rsserver/p3discovery.h \
rsserver/p3face.h \
rsserver/p3files.h \
rsserver/p3msgs.h \
rsserver/p3peers.h \
rsserver/p3photo.h \
rsserver/p3rank.h \
serialiser/rsbaseitems.h \
serialiser/rsbaseserial.h \
serialiser/rschannelitems.h \
serialiser/rsconfigitems.h \
serialiser/rsdiscitems.h \
serialiser/rsdistribitems.h \
serialiser/rsforumitems.h \
serialiser/rsgameitems.h \
serialiser/rsmsgitems.h \
serialiser/rsphotoitems.h \
serialiser/rsqblogitems.h \
serialiser/rsrankitems.h \
serialiser/rsserial.h \
serialiser/rsserviceids.h \
serialiser/rsserviceitems.h \
serialiser/rsstatusitems.h \
serialiser/rstlvbase.h \
serialiser/rstlvkeys.h \
serialiser/rstlvkvwide.h \
serialiser/rstlvtypes.h \
serialiser/rstlvutil.h \
services/p3channels.h \
services/p3chatservice.h \
services/p3disc.h \
services/p3distrib.h \
services/p3forums.h \
services/p3gamelauncher.h \
services/p3gameservice.h \
services/p3msgservice.h \
services/p3photoservice.h \
services/p3portservice.h \
services/p3Qblog.h \
services/p3ranking.h \
services/p3service.h \
services/p3status.h \
turtle/p3turtle.h \
turtle/turtletypes.h \
turtle/rsturtleitem.h \
tcponudp/extaddrfinder.h \
tcponudp/bio_tou.h \
tcponudp/tcppacket.h \
tcponudp/tcpstream.h \
tcponudp/tou.h \
tcponudp/tou_errno.h \
tcponudp/tou_net.h \
tcponudp/udplayer.h \
tcponudp/udpsorter.h \
upnp/upnphandler.h \
upnp/upnputil.h \
util/rsdebug.h \
util/rsdir.h \
util/rsnet.h \
util/rsprint.h \
util/rsthreads.h \
util/rswin.h \
util/rsversion.h
dbase/fimonitor.h \
dbase/findex.h \
dbase/fistore.h \
dht/b64.h \
dht/dhtclient.h \
dht/opendht.h \
dht/opendhtmgr.h \
dht/opendhtstr.h \
ft/ftcontroller.h \
ft/ftdata.h \
ft/ftdatamultiplex.h \
ft/ftdbase.h \
ft/ftextralist.h \
ft/ftfilecreator.h \
ft/ftfileprovider.h \
ft/ftfilesearch.h \
ft/ftsearch.h \
ft/ftserver.h \
ft/fttransfermodule.h \
pqi/authssl.h \
pqi/authxpgp.h \
pqi/cleanupxpgp.h \
pqi/p3authmgr.h \
pqi/p3cfgmgr.h \
pqi/p3connmgr.h \
pqi/p3dhtmgr.h \
pqi/p3notify.h \
pqi/p3upnpmgr.h \
pqi/pqi.h \
pqi/pqi_base.h \
pqi/pqiarchive.h \
pqi/pqiassist.h \
pqi/pqibin.h \
pqi/pqihandler.h \
pqi/pqihash.h \
pqi/pqiindic.h \
pqi/pqilistener.h \
pqi/pqiloopback.h \
pqi/pqimonitor.h \
pqi/pqinetwork.h \
pqi/pqinotify.h \
pqi/pqiperson.h \
pqi/pqipersongrp.h \
pqi/pqisecurity.h \
pqi/pqiservice.h \
pqi/pqistore.h \
pqi/pqissl.h \
pqi/pqissllistener.h \
pqi/pqisslpersongrp.h \
pqi/pqissludp.h \
pqi/pqistreamer.h \
pqi/sslcert.h \
pqi/xpgpcert.h \
rsiface/rschannels.h \
rsiface/rsdisc.h \
rsiface/rsdistrib.h \
rsiface/rsexpr.h \
rsiface/rsfiles.h \
rsiface/rsforums.h \
rsiface/rsgame.h \
rsiface/rsiface.h \
rsiface/rsmsgs.h \
rsiface/rsnotify.h \
rsiface/rspeers.h \
rsiface/rsphoto.h \
rsiface/rsQblog.h \
rsiface/rsrank.h \
rsiface/rsstatus.h \
rsiface/rstypes.h \
rsserver/p3Blog.h \
rsserver/p3discovery.h \
rsserver/p3face.h \
rsserver/p3files.h \
rsserver/p3msgs.h \
rsserver/p3peers.h \
rsserver/p3photo.h \
rsserver/p3rank.h \
serialiser/rsbaseitems.h \
serialiser/rsbaseserial.h \
serialiser/rschannelitems.h \
serialiser/rsconfigitems.h \
serialiser/rsdiscitems.h \
serialiser/rsdistribitems.h \
serialiser/rsforumitems.h \
serialiser/rsgameitems.h \
serialiser/rsmsgitems.h \
serialiser/rsphotoitems.h \
serialiser/rsqblogitems.h \
serialiser/rsrankitems.h \
serialiser/rsserial.h \
serialiser/rsserviceids.h \
serialiser/rsserviceitems.h \
serialiser/rsstatusitems.h \
serialiser/rstlvbase.h \
serialiser/rstlvkeys.h \
serialiser/rstlvkvwide.h \
serialiser/rstlvtypes.h \
serialiser/rstlvutil.h \
services/p3channels.h \
services/p3chatservice.h \
services/p3disc.h \
services/p3distrib.h \
services/p3forums.h \
services/p3gamelauncher.h \
services/p3gameservice.h \
services/p3msgservice.h \
services/p3photoservice.h \
services/p3portservice.h \
services/p3Qblog.h \
services/p3ranking.h \
services/p3service.h \
services/p3status.h \
turtle/p3turtle.h \
turtle/turtletypes.h \
turtle/rsturtleitem.h \
tcponudp/extaddrfinder.h \
tcponudp/bio_tou.h \
tcponudp/tcppacket.h \
tcponudp/tcpstream.h \
tcponudp/tou.h \
tcponudp/tou_errno.h \
tcponudp/tou_net.h \
tcponudp/udplayer.h \
tcponudp/udpsorter.h \
upnp/upnphandler.h \
upnp/upnputil.h \
util/rsdebug.h \
util/rsdir.h \
util/rsnet.h \
util/rsprint.h \
util/rsthreads.h \
util/rswin.h \
util/rsversion.h
SOURCES = dht/dht_check_peers.cc \
dht/dht_bootstrap.cc \
pqi/xpgp_id.cc \
rsserver/p3face-msgs.cc \
rsserver/rsiface.cc \
rsserver/rstypes.cc \
rsserver/p3face-startup.cc \
rsserver/p3face-config.cc \
rsserver/p3face-server.cc \
rsserver/p3Blog.cc \
rsserver/p3discovery.cc \
rsserver/p3msgs.cc \
rsserver/p3photo.cc \
rsserver/p3rank.cc \
rsserver/p3peers.cc \
ft/ftcontroller.cc \
ft/ftserver.cc \
ft/ftdbase.cc \
ft/fttransfermodule.cc \
ft/ftdatamultiplex.cc \
ft/ftfilesearch.cc \
ft/ftextralist.cc \
ft/ftfilecreator.cc \
ft/ftdata.cc \
ft/ftfileprovider.cc \
upnp/upnputil.c \
dht/opendhtmgr.cc \
upnp/upnphandler.cc \
dht/opendht.cc \
dht/opendhtstr.cc \
dht/b64.c \
services/p3portservice.cc \
services/p3channels.cc \
services/p3forums.cc \
services/p3Qblog.cc \
services/p3status.cc \
services/p3distrib.cc \
services/p3photoservice.cc \
services/p3disc.cc \
services/p3ranking.cc \
services/p3gamelauncher.cc \
services/p3msgservice.cc \
services/p3chatservice.cc \
services/p3service.cc \
turtle/p3turtle.cc \
turtle/rsturtleitem.cc \
dbase/rsexpr.cc \
dbase/cachestrapper.cc \
dbase/fistore.cc \
dbase/fimonitor.cc \
dbase/findex.cc \
pqi/p3notify.cc \
pqi/pqipersongrp.cc \
pqi/pqihandler.cc \
pqi/pqiservice.cc \
pqi/pqiperson.cc \
pqi/pqissludp.cc \
pqi/authxpgp.cc \
pqi/cleanupxpgp.cc \
pqi/pqisslpersongrp.cc \
pqi/pqissllistener.cc \
pqi/pqissl.cc \
pqi/pqistore.cc \
pqi/p3authmgr.cc \
pqi/p3cfgmgr.cc \
pqi/p3connmgr.cc \
pqi/p3dhtmgr.cc \
pqi/pqiarchive.cc \
pqi/pqibin.cc \
pqi/pqimonitor.cc \
pqi/pqistreamer.cc \
pqi/pqiloopback.cc \
pqi/pqinetwork.cc \
pqi/pqisecurity.cc \
serialiser/rsqblogitems.cc \
serialiser/rsstatusitems.cc \
serialiser/rschannelitems.cc \
serialiser/rsforumitems.cc \
serialiser/rsdistribitems.cc \
serialiser/rsgameitems.cc \
serialiser/rsphotoitems.cc \
serialiser/rsrankitems.cc \
serialiser/rsconfigitems.cc \
serialiser/rsdiscitems.cc \
serialiser/rsmsgitems.cc \
serialiser/rsbaseitems.cc \
serialiser/rstlvkvwide.cc \
serialiser/rstlvimage.cc \
serialiser/rstlvutil.cc \
serialiser/rstlvfileitem.cc \
serialiser/rstlvkeys.cc \
serialiser/rsbaseserial.cc \
serialiser/rstlvbase.cc \
serialiser/rstlvtypes.cc \
serialiser/rsserial.cc \
tcponudp/extaddrfinder.cc \
tcponudp/bss_tou.c \
tcponudp/tcpstream.cc \
tcponudp/tou.cc \
tcponudp/tcppacket.cc \
tcponudp/udpsorter.cc \
tcponudp/tou_net.cc \
tcponudp/udplayer.cc \
util/rsdebug.cc \
util/rsdir.cc \
util/rsnet.cc \
util/rsprint.cc \
util/rsthreads.cc \
util/rsversion.cc
SOURCES = \
dht/dht_check_peers.cc \
dht/dht_bootstrap.cc \
pqi/xpgp_id.cc \
rsserver/p3face-msgs.cc \
rsserver/rsiface.cc \
rsserver/rstypes.cc \
rsserver/p3face-startup.cc \
rsserver/p3face-config.cc \
rsserver/p3face-server.cc \
rsserver/p3Blog.cc \
rsserver/p3discovery.cc \
rsserver/p3msgs.cc \
rsserver/p3photo.cc \
rsserver/p3rank.cc \
rsserver/p3peers.cc \
ft/ftcontroller.cc \
ft/ftserver.cc \
ft/ftdbase.cc \
ft/fttransfermodule.cc \
ft/ftdatamultiplex.cc \
ft/ftfilesearch.cc \
ft/ftextralist.cc \
ft/ftfilecreator.cc \
ft/ftdata.cc \
ft/ftfileprovider.cc \
upnp/upnputil.c \
dht/opendhtmgr.cc \
upnp/upnphandler.cc \
dht/opendht.cc \
dht/opendhtstr.cc \
dht/b64.c \
services/p3portservice.cc \
services/p3channels.cc \
services/p3forums.cc \
services/p3Qblog.cc \
services/p3status.cc \
services/p3distrib.cc \
services/p3photoservice.cc \
services/p3disc.cc \
services/p3ranking.cc \
services/p3gamelauncher.cc \
services/p3msgservice.cc \
services/p3chatservice.cc \
services/p3service.cc \
turtle/p3turtle.cc \
turtle/rsturtleitem.cc \
dbase/rsexpr.cc \
dbase/cachestrapper.cc \
dbase/fistore.cc \
dbase/fimonitor.cc \
dbase/findex.cc \
pqi/p3notify.cc \
pqi/pqipersongrp.cc \
pqi/pqihandler.cc \
pqi/pqiservice.cc \
pqi/pqiperson.cc \
pqi/pqissludp.cc \
pqi/authxpgp.cc \
pqi/cleanupxpgp.cc \
pqi/pqisslpersongrp.cc \
pqi/pqissllistener.cc \
pqi/pqissl.cc \
pqi/pqistore.cc \
pqi/p3authmgr.cc \
pqi/p3cfgmgr.cc \
pqi/p3connmgr.cc \
pqi/p3dhtmgr.cc \
pqi/pqiarchive.cc \
pqi/pqibin.cc \
pqi/pqimonitor.cc \
pqi/pqistreamer.cc \
pqi/pqiloopback.cc \
pqi/pqinetwork.cc \
pqi/pqisecurity.cc \
serialiser/rsqblogitems.cc \
serialiser/rsstatusitems.cc \
serialiser/rschannelitems.cc \
serialiser/rsforumitems.cc \
serialiser/rsdistribitems.cc \
serialiser/rsgameitems.cc \
serialiser/rsphotoitems.cc \
serialiser/rsrankitems.cc \
serialiser/rsconfigitems.cc \
serialiser/rsdiscitems.cc \
serialiser/rsmsgitems.cc \
serialiser/rsbaseitems.cc \
serialiser/rstlvkvwide.cc \
serialiser/rstlvimage.cc \
serialiser/rstlvutil.cc \
serialiser/rstlvfileitem.cc \
serialiser/rstlvkeys.cc \
serialiser/rsbaseserial.cc \
serialiser/rstlvbase.cc \
serialiser/rstlvtypes.cc \
serialiser/rsserial.cc \
tcponudp/extaddrfinder.cc \
tcponudp/bss_tou.c \
tcponudp/tcpstream.cc \
tcponudp/tou.cc \
tcponudp/tcppacket.cc \
tcponudp/udpsorter.cc \
tcponudp/tou_net.cc \
tcponudp/udplayer.cc \
util/rsdebug.cc \
util/rsdir.cc \
util/rsnet.cc \
util/rsprint.cc \
util/rsthreads.cc \
util/rsversion.cc

View File

@ -56,11 +56,11 @@ void CleanupRsConfig(RsInit *);
int InitRetroShare(int argc, char **argv, RsInit *config);
// This Functions are used for Login.
bool ValidateCertificate(RsInit *config, std::string &userName);
bool ValidateTrustedUser(RsInit *config, std::string fname, std::string &userName);
bool LoadPassword(RsInit *config, std::string passwd);
bool RsGenerateCertificate(RsInit *config, std::string name, std::string org,
std::string loc, std::string country, std::string passwd, std::string &errString);
//bool ValidateCertificate(RsInit *config, std::string &userName);
//bool ValidateTrustedUser(RsInit *config, std::string fname, std::string &userName);
//bool LoadPassword(RsInit *config, std::string passwd);
//bool RsGenerateCertificate(RsInit *config, std::string name, std::string org,
// std::string loc, std::string country, std::string passwd, std::string &errString);
/* Auto Login Fns */
bool RsTryAutoLogin(RsInit *config);