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

Test

etomic
jl777 8 years ago
parent
1154a447f5
commit
8e1d188be6
2 changed files with 7 additions and 5 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. 2
      .gitignore
  2. 10
      basilisk/basilisk_swap.c

2
.gitignore
View File

@ -282,3 +282,5 @@ iguana/DB/SWAPS/3408402932-4088991610
iguana/DB/SWAPS/3772541120-2007204891 iguana/DB/SWAPS/3772541120-2007204891
iguana/DB/SWAPS/784303571-1929722462 iguana/DB/SWAPS/784303571-1929722462
iguana/DB/SWAPS/3221116355-3522779294

10
basilisk/basilisk_swap.c
View File

@ -1164,7 +1164,7 @@ int32_t basilisk_swapget(struct supernet_info *myinfo,struct basilisk_swap *swap
if ( swap->subsock >= 0 ) if ( swap->subsock >= 0 )
nn_close(swap->subsock), swap->subsock = -1; nn_close(swap->subsock), swap->subsock = -1;
swap->connected = 0; swap->connected = 0;
basilisk_psockinit(myinfo,swap,0); basilisk_psockinit(myinfo,swap,swap->I.iambob != 0);
} }
mp = &swap->messages[i]; mp = &swap->messages[i];
if ( msgbits != 0x80000000 ) if ( msgbits != 0x80000000 )
@ -1199,7 +1199,7 @@ uint32_t basilisk_swapsend(struct supernet_info *myinfo,struct basilisk_swap *sw
nn_close(swap->pushsock), swap->pushsock = -1; nn_close(swap->pushsock), swap->pushsock = -1;
if ( swap->subsock >= 0 ) if ( swap->subsock >= 0 )
nn_close(swap->subsock), swap->subsock = -1; nn_close(swap->subsock), swap->subsock = -1;
swap->connected = 0; swap->connected = swap->I.iambob != 0 ? -1 : 0;
} }
} }
//else printf("send.[%d] %x offset.%d datalen.%d [%llx]\n",sentbytes,msgbits,offset,datalen,*(long long *)data); //else printf("send.[%d] %x offset.%d datalen.%d [%llx]\n",sentbytes,msgbits,offset,datalen,*(long long *)data);
@ -2232,7 +2232,7 @@ void basilisk_psockinit(struct supernet_info *myinfo,struct basilisk_swap *swap,
return; return;
} }
sprintf(keystr,"%08x-%08x",swap->I.req.requestid,swap->I.req.quoteid); sprintf(keystr,"%08x-%08x",swap->I.req.requestid,swap->I.req.quoteid);
if ( (retstr= _dex_kvsearch(myinfo,"KV",keystr)) != 0 ) if ( swap->connected == 0 && (retstr= _dex_kvsearch(myinfo,"KV",keystr)) != 0 )
{ {
if ( (retjson= cJSON_Parse(retstr)) != 0 ) if ( (retjson= cJSON_Parse(retstr)) != 0 )
{ {
@ -2258,7 +2258,7 @@ void basilisk_psockinit(struct supernet_info *myinfo,struct basilisk_swap *swap,
printf("KVsearch.(%s) connected.%d socks.(%d %d)\n",retstr,swap->connected,swap->pushsock,swap->subsock); printf("KVsearch.(%s) connected.%d socks.(%d %d)\n",retstr,swap->connected,swap->pushsock,swap->subsock);
free(retstr); free(retstr);
} }
if ( swap->connected == 0 && amlp != 0 ) if ( swap->connected <= 0 && amlp != 0 )
{ {
if ( (retstr= _dex_psock(myinfo,"{}")) != 0 ) if ( (retstr= _dex_psock(myinfo,"{}")) != 0 )
{ {
@ -2349,7 +2349,7 @@ void basilisk_swaploop(void *_swap)
dex_channelsend(myinfo,swap->I.req.srchash,swap->I.req.desthash,channel,0x4000000,(void *)&swap->I.req.requestid,sizeof(swap->I.req.requestid)); //,60); dex_channelsend(myinfo,swap->I.req.srchash,swap->I.req.desthash,channel,0x4000000,(void *)&swap->I.req.requestid,sizeof(swap->I.req.requestid)); //,60);
if ( swap->connected == 0 ) if ( swap->connected == 0 )
basilisk_psockinit(myinfo,swap,swap->I.iambob != 0); basilisk_psockinit(myinfo,swap,swap->I.iambob != 0);
if ( swap->connected != 0 ) if ( swap->connected > 0 )
{ {
printf("A r%u/q%u swapstate.%x\n",swap->I.req.requestid,swap->I.req.quoteid,swap->I.statebits); printf("A r%u/q%u swapstate.%x\n",swap->I.req.requestid,swap->I.req.quoteid,swap->I.statebits);
basilisk_sendstate(myinfo,swap,data,maxlen); basilisk_sendstate(myinfo,swap,data,maxlen);

Write Preview
Loading…
Cancel
Save