diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index d38a48ab5..0acb43c45 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -625,7 +625,7 @@ void basilisk_msgprocess(struct supernet_info *myinfo,void *_addr,uint32_t sende { if ( basilisk_specialcmd(CMD) == 0 ) return; - printf("MSGPROCESS %s.(%s) tag.%d\n",CMD,(char *)data,basilisktag); + //printf("MSGPROCESS %s.(%s) tag.%d\n",CMD,(char *)data,basilisktag); } symbol = "BTCD"; if ( senderipbits == 0 ) @@ -744,7 +744,7 @@ void basilisk_p2p(void *_myinfo,void *_addr,char *senderip,uint8_t *data,int32_t len += iguana_rwnum(0,data,sizeof(basilisktag),&basilisktag); //int32_t i; for (i=0; iRELAYID >= 0 ) + if ( 0 && myinfo->RELAYID >= 0 ) printf(" ->received.%d basilisk_p2p.(%s) from %s tag.%d\n",datalen,type,senderip!=0?senderip:"?",basilisktag); basilisk_msgprocess(myinfo,_addr,ipbits,type,basilisktag,&data[len],datalen - len); } @@ -887,7 +887,7 @@ HASH_ARRAY_STRING(basilisk,balances,hash,vals,hexstr) coin = iguana_coinfind(symbol); } if ( jobj(vals,"fanout") == 0 ) - jaddnum(vals,"fanout",8); + jaddnum(vals,"fanout",(int32_t)sqrt(myinfo->numrelays)); if ( jobj(vals,"numrequired") == 0 ) jaddnum(vals,"numrequired",myinfo->numrelays); if ( coin != 0 ) diff --git a/basilisk/basilisk_ping.c b/basilisk/basilisk_ping.c index 0c0af3a32..ee78a6639 100755 --- a/basilisk/basilisk_ping.c +++ b/basilisk/basilisk_ping.c @@ -152,7 +152,7 @@ int32_t basilisk_ping_genMSG(struct supernet_info *myinfo,uint8_t *data,int32_t datalen += iguana_rwnum(1,&data[datalen],sizeof(msg->duration),&msg->duration); if ( maxlen > datalen+msg->datalen ) { - printf("SEND keylen.%d msglen.%d\n",msg->keylen,msg->datalen); + //printf("SEND keylen.%d msglen.%d\n",msg->keylen,msg->datalen); memcpy(&data[datalen],msg->data,msg->datalen), datalen += msg->datalen; } else @@ -242,12 +242,12 @@ void basilisk_ping_process(struct supernet_info *myinfo,struct iguana_peer *addr //len += basilisk_ping_processDEX(myinfo,senderipbits,&data[len],datalen-len); len += basilisk_ping_processMSG(myinfo,senderipbits,&data[len],datalen-len); } - if ( len != datalen ) + if ( len != datalen+1 ) printf("PING got %d, processed.%d from (%s)\n",datalen,len,ipbuf); //else printf("\n"); //for (i=0; iRELAYID); + printf("<<<<<<<<<<< input ping from.(%s) rel.%d numrelays.%d datalen.%d relay.%d Q.%d\n",ipbuf,basilisk_relayid(myinfo,(uint32_t)calc_ipbits(ipbuf)),numrelays,datalen,myinfo->RELAYID,QUEUEITEMS); } int32_t basilisk_ping_gen(struct supernet_info *myinfo,uint8_t *data,int32_t maxlen) @@ -261,7 +261,7 @@ int32_t basilisk_ping_gen(struct supernet_info *myinfo,uint8_t *data,int32_t max datalen += basilisk_ping_genMSG(myinfo,&data[datalen],maxlen - datalen); //for (i=0; iRELAYID,QUEUEITEMS); + printf("output ping datalen.%d relay.%d >>>>>>>>>> Q.%d\n",datalen,myinfo->RELAYID,QUEUEITEMS); return(datalen); }