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
This commit is contained in:
drbob 2010-06-25 22:09:07 +00:00
parent 5df785ed4e
commit bfa9965c9b
2 changed files with 1 additions and 5 deletions

View File

@ -1757,7 +1757,7 @@ bool p3DhtMgr::dhtResultSearch(std::string idhash,
if (doCb)
{
std::list<IpAddressTimed> ipAddressList;
mConnCb->peerStatus(ent.id, ent.laddr, ent.raddr, ipAddressList,
mConnCb->peerStatus(ent.id, ent.laddr, ent.raddr,
ent.type, 0, RS_CB_DHT);
}

View File

@ -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;
/*!