Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
ea2935a068
  1. 6
      iguana/iguana_bundles.c
  2. 4
      iguana/iguana_recv.c

6
iguana/iguana_bundles.c

@ -530,7 +530,7 @@ int32_t iguana_bundlerequests(struct iguana_info *coin,uint8_t missings[IGUANA_M
if ( (block= iguana_bundleblock(coin,&hash2,bp,nonz)) != 0 ) if ( (block= iguana_bundleblock(coin,&hash2,bp,nonz)) != 0 )
hash2 = block->RO.hash2; hash2 = block->RO.hash2;
bp->issued[nonz] = now; bp->issued[nonz] = now;
//char str[65]; printf("issue.[%d:%d] %s %u\n",bp->hdrsi,nonz,bits256_str(str,hash2),now); char str[65]; printf("issue.[%d:%d] %s %u\n",bp->hdrsi,nonz,bits256_str(str,hash2),now);
nonz++; nonz++;
} else printf("bundlerequests unexpected nonz.%d c.%d m.%d n.%d numsent.%d i.%d\n",nonz,c,m,n,numsent,i); } else printf("bundlerequests unexpected nonz.%d c.%d m.%d n.%d numsent.%d i.%d\n",nonz,c,m,n,numsent,i);
} }
@ -870,6 +870,8 @@ int32_t iguana_bundlemissings(struct iguana_info *coin,struct iguana_bundle *bp,
{ {
uint8_t missings[IGUANA_MAXBUNDLESIZE/8+1]; int32_t tmp,missing,avail,n,max; uint8_t missings[IGUANA_MAXBUNDLESIZE/8+1]; int32_t tmp,missing,avail,n,max;
missing = iguana_blocksmissing(coin,&avail,missings,0,bp,0,lag); missing = iguana_blocksmissing(coin,&avail,missings,0,bp,0,lag);
if ( strcmp("BTC",coin->symbol) != 0 )
lag /= 10;
if ( bp->numissued < bp->n ) if ( bp->numissued < bp->n )
max = bp->numissued; max = bp->numissued;
else max = bp->origmissings; else max = bp->origmissings;
@ -1038,7 +1040,7 @@ void iguana_bundlestats(struct iguana_info *coin,char *str,int32_t lag)
{ {
if ( (block= iguana_bundleblock(coin,&hash2,bp,i)) == 0 && bits256_nonz(hash2) != 0 ) if ( (block= iguana_bundleblock(coin,&hash2,bp,i)) == 0 && bits256_nonz(hash2) != 0 )
block = iguana_blockfind(coin,hash2); block = iguana_blockfind(coin,hash2);
if ( block == 0 || _iguana_chainlink(coin,block) == 0 ) if ( block == 0 || bits256_nonz(block->RO.prev_block) == 0 || _iguana_chainlink(coin,block) == 0 )
break; break;
} }
} }

4
iguana/iguana_recv.c

@ -309,13 +309,13 @@ void iguana_gotblockM(struct iguana_info *coin,struct iguana_peer *addr,struct i
{ {
numDuplicates++; numDuplicates++;
sizeDuplicates += recvlen; sizeDuplicates += recvlen;
//printf("duplicate [%d:%d] %s\n",bp->hdrsi,bundlei,bits256_str(str,block->RO.hash2)); printf("duplicate [%d:%d] %s\n",bp->hdrsi,bundlei,bits256_str(str,block->RO.hash2));
if ( bits256_cmp(origtxdata->block.RO.hash2,block->RO.hash2) == 0 ) if ( bits256_cmp(origtxdata->block.RO.hash2,block->RO.hash2) == 0 )
return; return;
else printf("mismatched tx received? mainchain.%d\n",block->mainchain); else printf("mismatched tx received? mainchain.%d\n",block->mainchain);
if ( block->mainchain != 0 ) if ( block->mainchain != 0 )
return; return;
} //else printf("recv [%d:%d] %s\n",bp->hdrsi,bundlei,bits256_str(str,block->RO.hash2)); } else printf("recv [%d:%d] %s\n",bp->hdrsi,bundlei,bits256_str(str,block->RO.hash2));
block->RO = origtxdata->block.RO; block->RO = origtxdata->block.RO;
block->txvalid = 1; block->txvalid = 1;
//printf("update prev for [%d:%d]\n",bp->hdrsi,bundlei); //printf("update prev for [%d:%d]\n",bp->hdrsi,bundlei);

Loading…
Cancel
Save