From caaeda016d60a442616a42012fde1b7d7eafbd72 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 31 Jul 2011 12:32:38 +0000 Subject: [PATCH] removed p3portservice. Moved to unfinished/ git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4504 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/{services => unfinished}/p3portservice.cc | 8 +++----- .../src/{services => unfinished}/p3portservice.h | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) rename libretroshare/src/{services => unfinished}/p3portservice.cc (94%) rename libretroshare/src/{services => unfinished}/p3portservice.h (95%) diff --git a/libretroshare/src/services/p3portservice.cc b/libretroshare/src/unfinished/p3portservice.cc similarity index 94% rename from libretroshare/src/services/p3portservice.cc rename to libretroshare/src/unfinished/p3portservice.cc index 0a869dbe1..af4b24a73 100644 --- a/libretroshare/src/services/p3portservice.cc +++ b/libretroshare/src/unfinished/p3portservice.cc @@ -27,10 +27,8 @@ #include "services/p3portservice.h" #include "serialiser/rsserviceids.h" -#include "pqi/p3linkmgr.h" - -p3PortService::p3PortService(p3LinkMgr *lm) - :p3Service(RS_SERVICE_TYPE_PORT), mLinkMgr(lm), mEnabled(false) +p3PortService::p3PortService(p3ConnectMgr *cm) + :p3Service(RS_SERVICE_TYPE_PORT), mConnMgr(cm), mEnabled(false) { /* For Version 1, we'll just use the very simple RsRawItem packets * which are handled in the RsServiceSerialiser @@ -73,7 +71,7 @@ int p3PortService::tick() * */ /* input data TODO! */ - void *data; + void *data=NULL; uint32_t len=0; uint32_t packetId = (((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + diff --git a/libretroshare/src/services/p3portservice.h b/libretroshare/src/unfinished/p3portservice.h similarity index 95% rename from libretroshare/src/services/p3portservice.h rename to libretroshare/src/unfinished/p3portservice.h index 60ee325b1..b1ef089f9 100644 --- a/libretroshare/src/services/p3portservice.h +++ b/libretroshare/src/unfinished/p3portservice.h @@ -59,14 +59,13 @@ #include "serialiser/rsbaseitems.h" #include "services/p3service.h" - -class p3LinkMgr; +#include "pqi/p3connmgr.h" class p3PortService: public p3Service { public: - p3PortService(p3LinkMgr *lm); + p3PortService(p3ConnectMgr *cm); /* example setup functions */ bool enablePortForwarding(uint32_t port, std::string peerId); @@ -76,7 +75,7 @@ virtual int tick(); private: - p3LinkMgr *mLinkMgr; + p3ConnectMgr *mConnMgr; bool mEnabled; bool mPeerOnline;