Browse Source

Test

etomic
jl777 8 years ago
parent
commit
dd3203147d
  1. 2
      .gitignore
  2. 11
      basilisk/basilisk_swap.c

2
.gitignore

@ -204,3 +204,5 @@ iguana/DB/SWAPS/3368214189-2405641584
iguana/DB/SWAPS/1133671270-1840176506 iguana/DB/SWAPS/1133671270-1840176506
iguana/DB/SWAPS/467927158-3437055573 iguana/DB/SWAPS/467927158-3437055573
iguana/DB/SWAPS/270159951-1269722638

11
basilisk/basilisk_swap.c

@ -2249,7 +2249,7 @@ void basilisk_psockinit(struct supernet_info *myinfo,struct basilisk_swap *swap,
void basilisk_swaploop(void *_swap) void basilisk_swaploop(void *_swap)
{ {
uint8_t *data; uint32_t expiration; uint32_t channel; int32_t retval=0,i,j,datalen,maxlen; struct supernet_info *myinfo; struct basilisk_swap *swap = _swap; uint8_t *data; uint32_t expiration; uint32_t channel; int32_t iters,retval=0,i,j,datalen,maxlen; struct supernet_info *myinfo; struct basilisk_swap *swap = _swap;
myinfo = swap->myinfoptr; myinfo = swap->myinfoptr;
fprintf(stderr,"start swap\n"); fprintf(stderr,"start swap\n");
maxlen = 1024*1024 + sizeof(*swap); maxlen = 1024*1024 + sizeof(*swap);
@ -2302,7 +2302,8 @@ void basilisk_swaploop(void *_swap)
myinfo->DEXactive = 0; myinfo->DEXactive = 0;
} }
printf("C r%u/q%u swapstate.%x retval.%d\n",swap->I.req.requestid,swap->I.req.quoteid,swap->I.statebits,retval); printf("C r%u/q%u swapstate.%x retval.%d\n",swap->I.req.requestid,swap->I.req.quoteid,swap->I.statebits,retval);
if ( retval == 0 && (swap->I.statebits & 0x40) == 0 ) // send fee iters = 0;
while ( retval == 0 && (swap->I.statebits & 0x40) == 0 && iters++ < 10 ) // send fee
{ {
if ( swap->connected == 0 ) if ( swap->connected == 0 )
basilisk_psockinit(myinfo,swap,swap->I.iambob != 0); basilisk_psockinit(myinfo,swap,swap->I.iambob != 0);
@ -2351,7 +2352,7 @@ void basilisk_swaploop(void *_swap)
{ {
sleep(DEX_SLEEP); sleep(DEX_SLEEP);
printf("bobscripts set error\n"); printf("bobscripts set error\n");
//continue; continue;
} }
} }
else else
@ -2389,8 +2390,8 @@ void basilisk_swaploop(void *_swap)
printf("%02x",swap->myfee.txbytes[i]); printf("%02x",swap->myfee.txbytes[i]);
printf(" fee %p %x\n",swap->myfee.txbytes,swap->I.statebits); printf(" fee %p %x\n",swap->myfee.txbytes,swap->I.statebits);
swap->I.statebits |= 0x40; swap->I.statebits |= 0x40;
//if ( swap->alicepayment.I.datalen != 0 && swap->alicepayment.I.spendlen > 0 ) if ( swap->alicepayment.I.datalen != 0 && swap->alicepayment.I.spendlen > 0 )
// break; break;
} }
else else
{ {

Loading…
Cancel
Save