Browse Source

test

release/v0.1
jl777 8 years ago
committed by Christopher Valerio
parent
commit
8580e34734
  1. 2
      basilisk/basilisk.c
  2. 2
      iguana/iguana777.c
  3. 2
      iguana/iguana_msg.c
  4. 6
      iguana/iguana_peers.c
  5. 2
      iguana/iguana_ramchain.c
  6. 2
      iguana/iguana_spendvectors.c
  7. 6
      iguana/iguana_tx.c

2
basilisk/basilisk.c

@ -367,6 +367,8 @@ struct basilisk_item *basilisk_requestservice(struct supernet_info *myinfo,struc
if ( (timeoutmillis= jint(valsobj,"timeout")) == 0 ) if ( (timeoutmillis= jint(valsobj,"timeout")) == 0 )
timeoutmillis = BASILISK_TIMEOUT; timeoutmillis = BASILISK_TIMEOUT;
minfanout = sqrt(NUMRELAYS)+1; minfanout = sqrt(NUMRELAYS)+1;
if ( minfanout < 5 )
minfanout = 5;
if ( jobj(valsobj,"fanout") == 0 ) if ( jobj(valsobj,"fanout") == 0 )
fanout = minfanout; fanout = minfanout;
else fanout = jint(valsobj,"fanout"); else fanout = jint(valsobj,"fanout");

2
iguana/iguana777.c

@ -857,7 +857,7 @@ void iguana_coinloop(void *arg)
addr = &coin->peers->active[(i+j) % IGUANA_MAXPEERS]; addr = &coin->peers->active[(i+j) % IGUANA_MAXPEERS];
if ( addr->usock >= 0 && addr->msgcounts.verack == 0 ) if ( addr->usock >= 0 && addr->msgcounts.verack == 0 )
{ {
printf("i.%d j.%d mainloop %s\n",i,j,addr->ipaddr); //printf("i.%d j.%d mainloop %s\n",i,j,addr->ipaddr);
iguana_send_version(coin,addr,coin->myservices); iguana_send_version(coin,addr,coin->myservices);
break; break;
} }

2
iguana/iguana_msg.c

@ -350,7 +350,7 @@ int32_t iguana_send_version(struct iguana_info *coin,struct iguana_peer *addr,ui
if ( coin->FULLNODE != 0 || coin->VALIDATENODE != 0 ) if ( coin->FULLNODE != 0 || coin->VALIDATENODE != 0 )
sprintf(msg.strSubVer,"/iguana 0.00/"); sprintf(msg.strSubVer,"/iguana 0.00/");
else sprintf(msg.strSubVer,"/basilisk 0.00/"); else sprintf(msg.strSubVer,"/basilisk 0.00/");
printf("SEND.(%s) -> (%s)\n",msg.strSubVer,addr->ipaddr); //printf("SEND.(%s) -> (%s)\n",msg.strSubVer,addr->ipaddr);
//sprintf(msg.strSubVer,"/Satoshi:0.10.0/"); //sprintf(msg.strSubVer,"/Satoshi:0.10.0/");
msg.nStartingHeight = coin->blocks.hwmchain.height; msg.nStartingHeight = coin->blocks.hwmchain.height;
iguana_gotdata(coin,addr,msg.nStartingHeight); iguana_gotdata(coin,addr,msg.nStartingHeight);

6
iguana/iguana_peers.c

@ -484,7 +484,7 @@ int32_t iguana_send(struct iguana_info *coin,struct iguana_peer *addr,uint8_t *s
printf("skip.(%s) since no verack yet\n",cmdstr); printf("skip.(%s) since no verack yet\n",cmdstr);
return(-1); return(-1);
} }
printf("%s -> %s\n",cmdstr,addr->ipaddr); //printf("%s -> %s\n",cmdstr,addr->ipaddr);
if ( strcmp(cmdstr,"ping") == 0 ) if ( strcmp(cmdstr,"ping") == 0 )
addr->sendmillis = OS_milliseconds(); addr->sendmillis = OS_milliseconds();
if ( len > IGUANA_MAXPACKETSIZE ) if ( len > IGUANA_MAXPACKETSIZE )
@ -517,7 +517,7 @@ int32_t iguana_send(struct iguana_info *coin,struct iguana_peer *addr,uint8_t *s
} }
} }
addr->totalsent += len; addr->totalsent += len;
printf(" (%s) sent.%d bytes to %s\n",cmdstr,len,addr->ipaddr); printf("verack.%d (%s) sent.%d bytes to %s\n",addr->msgcounts.verack,cmdstr,len,addr->ipaddr);
return(len); return(len);
} }
@ -545,7 +545,7 @@ int32_t iguana_queue_send(struct iguana_peer *addr,int32_t delay,uint8_t *serial
packet->embargo.millis += delay; packet->embargo.millis += delay;
} }
memcpy(packet->serialized,serialized,datalen); memcpy(packet->serialized,serialized,datalen);
printf("%p queue send.(%s) %d to (%s)\n",packet,serialized+4,datalen,addr->ipaddr); //printf("%p queue send.(%s) %d to (%s)\n",packet,serialized+4,datalen,addr->ipaddr);
queue_enqueue("sendQ",&addr->sendQ,&packet->DL,0); queue_enqueue("sendQ",&addr->sendQ,&packet->DL,0);
return(datalen); return(datalen);
} }

