From 981724a8f19b50a754856579525f96657b031846 Mon Sep 17 00:00:00 2001 From: drbob Date: Fri, 25 Jun 2010 22:02:59 +0000 Subject: [PATCH] NETWORK REWORK (cont) p3connmgr: This needs major help... and will be revisited. Only changes to get code compiling for now. * revert peerStatus() function signatures (to match pqimonitor.h) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3217 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/p3connmgr.cc | 5 ++++- libretroshare/src/pqi/p3connmgr.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc index 08b700537..4956d2ee2 100644 --- a/libretroshare/src/pqi/p3connmgr.cc +++ b/libretroshare/src/pqi/p3connmgr.cc @@ -1821,9 +1821,12 @@ bool p3ConnectMgr::doNextAttempt(std::string id) void p3ConnectMgr::peerStatus(std::string id, - struct sockaddr_in laddr, struct sockaddr_in raddr, std::list ipDiscAddressList, + struct sockaddr_in laddr, struct sockaddr_in raddr, uint32_t type, uint32_t flags, uint32_t source) { + /* HACKED UP FIX ****/ + + std::list ipDiscAddressList; std::map::iterator it; bool isFriend = true; diff --git a/libretroshare/src/pqi/p3connmgr.h b/libretroshare/src/pqi/p3connmgr.h index e22beff9f..05bc94431 100644 --- a/libretroshare/src/pqi/p3connmgr.h +++ b/libretroshare/src/pqi/p3connmgr.h @@ -269,7 +269,7 @@ void removeMonitor(pqiMonitor *mon); /******* overloaded from pqiConnectCb *************/ virtual void peerStatus(std::string id, - struct sockaddr_in laddr, struct sockaddr_in raddr, std::list ipAddressList, + struct sockaddr_in laddr, struct sockaddr_in raddr, uint32_t type, uint32_t flags, uint32_t source); virtual void peerConnectRequest(std::string id, struct sockaddr_in raddr, uint32_t source);