small fixes

This commit is contained in:
Evan Duffield 2014-08-11 06:54:57 -07:00
parent cd731ffacd
commit 5562513e1e
3 changed files with 5 additions and 5 deletions

View File

@ -9,7 +9,7 @@
#define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 10 #define CLIENT_VERSION_MINOR 10
#define CLIENT_VERSION_REVISION 12 #define CLIENT_VERSION_REVISION 12
#define CLIENT_VERSION_BUILD 19 #define CLIENT_VERSION_BUILD 20
// Set to true for release, false for prerelease or test build // Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true #define CLIENT_VERSION_IS_RELEASE true

View File

@ -3963,10 +3963,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
BOOST_FOREACH(CDarksendQueue q, vecDarksendQueue){ BOOST_FOREACH(CDarksendQueue q, vecDarksendQueue){
if(q.vin == dsq.vin) return true; if(q.vin == dsq.vin) return true;
} }
if(dsq.IsExpired()) return true;
printf("new darksend queue object - %s\n", addr.ToString().c_str()); printf("new darksend queue object - %s\n", addr.ToString().c_str());
vecDarksendQueue.push_back(dsq); vecDarksendQueue.push_back(dsq);
dsq.Relay(); dsq.Relay();
dsq.time = GetTime();
} else if (strCommand == "dsi") { //DarkSend vIn } else if (strCommand == "dsi") { //DarkSend vIn
if (pfrom->nVersion != darkSendPool.MIN_PEER_PROTO_VERSION) { if (pfrom->nVersion != darkSendPool.MIN_PEER_PROTO_VERSION) {
@ -6172,6 +6174,8 @@ void CDarkSendPool::Check()
} }
void CDarkSendPool::ChargeFees(){ void CDarkSendPool::ChargeFees(){
return; //don't charge fees
if(fMasterNode) { if(fMasterNode) {
int i = 0; int i = 0;
// who didn't sign? // who didn't sign?

View File

@ -2601,13 +2601,9 @@ public:
void Relay() void Relay()
{ {
printf("Relay\n");
LOCK(cs_vNodes); LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes) BOOST_FOREACH(CNode* pnode, vNodes)
{
printf("Relay dsq to peer\n");
pnode->PushMessage("dsq", (*this)); pnode->PushMessage("dsq", (*this));
}
} }
bool IsExpired() bool IsExpired()