2
iguana/iguana_ramchain.c

@ -1307,7 +1307,7 @@ int32_t iguana_bundleremove(struct iguana_info *coin,int32_t hdrsi,int32_t tmpfi
struct iguana_bundle *bp; int32_t i; char fname[1024],str[65]; struct iguana_bundle *bp; int32_t i; char fname[1024],str[65];
if ( hdrsi >= 0 && hdrsi < coin->bundlescount && (bp= coin->bundles[hdrsi]) != 0 ) if ( hdrsi >= 0 && hdrsi < coin->bundlescount && (bp= coin->bundles[hdrsi]) != 0 )
{ {
printf("delete bundle.[%d]\n",hdrsi); printf("%s delete bundle.[%d]\n",coin->symbol,hdrsi);
if ( tmpfiles != 0 ) if ( tmpfiles != 0 )
{ {
for (i=0; i<bp->n; i++) for (i=0; i<bp->n; i++)

2
iguana/iguana_spendvectors.c

@ -1158,7 +1158,7 @@ int32_t iguana_bundlevalidate(struct supernet_info *myinfo,struct iguana_info *c
} // else printf("skip validate.[%d] validated.%u force.%d\n",bp->hdrsi,bp->validated,forceflag); } // else printf("skip validate.[%d] validated.%u force.%d\n",bp->hdrsi,bp->validated,forceflag);
if ( errs != 0 ) if ( errs != 0 )
{ {
printf("remove.[%d]\n",bp->hdrsi); printf("%s remove.[%d]\n",coin->symbol,bp->hdrsi);
iguana_bundleremove(coin,bp->hdrsi,0); iguana_bundleremove(coin,bp->hdrsi,0);
} }
return(bp->n - errs); return(bp->n - errs);

6
iguana/iguana_tx.c

@ -157,7 +157,7 @@ struct iguana_txid *iguana_blocktx(struct iguana_info *coin,struct iguana_txid *
return(0); return(0);
} else printf("iguana_blocktx null txidind [%d:%d] i.%d\n",block->hdrsi,block->bundlei,i); } else printf("iguana_blocktx null txidind [%d:%d] i.%d\n",block->hdrsi,block->bundlei,i);
} else printf("iguana_blocktx no bp.[%d]\n",block->hdrsi); } else printf("iguana_blocktx no bp.[%d]\n",block->hdrsi);
} else printf("blocktx illegal height.%d\n",block->height); } else printf("%s blocktx illegal height.%d\n",coin->symbol,block->height);
} else printf("i.%d vs txn_count.%d\n",i,block->RO.txn_count); } else printf("i.%d vs txn_count.%d\n",i,block->RO.txn_count);
return(0); return(0);
} }
@ -266,7 +266,7 @@ int32_t iguana_peerblockrequest(struct supernet_info *myinfo,struct iguana_info
} }
else else
{ {
printf("null tx error getting txi.%d [%d:%d]\n",i,bp->hdrsi,bundlei); printf("%s null tx error getting txi.%d [%d:%d]\n",coin->symbol,i,bp->hdrsi,bundlei);
break; break;
} }
} }
@ -320,7 +320,7 @@ int32_t iguana_peerblockrequest(struct supernet_info *myinfo,struct iguana_info
} }
} else printf("iguana_peerblockrequest: error merkle cmp tx.[%d] for ht.%d\n",i,bp->bundleheight+bundlei); } else printf("iguana_peerblockrequest: error merkle cmp tx.[%d] for ht.%d\n",i,bp->bundleheight+bundlei);
} else printf("iguana_peerblockrequest: error merkle verify tx.[%d] for ht.%d\n",i,bp->bundleheight+bundlei); } else printf("iguana_peerblockrequest: error merkle verify tx.[%d] for ht.%d\n",i,bp->bundleheight+bundlei);
} else printf("iguana_peerblockrequest: error getting tx.[%d] for ht.%d block.%p main.%d ht.%d\n",i,bp->bundleheight+bundlei,block,block!=0?block->mainchain:-1,block!=0?block->height:-1); } else printf("%s iguana_peerblockrequest: error getting tx.[%d] for ht.%d block.%p main.%d ht.%d\n",coin->symbol,i,bp->bundleheight+bundlei,block,block!=0?block->mainchain:-1,block!=0?block->height:-1);
} }
else else
{ {

Loading…
Cancel
Save