Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-16 02:19:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* disabled UDP and TUNNEL connections for debugging purposes.

Browse source 
This is done in libretroshare.pro - if you want to reenable them.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3201 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-06-24 18:06:10 +00:00
parent 30210cf9ec
commit 47a2f06094
4 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libretroshare/src/libretroshare.pro
View file

@ -1,5 +1,6 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib release #CONFIG += staticlib release
CONFIG += staticlib testnetwork
CONFIG -= qt CONFIG -= qt
TARGET = retroshare TARGET = retroshare
@ -8,6 +9,26 @@ profiling {
QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer
} }
testnetwork {
DEFINES *= PQI_DISABLE_UDP
DEFINES *= PQI_DISABLE_TUNNEL
DEFINES *= AUTHSSL_DEBUG GPG_DEBUG
DEFINES *= CONN_DEBUG
# DEFINES *= P3DISC_DEBUG
DEFINES *= PGRP_DEBUG
DEFINES *= PERSON_DEBUG
DEFINES *= DEBUG_PQISSL
#DEFINES *= DEBUG_UDP_SORTER DEBUG_UDP_LAYER EXTADDRSEARCH_DEBUG
QMAKE_CXXFLAGS -= -fomit-frame-pointer
QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
}
#CONFIG += debug #CONFIG += debug
debug { debug {
# DEFINES *= DEBUG # DEFINES *= DEBUG

4
libretroshare/src/pqi/authssl.cc
View file

@ -46,6 +46,10 @@
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
/****
* #define AUTHSSL_DEBUG 1
***/
/********************************************************************************/ /********************************************************************************/
/********************************************************************************/ /********************************************************************************/
/********************************************************************************/ /********************************************************************************/

8
libretroshare/src/pqi/pqisslpersongrp.cc
View file

@ -40,9 +40,12 @@ const int pqipersongrpzone = 354;
/********************************** SSL Specific features ***************************/ /********************************** SSL Specific features ***************************/
#include "pqi/pqissl.h" #include "pqi/pqissl.h"
#include "pqi/pqissltunnel.h"
#include "pqi/pqissllistener.h" #include "pqi/pqissllistener.h"
#ifndef PQI_DISABLE_TUNNEL
#include "pqi/pqissltunnel.h"
#endif
#ifndef PQI_DISABLE_UDP #ifndef PQI_DISABLE_UDP
#include "pqi/pqissludp.h" #include "pqi/pqissludp.h"
#endif #endif
@ -81,13 +84,16 @@ pqiperson * pqisslpersongrp::createPerson(std::string id, pqilistener *listener)
pqip -> addChildInterface(PQI_CONNECT_TCP, pqisc); pqip -> addChildInterface(PQI_CONNECT_TCP, pqisc);
#ifndef PQI_DISABLE_TUNNEL
pqissltunnel *pqitun = new pqissltunnel(pqip, mConnMgr); pqissltunnel *pqitun = new pqissltunnel(pqip, mConnMgr);
RsSerialiser *rss3 = new RsSerialiser(); RsSerialiser *rss3 = new RsSerialiser();
rss3->addSerialType(new RsFileItemSerialiser()); rss3->addSerialType(new RsFileItemSerialiser());
rss3->addSerialType(new RsCacheItemSerialiser()); rss3->addSerialType(new RsCacheItemSerialiser());
rss3->addSerialType(new RsServiceSerialiser()); rss3->addSerialType(new RsServiceSerialiser());
pqiconnect *pqicontun = new pqiconnect(rss3, pqitun); pqiconnect *pqicontun = new pqiconnect(rss3, pqitun);
pqip -> addChildInterface(PQI_CONNECT_TUNNEL, pqicontun); pqip -> addChildInterface(PQI_CONNECT_TUNNEL, pqicontun);
#endif
#ifndef PQI_DISABLE_UDP #ifndef PQI_DISABLE_UDP
pqissludp *pqius = new pqissludp(pqip, mConnMgr); pqissludp *pqius = new pqissludp(pqip, mConnMgr);

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

@ -1866,7 +1866,10 @@ RsTurtle *rsTurtle = NULL ;
#include "services/p3statusservice.h" #include "services/p3statusservice.h"
#include "services/p3blogs.h" #include "services/p3blogs.h"
#include "turtle/p3turtle.h" #include "turtle/p3turtle.h"
#ifndef PQI_DISABLE_TUNNEL
#include "services/p3tunnel.h" #include "services/p3tunnel.h"
#endif
#include <list> #include <list>
#include <string> #include <string>
@ -2021,9 +2024,11 @@ int RsServer::StartupRetroShare()
chatSrv = new p3ChatService(mConnMgr); chatSrv = new p3ChatService(mConnMgr);
mStatusSrv = new p3StatusService(mConnMgr); mStatusSrv = new p3StatusService(mConnMgr);
#ifndef PQI_DISABLE_TUNNEL
p3tunnel *tn = new p3tunnel(mConnMgr, pqih); p3tunnel *tn = new p3tunnel(mConnMgr, pqih);
pqih -> addService(tn); pqih -> addService(tn);
mConnMgr->setP3tunnel(tn); mConnMgr->setP3tunnel(tn);
#endif
p3turtle *tr = new p3turtle(mConnMgr,ftserver) ; p3turtle *tr = new p3turtle(mConnMgr,ftserver) ;
rsTurtle = tr ; rsTurtle = tr ;