mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-03 11:54:30 -04:00
* Added rstlvimage.cc to serialiser (missed in other checkin).
* Added Forum ID to configuration Manager. * added proper startup for p3Forums. * updated forums/distrib interfaces. * Switch Auto-Login on by default. * switched out lots of debugging. * add RM libretroshare.a to top-level Makefile. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@594 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
14dac82c85
commit
fe284b628a
11 changed files with 249 additions and 32 deletions
|
@ -65,7 +65,10 @@ const uint32_t CONFIG_TYPE_MSGS = 0x0004;
|
|||
const uint32_t CONFIG_TYPE_CACHE = 0x0005;
|
||||
|
||||
const uint32_t CONFIG_TYPE_RANK_LINK = 0x0011;
|
||||
const uint32_t CONFIG_TYPE_QBLOG = 0x0012;
|
||||
|
||||
const uint32_t CONFIG_TYPE_QBLOG = 0x0012;
|
||||
|
||||
const uint32_t CONFIG_TYPE_FORUMS = 0x0013;
|
||||
|
||||
class p3ConfigMgr;
|
||||
class p3AuthMgr;
|
||||
|
|
|
@ -57,7 +57,6 @@ const uint32_t MAX_UPNP_INIT = 10; /* seconds UPnP timeout */
|
|||
* #define P3CONNMGR_NO_AUTO_CONNECTION 1
|
||||
***/
|
||||
|
||||
#define CONN_DEBUG 1
|
||||
|
||||
const uint32_t P3CONNMGR_TCP_DEFAULT_DELAY = 2; /* 2 Seconds? is it be enough! */
|
||||
const uint32_t P3CONNMGR_UDP_DHT_DELAY = DHT_NOTIFY_PERIOD + 60; /* + 1 minute for DHT POST */
|
||||
|
|
|
@ -574,17 +574,17 @@ int pqihandler::UpdateRates()
|
|||
extra_bw_out += crate_out - avg_rate_out;
|
||||
}
|
||||
//std::cerr << "\tSM(" << mod -> smi << ")";
|
||||
std::cerr << "In A: " << mod -> pqi -> getMaxRate(true);
|
||||
std::cerr << " C: " << crate_in;
|
||||
std::cerr << " && Out A: " << mod -> pqi -> getMaxRate(false);
|
||||
std::cerr << " C: " << crate_out << std::endl;
|
||||
//std::cerr << "In A: " << mod -> pqi -> getMaxRate(true);
|
||||
//std::cerr << " C: " << crate_in;
|
||||
//std::cerr << " && Out A: " << mod -> pqi -> getMaxRate(false);
|
||||
//std::cerr << " C: " << crate_out << std::endl;
|
||||
}
|
||||
std::cerr << "Totals (In) Used B/W " << used_bw_in;
|
||||
std::cerr << " Excess B/W " << extra_bw_in;
|
||||
std::cerr << " Available B/W " << avail_in << std::endl;
|
||||
std::cerr << "Totals (Out) Used B/W " << used_bw_out;
|
||||
std::cerr << " Excess B/W " << extra_bw_out;
|
||||
std::cerr << " Available B/W " << avail_out << std::endl;
|
||||
//std::cerr << "Totals (In) Used B/W " << used_bw_in;
|
||||
//std::cerr << " Excess B/W " << extra_bw_in;
|
||||
//std::cerr << " Available B/W " << avail_in << std::endl;
|
||||
//std::cerr << "Totals (Out) Used B/W " << used_bw_out;
|
||||
//std::cerr << " Excess B/W " << extra_bw_out;
|
||||
//std::cerr << " Available B/W " << avail_out << std::endl;
|
||||
|
||||
StoreCurrentRates(used_bw_in, used_bw_out);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue