Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
1e1bf812ff
  1. 8
      basilisk/basilisk.c
  2. 1
      iguana/iguana_realtime.c

8
basilisk/basilisk.c

@ -588,7 +588,7 @@ int32_t basilisk_relays_ping(struct supernet_info *myinfo,uint8_t *data,int32_t
void basilisk_respond_ping(struct supernet_info *myinfo,struct iguana_peer *addr,uint32_t senderipbits,uint8_t *data,int32_t datalen) void basilisk_respond_ping(struct supernet_info *myinfo,struct iguana_peer *addr,uint32_t senderipbits,uint8_t *data,int32_t datalen)
{ {
int32_t diff,i,n,blocklen,len = 0; struct iguana_info *btcd,*virt; char ipbuf[64],symbol[7]; struct basilisk_relay *rp; uint8_t numrelays; uint32_t numvirts,height,now = (uint32_t)time(NULL); int32_t diff,i,n,blocklen,len = 0; struct iguana_info *btcd,*virt; char ipbuf[64],symbol[7],str[65]; struct basilisk_relay *rp; uint8_t numrelays; uint32_t numvirts,height,now = (uint32_t)time(NULL);
expand_ipbits(ipbuf,senderipbits); expand_ipbits(ipbuf,senderipbits);
btcd = iguana_coinfind("BTCD"); btcd = iguana_coinfind("BTCD");
for (i=0; i<myinfo->numrelays; i++) for (i=0; i<myinfo->numrelays; i++)
@ -613,8 +613,8 @@ void basilisk_respond_ping(struct supernet_info *myinfo,struct iguana_peer *addr
{ {
memcpy(symbol,&data[len],6), len += 6; memcpy(symbol,&data[len],6), len += 6;
len += iguana_rwvarint32(0,&data[len],&height); len += iguana_rwvarint32(0,&data[len],&height);
printf("(%s %d) ",symbol,height); printf("(%s %d).%p ",symbol,height,addr);
if ( addr != 0 && (virt= iguana_coinfind(symbol)) != 0 && virt->blocks.hwmchain.height > height && (height % myinfo->numrelays) == myinfo->RELAYID ) if ( myinfo->numrelays > 0 && addr != 0 && (virt= iguana_coinfind(symbol)) != 0 && virt->blocks.hwmchain.height > height && (height % myinfo->numrelays) == myinfo->RELAYID )
{ {
if ( (blocklen= iguana_peerblockrequest(virt,virt->blockspace,IGUANA_MAXPACKETSIZE,0,virt->blocks.hwmchain.RO.hash2,0)) > 0 ) if ( (blocklen= iguana_peerblockrequest(virt,virt->blockspace,IGUANA_MAXPACKETSIZE,0,virt->blocks.hwmchain.RO.hash2,0)) > 0 )
{ {
@ -624,7 +624,7 @@ void basilisk_respond_ping(struct supernet_info *myinfo,struct iguana_peer *addr
basilisk_blocksubmit(myinfo,btcd,virt,blockstr,virt->blocks.hwmchain.RO.hash2,height); basilisk_blocksubmit(myinfo,btcd,virt,blockstr,virt->blocks.hwmchain.RO.hash2,height);
if ( allocptr != 0 ) if ( allocptr != 0 )
free(allocptr); free(allocptr);
} } else printf("blocklen.%d for hwm.%d height.%d %s\n",blocklen,virt->blocks.hwmchain.height,height,bits256_str(str,virt->blocks.hwmchain.RO.hash2));
} }
} }
for (i=0; i<datalen; i++) for (i=0; i<datalen; i++)

1
iguana/iguana_realtime.c

@ -297,7 +297,6 @@ int32_t iguana_realtime_update(struct supernet_info *myinfo,struct iguana_info *
break; break;
dest = &coin->RTramchain; dest = &coin->RTramchain;
B = RAMCHAIN_PTR(rdata,Boffset); B = RAMCHAIN_PTR(rdata,Boffset);
//B = (void *)(long)((long)rdata + rdata->Boffset);
bundlei = (coin->RTheight % coin->chain->bundlesize); bundlei = (coin->RTheight % coin->chain->bundlesize);
if ( (block= iguana_bundleblock(coin,&hash2,bp,bundlei)) != 0 ) if ( (block= iguana_bundleblock(coin,&hash2,bp,bundlei)) != 0 )
iguana_bundlehashadd(coin,bp,bundlei,block); iguana_bundlehashadd(coin,bp,bundlei,block);

Loading…
Cancel
Save