From 4d9d948185043e3ba42f6323a31d395831409352 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 28 Mar 2016 20:29:19 -0300 Subject: [PATCH] test --- iguana/iguana777.h | 2 +- iguana/iguana_bundles.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 5cd3bcafe..aac6091e7 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -26,7 +26,7 @@ typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t //#define IGUANA_SERIALIZE_SPENDVECTORGEN //#define IGUANA_SERIALIZE_BALANCEGEN //#define IGUANA_DISABLEPEERS -#define _IGUANA_MAXSTUCKTIME 3600 +#define _IGUANA_MAXSTUCKTIME 300 #define IGUANA_MAXITERATIONS 10000 #define IGUANA_MAXCOINS 64 diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index 4de2634d2..4b9222441 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -506,14 +506,14 @@ int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int } for (j=0; jn; j++) { - if ( (block= bp->blocks[j]) != 0 && block->peerid == i && block->fpipbits == 0 ) + if ( (block= bp->blocks[j]) != 0 && block->peerid == i && iguana_blockstatus(coin,block) == 0 ) { if ( bp == coin->current ) printf("%d ",j); flag++; counter++; block->peerid = 0; - iguana_blockQ("kick",coin,bp,j,block->RO.hash2,0); + iguana_blockQ("kick",coin,bp,j,block->RO.hash2,bp == coin->current); if ( bp == coin->current ) bp->issued[i] = block->issued = now; } @@ -963,7 +963,7 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct OS_memspace *mem,stru { printf("[%d:%d] ",bp->hdrsi,i); iguana_blockQ("stuck",coin,bp,i,block->RO.hash2,0); - //iguana_blockQ("stuck",coin,bp,i,block->RO.hash2,1); + iguana_blockQ("stuck",coin,bp,i,block->RO.hash2,1); if ( coin->peers.numranked > 8 && (addr= coin->peers.ranked[n % 8]) != 0 && addr->usock >= 0 && addr->dead == 0 && addr->msgcounts.verack != 0 ) { if ( (len= iguana_getdata(coin,serialized,MSG_BLOCK,&block->RO.hash2,1)) > 0 )