Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-20 20:08:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added ifdef and option to enable/disable embeded friend server

Browse source
This commit is contained in:
csoler 2022-01-10 17:48:33 +01:00
parent 3bd9188a33
commit 69f6adb6b4
7 changed files with 110 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libretroshare/src/libretroshare.pro
View file

@ -147,7 +147,6 @@ PUBLIC_HEADERS = retroshare/rsdisc.h \
retroshare/rsrtt.h \
retroshare/rsconfig.h \
retroshare/rsversion.h \
retroshare/rsfriendserver.h \
retroshare/rsservicecontrol.h \
retroshare/rsgxsdistsync.h
@ -409,10 +408,6 @@ HEADERS += pqi/authssl.h \
pqi/pqinetstatebox.h \
pqi/p3servicecontrol.h
SOURCES += friend_server/fsclient.h \
friend_server/fsitem.h \
friend_server/fsmanager.h
HEADERS += rsserver/p3face.h \
rsserver/p3history.h \
rsserver/p3msgs.h \
@ -582,9 +577,6 @@ SOURCES += pqi/authgpg.cc \
pqi/pqinetstatebox.cc \
pqi/p3servicecontrol.cc
SOURCES += friend_server/fsclient.cc \
friend_server/fsmanager.cc
SOURCES += rsserver/p3face-config.cc \
rsserver/p3face-server.cc \
rsserver/p3face-info.cc \
@ -842,6 +834,22 @@ wikipoos {
rsitems/rswikiitems.cc \
}
# Friend server
rs_efs {
DEFINES *= RS_EMBEDED_FRIEND_SERVER
HEADERS += friend_server/fsclient.h \
friend_server/fsitem.h \
friend_server/fsmanager.h \
retroshare/rsfriendserver.h
SOURCES += friend_server/fsclient.cc \
friend_server/fsmanager.cc
}
# The Wire
gxsthewire {
DEFINES *= RS_USE_WIRE

5
libretroshare/src/rsserver/rsinit.cc
View file

@ -51,7 +51,10 @@
#include "retroshare/rsversion.h"
#include "rsserver/rsloginhandler.h"
#include "rsserver/rsaccounts.h"
#ifdef RS_EMBEDED_FRIEND_SERVER
#include "friend_server/fsmanager.h"
#endif
#include <list>
#include <string>
@ -1176,8 +1179,10 @@ int RsServer::StartupRetroShare()
serviceCtrl->setServiceServer(pqih) ;
#ifdef RS_EMBEDED_FRIEND_SERVER
// setup friend server
rsFriendServer = new FriendServerManager();
#endif
/****** New Ft Server **** !!! */
ftServer *ftserver = new ftServer(mPeerMgr, serviceCtrl);