Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
43a83191b7
  1. 2
      iguana/iguana777.h
  2. 4
      iguana/iguana_peers.c
  3. 8
      iguana/iguana_recv.c

2
iguana/iguana777.h

@ -29,7 +29,7 @@
#define IGUANA_HEIGHT 200 #define IGUANA_HEIGHT 200
#define IGUANA_MAXPENDHDRS 1 #define IGUANA_MAXPENDHDRS 1
#define _IGUANA_MAXPENDING 64 //64 #define _IGUANA_MAXPENDING 3 //64
#define _IGUANA_MAXBUNDLES 8 #define _IGUANA_MAXBUNDLES 8
#define IGUANA_MAXACTIVEBUNDLES 32 #define IGUANA_MAXACTIVEBUNDLES 32
#define IGUANA_MAXFILES 4096 #define IGUANA_MAXFILES 4096

4
iguana/iguana_peers.c

@ -471,7 +471,7 @@ void iguana_parsebuf(struct iguana_info *coin,struct iguana_peer *addr,struct ig
if ( memcmp(&checkH,H,sizeof(checkH)) == 0 ) if ( memcmp(&checkH,H,sizeof(checkH)) == 0 )
{ {
//if ( strcmp(addr->ipaddr,"127.0.0.1") == 0 ) //if ( strcmp(addr->ipaddr,"127.0.0.1") == 0 )
//printf("%s parse.(%s) len.%d\n",addr->ipaddr,H->command,len); printf("%s parse.(%s) len.%d\n",addr->ipaddr,H->command,len);
//printf("addr->dead.%u\n",addr->dead); //printf("addr->dead.%u\n",addr->dead);
if ( strcmp(H->command,"block") == 0 || strcmp(H->command,"tx") == 0 ) if ( strcmp(H->command,"block") == 0 || strcmp(H->command,"tx") == 0 )
{ {
@ -937,7 +937,7 @@ void iguana_dedicatedloop(struct iguana_info *coin,struct iguana_peer *addr)
{ {
if ( req->datalen != 0 ) if ( req->datalen != 0 )
{ {
//char str[65]; printf("CACHE parse[%d] %s %s\n",req->recvlen,req->H.command,bits256_str(str,req->block.RO.hash2)); char str[65]; printf("CACHE parse[%d] %s %s\n",req->recvlen,req->H.command,bits256_str(str,req->block.RO.hash2));
iguana_parsebuf(coin,addr,&req->H,req->serialized,req->recvlen); iguana_parsebuf(coin,addr,&req->H,req->serialized,req->recvlen);
} else printf("CACHE error no datalen\n"); } else printf("CACHE error no datalen\n");
coin->cachefreed++; coin->cachefreed++;

8
iguana/iguana_recv.c

@ -154,7 +154,7 @@ void iguana_gotblockM(struct iguana_info *coin,struct iguana_peer *addr,struct i
bp = 0, bundlei = -2; bp = 0, bundlei = -2;
if ( copyflag != 0 && recvlen != 0 && ((bp= iguana_bundlefind(coin,&bp,&bundlei,origtxdata->block.RO.hash2)) == 0 || (bp->blocks[bundlei] != 0 && bp->blocks[bundlei]->fpipbits == 0)) ) if ( copyflag != 0 && recvlen != 0 && ((bp= iguana_bundlefind(coin,&bp,&bundlei,origtxdata->block.RO.hash2)) == 0 || (bp->blocks[bundlei] != 0 && bp->blocks[bundlei]->fpipbits == 0)) )
{ {
//printf("copy %p serialized[%d]\n",req->serialized,req->recvlen); printf("copy %p serialized[%d]\n",req->serialized,req->recvlen);
memcpy(req->serialized,data,recvlen), req->copyflag = 1; memcpy(req->serialized,data,recvlen), req->copyflag = 1;
} }
txdata = origtxdata; txdata = origtxdata;
@ -463,7 +463,7 @@ struct iguana_bundlereq *iguana_recvblock(struct iguana_info *coin,struct iguana
struct iguana_bundle *prevbp=0,*bp=0; int32_t prevbundlei=-2,bundlei = -2; struct iguana_block *prevblock,*block; struct iguana_bundle *prevbp=0,*bp=0; int32_t prevbundlei=-2,bundlei = -2; struct iguana_block *prevblock,*block;
bp = iguana_bundleset(coin,&block,&bundlei,origblock); bp = iguana_bundleset(coin,&block,&bundlei,origblock);
//static int total; char str[65]; printf("RECV %s [%d:%d] block.%08x | %d\n",bits256_str(str,origblock->RO.hash2),bp!=0?bp->hdrsi:-1,bundlei,block->fpipbits,total++); static int total; char str[65]; printf("RECV %s [%d:%d] block.%08x | %d\n",bits256_str(str,origblock->RO.hash2),bp!=0?bp->hdrsi:-1,bundlei,block->fpipbits,total++);
iguana_bundlefind(coin,&prevbp,&prevbundlei,origblock->RO.prev_block); iguana_bundlefind(coin,&prevbp,&prevbundlei,origblock->RO.prev_block);
if ( prevbp != 0 && prevbundlei >= 0 && (prevblock= iguana_blockfind(coin,origblock->RO.prev_block)) != 0 ) if ( prevbp != 0 && prevbundlei >= 0 && (prevblock= iguana_blockfind(coin,origblock->RO.prev_block)) != 0 )
{ {
@ -499,7 +499,7 @@ struct iguana_bundlereq *iguana_recvblock(struct iguana_info *coin,struct iguana
block->RO.recvlen = recvlen; block->RO.recvlen = recvlen;
if ( req->copyflag != 0 && block->queued == 0 )//block->rawdata == 0 ) if ( req->copyflag != 0 && block->queued == 0 )//block->rawdata == 0 )
{ {
//char str[65]; printf("%s copyflag.%d %d data %d %d\n",bits256_str(str,block->RO.hash2),req->copyflag,block->height,req->recvlen,recvlen); char str[65]; printf("%s copyflag.%d %d data %d %d\n",bits256_str(str,block->RO.hash2),req->copyflag,block->height,req->recvlen,recvlen);
//block->rawdata = mycalloc('n',1,block->RO.recvlen); //block->rawdata = mycalloc('n',1,block->RO.recvlen);
//memcpy(block->rawdata,req->serialized,block->RO.recvlen); //memcpy(block->rawdata,req->serialized,block->RO.recvlen);
//block->copyflag = 1; //block->copyflag = 1;
@ -582,7 +582,7 @@ int32_t iguana_reqhdrs(struct iguana_info *coin)
int32_t i,lag,n = 0; struct iguana_bundle *bp; char hashstr[65]; int32_t i,lag,n = 0; struct iguana_bundle *bp; char hashstr[65];
if ( iguana_needhdrs(coin) > 0 && queue_size(&coin->hdrsQ) == 0 ) if ( iguana_needhdrs(coin) > 0 && queue_size(&coin->hdrsQ) == 0 )
{ {
if ( coin->zcount++ > 1 ) ///if ( coin->zcount++ > 1 )
{ {
for (i=0; i<coin->bundlescount; i++) for (i=0; i<coin->bundlescount; i++)
{ {

Loading…
Cancel
Save