lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

test

release/v0.1
jl777 9 years ago
parent
b17a3a33a9
commit
0a0f442468
2 changed files with 12 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      basilisk/basilisk_MSG.c
  2. 4
      basilisk/basilisk_swap.c

23
basilisk/basilisk_MSG.c
View File

@ -55,7 +55,7 @@ int32_t basilisk_ping_processMSG(struct supernet_info *myinfo,uint32_t senderipb
msg = &data[len], len += msglen; msg = &data[len], len += msglen;
if ( msglen <= 0 || len > datalen ) if ( msglen <= 0 || len > datalen )
return(0); return(0);
printf("i.%d: keylen.%d msglen.%d\n",i,keylen,msglen); //printf("i.%d: keylen.%d msglen.%d\n",i,keylen,msglen);
basilisk_respond_sendmessage(myinfo,key,keylen,msg,msglen,0); basilisk_respond_sendmessage(myinfo,key,keylen,msg,msglen,0);
} }
} }
@ -73,7 +73,7 @@ int32_t basilisk_ping_genMSG(struct supernet_info *myinfo,uint8_t *data,int32_t
datalen += iguana_rwnum(1,&data[datalen],sizeof(msg->datalen),&msg->datalen); datalen += iguana_rwnum(1,&data[datalen],sizeof(msg->datalen),&msg->datalen);
if ( maxlen > datalen+msg->datalen ) 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; memcpy(&data[datalen],msg->data,msg->datalen), datalen += msg->datalen;
} }
else else
@ -81,11 +81,11 @@ int32_t basilisk_ping_genMSG(struct supernet_info *myinfo,uint8_t *data,int32_t
printf("basilisk_ping_genMSG message doesnt fit %d vs %d\n",maxlen,datalen+msg->datalen); printf("basilisk_ping_genMSG message doesnt fit %d vs %d\n",maxlen,datalen+msg->datalen);
datalen = 0; datalen = 0;
} }
printf("\n-> "); //printf("\n-> ");
int32_t i; //int32_t i;
for (i=0; i<datalen; i++) //for (i=0; i<datalen; i++)
printf("%02x",data[i]); // printf("%02x",data[i]);
printf(" <- genMSG\n"); //printf(" <- genMSG\n");
} else data[datalen++] = 0; } else data[datalen++] = 0;
return(datalen); return(datalen);
} }
@ -103,9 +103,8 @@ char *basilisk_respond_getmessage(struct supernet_info *myinfo,uint8_t *key,int3
{ {
jadd(retjson,"message",msgjson); jadd(retjson,"message",msgjson);
jaddstr(retjson,"result","success"); jaddstr(retjson,"result","success");
printf("getmessage.(%s)\n",jprint(retjson,0)); //printf("getmessage.(%s)\n",jprint(retjson,0));
} } else jaddstr(retjson,"error","couldnt add message");
else jaddstr(retjson,"error","couldnt add message");
} else jaddstr(retjson,"error","no message"); } else jaddstr(retjson,"error","no message");
portable_mutex_unlock(&myinfo->messagemutex); portable_mutex_unlock(&myinfo->messagemutex);
return(jprint(retjson,1)); return(jprint(retjson,1));
@ -128,7 +127,7 @@ char *basilisk_respond_OUT(struct supernet_info *myinfo,char *CMD,void *addr,cha
{ {
int32_t keylen; uint8_t key[64]; int32_t keylen; uint8_t key[64];
keylen = basilisk_messagekey(key,hash,valsobj); keylen = basilisk_messagekey(key,hash,valsobj);
printf("keylen.%d datalen.%d\n",keylen,datalen); //printf("keylen.%d datalen.%d\n",keylen,datalen);
return(basilisk_respond_sendmessage(myinfo,key,keylen,data,datalen,1)); return(basilisk_respond_sendmessage(myinfo,key,keylen,data,datalen,1));
} }
@ -199,7 +198,7 @@ int32_t basilisk_channelget(struct supernet_info *myinfo,bits256 hash,uint32_t c
jaddnum(valsobj,"msgid",msgid); jaddnum(valsobj,"msgid",msgid);
if ( (retstr= basilisk_getmessage(myinfo,0,0,0,hash,valsobj,0)) != 0 ) if ( (retstr= basilisk_getmessage(myinfo,0,0,0,hash,valsobj,0)) != 0 )
{ {
printf("getmessage.(%s)\n",retstr); //printf("getmessage.(%s)\n",retstr);
if ( (retjson= cJSON_Parse(retstr)) != 0 ) if ( (retjson= cJSON_Parse(retstr)) != 0 )
{ {
if ( (msgobj= jobj(retjson,"message")) != 0 ) if ( (msgobj= jobj(retjson,"message")) != 0 )

4
basilisk/basilisk_swap.c
View File

@ -212,7 +212,7 @@ void basilisk_rawtx_setparms(struct supernet_info *myinfo,struct basilisk_swap *
if ( rawtx->vouttype <= 1 && rawtx->destaddr[0] != 0 ) if ( rawtx->vouttype <= 1 && rawtx->destaddr[0] != 0 )
{ {
rawtx->spendlen = bitcoin_standardspend(rawtx->spendscript,0,rawtx->rmd160); rawtx->spendlen = bitcoin_standardspend(rawtx->spendscript,0,rawtx->rmd160);
if ( 0 && vintype == 0 && basilisk_rawtx_gen("setparms",myinfo,swap,1,rawtx,0,rawtx->spendscript,rawtx->spendlen,coin->chain->txfee,1) < 0 ) if ( vintype == 0 && basilisk_rawtx_gen("setparms",myinfo,swap,1,rawtx,0,rawtx->spendscript,rawtx->spendlen,coin->chain->txfee,1) < 0 )
printf("error generating vintype.%d vouttype.%d -> %s\n",vintype,vouttype,rawtx->destaddr); printf("error generating vintype.%d vouttype.%d -> %s\n",vintype,vouttype,rawtx->destaddr);
} }
} }
@ -405,10 +405,8 @@ int32_t basilisk_swapdata_deck(struct supernet_info *myinfo,struct basilisk_swap
int32_t basilisk_verify_otherdeck(struct supernet_info *myinfo,struct basilisk_swap *swap,uint8_t *data,int32_t datalen) int32_t basilisk_verify_otherdeck(struct supernet_info *myinfo,struct basilisk_swap *swap,uint8_t *data,int32_t datalen)
{ {
int32_t i,len = 0; int32_t i,len = 0;
printf("verify otherdeck.%d\n",datalen);
for (i=0; i<sizeof(swap->otherdeck)/sizeof(swap->otherdeck[0][0]); i++) for (i=0; i<sizeof(swap->otherdeck)/sizeof(swap->otherdeck[0][0]); i++)
len += iguana_rwnum(0,&data[len],sizeof(swap->otherdeck[i>>1][i&1]),&swap->otherdeck[i>>1][i&1]); len += iguana_rwnum(0,&data[len],sizeof(swap->otherdeck[i>>1][i&1]),&swap->otherdeck[i>>1][i&1]);
printf("verified\n");
return(0); return(0);
} }

Write Preview
Loading…
Cancel
Save