From 7e43f29b64f27b9eba2508598940f7d06acb0958 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 21 Mar 2016 22:31:21 -0300 Subject: [PATCH] test --- iguana/iguana_bundles.c | 2 +- iguana/iguana_recv.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index f1840a452..5ebbce4ff 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -814,7 +814,7 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct OS_memspace *mem,stru { max = bp->n; counter = iguana_bundleissue(coin,bp,max,timelimit); - if ( 1 && counter > 0 && bp->hdrsi == starti ) + if ( bp->hdrsi == starti ) printf("ITER now.%u spec.%-4d bundle.%-4d h.%-4d r.%-4d s.%-4d F.%d T.%d issued.%d mb.%d/%d\n",(uint32_t)time(NULL),bp->numspec,bp->bundleheight/coin->chain->bundlesize,bp->numhashes,bp->numrecv,bp->numsaved,bp->emitfinish,timelimit,counter,coin->MAXBUNDLES,coin->bundlescount); if ( bp == coin->current ) { diff --git a/iguana/iguana_recv.c b/iguana/iguana_recv.c index 53d7e5b7b..33eb56cf6 100755 --- a/iguana/iguana_recv.c +++ b/iguana/iguana_recv.c @@ -37,12 +37,12 @@ int32_t iguana_sendblockreqPT(struct iguana_info *coin,struct iguana_peer *addr, char hexstr[65]; init_hexbytes_noT(hexstr,hash2.bytes,sizeof(hash2)); if ( addr == 0 || memcmp(lastreq.bytes,hash2.bytes,sizeof(hash2)) == 0 || memcmp(lastreq2.bytes,hash2.bytes,sizeof(hash2)) == 0 ) { - //printf("duplicate req %s or null addr.%p\n",bits256_str(hexstr,hash2),addr); + printf("duplicate req %s or null addr.%p\n",bits256_str(hexstr,hash2),addr); return(0); } if ( addr->msgcounts.verack == 0 ) { - //printf("iguana_sendblockreq (%s) hasn't verack'ed yet\n",addr->ipaddr); + printf("iguana_sendblockreq (%s) hasn't verack'ed yet\n",addr->ipaddr); return(-1); } lastreq2 = lastreq; @@ -53,7 +53,7 @@ int32_t iguana_sendblockreqPT(struct iguana_info *coin,struct iguana_peer *addr, coin->numreqsent++; addr->pendblocks++; addr->pendtime = (uint32_t)time(NULL); - if ( 0 && coin->current == bp ) + //if ( 0 && coin->current == bp ) printf("REQ.%s bundlei.%d hdrsi.%d\n",bits256_str(hexstr,hash2),bundlei,bp!=0?bp->hdrsi:-1); } else printf("MSG_BLOCK null datalen.%d\n",len); return(len); @@ -641,9 +641,9 @@ struct iguana_bundlereq *iguana_recvblockhashes(struct iguana_info *coin,struct } //printf("no match to allhashes issue block1\n"); struct iguana_block *block; - if ( num == coin->chain->bundlesize+1 && (block= iguana_blockhashset(coin,-1,blockhashes[1],1)) != 0 ) + if ( (block= iguana_blockhashset(coin,-1,blockhashes[1],1)) != 0 ) { - block->blockhashes = blockhashes, req->hashes = 0; + //block->blockhashes = blockhashes, req->hashes = 0; //printf("set block->blockhashes[%d]\n",num); } if ( (addr= coin->peers.ranked[0]) != 0 ) @@ -653,7 +653,7 @@ struct iguana_bundlereq *iguana_recvblockhashes(struct iguana_info *coin,struct iguana_send(coin,addr,serialized,len); //char str[65]; printf("REQ.%s\n",bits256_str(str,blockhashes[1])); } - } + } else iguana_blockQ("hdr1",coin,0,-1,blockhashes[1],1); } else {