diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 77e95b12b..62c47f18e 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -269,6 +269,7 @@ void basilisk_sendback(struct supernet_info *myinfo,char *origCMD,char *symbol,c jaddbits256(valsobj,"chaintip",virt->blocks.hwmchain.RO.hash2); } data = basilisk_jsondata(sizeof(struct iguana_msghdr),&allocptr,space,sizeof(space),&datalen,symbol,valsobj,basilisktag); + printf("sendback.%d -> %s\n",datalen,remoteaddr); basilisk_sendcmd(myinfo,remoteaddr,"RET",&basilisktag,encryptflag,delaymillis,data,datalen,0,0); if ( allocptr != 0 ) free(allocptr); @@ -643,7 +644,7 @@ void basilisk_msgprocess(struct supernet_info *myinfo,void *_addr,uint32_t sende CMD[i] = toupper((int32_t)CMD[i]); cmd[i] = tolower((int32_t)CMD[i]); } - if ( 1 && strcmp(CMD,"RID") != 0 && strcmp(CMD,"MSG") != 0 ) + //if ( 1 && strcmp(CMD,"RID") != 0 && strcmp(CMD,"MSG") != 0 ) printf("MSGPROCESS %s.(%s) tag.%d\n",CMD,(char *)data,basilisktag); myinfo->basilisk_busy = 1; if ( valsobj != 0 ) @@ -682,7 +683,9 @@ void basilisk_msgprocess(struct supernet_info *myinfo,void *_addr,uint32_t sende free(retstr); break; } else printf("services null return\n"); - } else printf("non-relay got unexpected.(%s)\n",type); + } + else + printf("non-relay got unexpected.(%s)\n",type); } } free_json(valsobj); diff --git a/iguana/iguana_msg.c b/iguana/iguana_msg.c index a98c57e1b..468affa6a 100755 --- a/iguana/iguana_msg.c +++ b/iguana/iguana_msg.c @@ -817,7 +817,7 @@ int32_t iguana_intvectors(struct iguana_info *coin,struct iguana_peer *addr,int3 int32_t iguana_msgparser(struct iguana_info *coin,struct iguana_peer *addr,struct OS_memspace *rawmem,struct OS_memspace *txmem,struct OS_memspace *hashmem,struct iguana_msghdr *H,uint8_t *data,int32_t recvlen) { uint8_t serialized[16384]; char *ipaddr; struct supernet_info *myinfo = SuperNET_MYINFO(0); - int32_t i,n,retval=-1,ishost,srvmsg,bloom,sendlen=0,intvectors,len= -100; uint64_t nonce,x; bits256 hash2; + int32_t i,n=0,retval=-1,ishost,srvmsg,bloom,sendlen=0,intvectors,len= -100; uint64_t nonce,x; bits256 hash2; bloom = intvectors = srvmsg = -1; if ( strncmp(H->command+1,"uperNET",strlen("uperNET")) == 0 || strncmp(H->command,"uperNet",strlen("uperNet")) == 0 ) { @@ -872,8 +872,9 @@ int32_t iguana_msgparser(struct iguana_info *coin,struct iguana_peer *addr,struc else { len = iguana_peergetrequest(myinfo,coin,addr,data,recvlen,1); + //printf("peergetrequest len.%d\n",len); } - } + } else printf("command.(%s) addr.%p rawmemptr.%p\n",H->command,addr,rawmem->ptr); } else if ( (ishost= (strncmp(H->command,"inv",3) == 0)) || strncmp(H->command,"getdata",7) == 0 ) { diff --git a/iguana/iguana_peers.c b/iguana/iguana_peers.c index 08198aa8c..90c0557df 100755 --- a/iguana/iguana_peers.c +++ b/iguana/iguana_peers.c @@ -572,7 +572,7 @@ void iguana_parsebuf(struct iguana_info *coin,struct iguana_peer *addr,struct ig memset(&checkH,0,sizeof(checkH)); if ( iguana_sethdr(&checkH,coin->chain->netmagic,H->command,buf,len) > 0 && memcmp(&checkH,H,sizeof(checkH)) == 0 ) { - if ( strcmp(H->command,"block") == 0 || strcmp(H->command,"tx") == 0 ) + if ( strcmp(H->command,"block") == 0 || strcmp(H->command,"getblocks") == 0 || strcmp(H->command,"tx") == 0 ) { if ( addr->RAWMEM.ptr == 0 ) iguana_meminit(&addr->RAWMEM,addr->ipaddr,0,IGUANA_MAXPACKETSIZE * 2,0); diff --git a/iguana/iguana_wallet.c b/iguana/iguana_wallet.c index c73d606c5..e580c3bb6 100755 --- a/iguana/iguana_wallet.c +++ b/iguana/iguana_wallet.c @@ -194,7 +194,7 @@ struct iguana_waddress *iguana_waddresssearch(struct supernet_info *myinfo,struc } (*wacctp) = wacct; return(waddr); - } else printf("not in (%s)\n",wacct->account); + } //else printf("not in (%s)\n",wacct->account); } (*wacctp) = 0; return(0);