From bfa9965c9b3c11d4686bcc83d9dad79565181eae Mon Sep 17 00:00:00 2001 From: drbob Date: Fri, 25 Jun 2010 22:09:07 +0000 Subject: [PATCH] NETWORK REWORK (cont) * Removed unused FLAGS from pqi_base.h * corrected pqiStatus() fn signature in dhtmgr. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3219 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/p3dhtmgr.cc | 2 +- libretroshare/src/pqi/pqi_base.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libretroshare/src/pqi/p3dhtmgr.cc b/libretroshare/src/pqi/p3dhtmgr.cc index c49550993..30fc3bf16 100644 --- a/libretroshare/src/pqi/p3dhtmgr.cc +++ b/libretroshare/src/pqi/p3dhtmgr.cc @@ -1757,7 +1757,7 @@ bool p3DhtMgr::dhtResultSearch(std::string idhash, if (doCb) { std::list ipAddressList; - mConnCb->peerStatus(ent.id, ent.laddr, ent.raddr, ipAddressList, + mConnCb->peerStatus(ent.id, ent.laddr, ent.raddr, ent.type, 0, RS_CB_DHT); } diff --git a/libretroshare/src/pqi/pqi_base.h b/libretroshare/src/pqi/pqi_base.h index 066950912..53e3e6dfa 100644 --- a/libretroshare/src/pqi/pqi_base.h +++ b/libretroshare/src/pqi/pqi_base.h @@ -139,7 +139,6 @@ virtual int notifyEvent(NetInterface *ni, int event) { return 0; } const uint32_t PQI_CONNECT_TCP = 0x0001; const uint32_t PQI_CONNECT_UDP = 0x0002; const uint32_t PQI_CONNECT_TUNNEL = 0x0003; -const uint32_t PQI_CONNECT_DO_NEXT_ATTEMPT = 0x0004; #define BIN_FLAGS_NO_CLOSE 0x0001 @@ -218,9 +217,6 @@ static const int NET_CONNECT_FAILED = 5; static const uint32_t NET_PARAM_CONNECT_DELAY = 1; static const uint32_t NET_PARAM_CONNECT_PERIOD = 2; static const uint32_t NET_PARAM_CONNECT_TIMEOUT = 3; -//static const uint32_t NET_PARAM_CONNECT_TUNNEL_SOURCE_PEER_ID = 4; -//static const uint32_t NET_PARAM_CONNECT_TUNNEL_RELAY_PEER_ID = 5; -//static const uint32_t NET_PARAM_CONNECT_TUNNEL_DEST_PEER_ID = 6; /*!