Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

NETWORK REWORK (cont)

Browse Source 
Changes required elsewhere
 * peerStatus() fn signature updates.
 * changed Heartbeat fn call in p3disc (think Heartbeat should be rethought!)
 * removed p3tunnel from libretroshare (used BAD getPeer() function).
 * removed optimisations from debugging.
 * removed test cases from libretroshare.a source list.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3221 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-06-25 22:13:52 +00:00
parent 713d956882
commit 545a465735
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/dht/dht_bootstrap.cc
View File

@ -126,7 +126,7 @@ void addPeer(std::string id)
} }
virtual void peerStatus(std::string id, virtual void peerStatus(std::string id,
struct sockaddr_in laddr, struct sockaddr_in raddr, std::list<IpAddressTimed> ipAddressList, struct sockaddr_in laddr, struct sockaddr_in raddr,
uint32_t type, uint32_t mode, uint32_t source) uint32_t type, uint32_t mode, uint32_t source)
{ {
} }

2
libretroshare/src/dht/dht_check_peers.cc
View File

@ -125,7 +125,7 @@ void addPeer(std::string id)
} }
virtual void peerStatus(std::string id, virtual void peerStatus(std::string id,
struct sockaddr_in laddr, struct sockaddr_in raddr, std::list<IpAddressTimed> ipAddressList, struct sockaddr_in laddr, struct sockaddr_in raddr,
uint32_t type, uint32_t mode, uint32_t source) uint32_t type, uint32_t mode, uint32_t source)
{ {

13
libretroshare/src/libretroshare.pro
View File

@ -24,6 +24,7 @@ testnetwork {
#DEFINES *= DEBUG_UDP_SORTER DEBUG_UDP_LAYER EXTADDRSEARCH_DEBUG #DEFINES *= DEBUG_UDP_SORTER DEBUG_UDP_LAYER EXTADDRSEARCH_DEBUG
QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS -= -fomit-frame-pointer
QMAKE_CXXFLAGS -= -O2
QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
} }
@ -40,7 +41,7 @@ debug {
# DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
# DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
} }
@ -242,8 +243,6 @@ HEADERS += dbase/cachestrapper.h \
pqi/pqisslpersongrp.h \ pqi/pqisslpersongrp.h \
pqi/pqissludp.h \ pqi/pqissludp.h \
pqi/pqistreamer.h \ pqi/pqistreamer.h \
pqi/sslcert.h \
pqi/xpgpcert.h \
rsiface/rschannels.h \ rsiface/rschannels.h \
rsiface/rsdisc.h \ rsiface/rsdisc.h \
rsiface/rsdistrib.h \ rsiface/rsdistrib.h \
@ -326,9 +325,11 @@ HEADERS += dbase/cachestrapper.h \
util/rswin.h \ util/rswin.h \
util/rsversion.h util/rsversion.h
# These are test programs.... how did they get into the src list???
# dht/dht_check_peers.cc \
# dht/dht_bootstrap.cc \
SOURCES += \ SOURCES += \
dht/dht_check_peers.cc \
dht/dht_bootstrap.cc \
rsserver/p3face-msgs.cc \ rsserver/p3face-msgs.cc \
rsserver/rsiface.cc \ rsserver/rsiface.cc \
rsserver/rstypes.cc \ rsserver/rstypes.cc \
@ -365,7 +366,7 @@ SOURCES += \
services/p3distrib.cc \ services/p3distrib.cc \
services/p3photoservice.cc \ services/p3photoservice.cc \
services/p3disc.cc \ services/p3disc.cc \
services/p3tunnel.cc \ # removed because getPeer() dont exist services/p3tunnel.cc \
services/p3ranking.cc \ services/p3ranking.cc \
services/p3gamelauncher.cc \ services/p3gamelauncher.cc \
services/p3msgservice.cc \ services/p3msgservice.cc \

2
libretroshare/src/services/p3disc.cc
View File

@ -660,7 +660,7 @@ void p3disc::recvHeartbeatMsg(RsDiscHeartbeat *item)
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
mPqiPersonGrp->getPeer(item->PeerId())->receiveHeartbeat(); mPqiPersonGrp->tagHeartbeatRecvd(item->PeerId());
return; return;
} }