Merge pull request #901 from jl777/jl777

fix overlapped alice swaps

iguana/exchanges/LP_include.h

@@ -581,6 +581,7 @@ int32_t LP_trades_canceluuid(char *uuidstr);
 int _decreasing_uint64(const void *a,const void *b);
 int32_t LP_alice_eligible(uint32_t quotetime);
 int32_t LP_is_slowcoin(char *symbol);
+void LP_alicequery_clear();
 
 void LP_listunspent_query(char *symbol,char *coinaddr);
 int32_t bitcoin_priv2wif(char *symbol,uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t addrtype);

iguana/exchanges/LP_socket.c

@@ -201,6 +201,7 @@ int32_t LP_socket(int32_t bindflag,char *hostname,uint16_t port)
 #endif
     if ( bindflag == 0 )
     {
+//#ifdef _WIN32
         if ( 1 ) // connect using async to allow timeout, then switch to sync
         {
             uint32_t starttime = (uint32_t)time(NULL);
@@ -213,6 +214,7 @@ int32_t LP_socket(int32_t bindflag,char *hostname,uint16_t port)
             timeout.tv_usec = 0;
             setsockopt(sock,SOL_SOCKET,SO_RCVTIMEO,(void *)&timeout,sizeof(timeout));
         }
+//#else
         else
         {
             result = connect(sock,(struct sockaddr *)&saddr,addrlen);
@@ -227,6 +229,7 @@ int32_t LP_socket(int32_t bindflag,char *hostname,uint16_t port)
                 return(-1);
             }
         }
+//#endif
     }
     else
     {

iguana/exchanges/LP_swap.c

@@ -939,6 +939,7 @@ void LP_bobloop(void *_swap)
 void LP_aliceloop(void *_swap)
 {
     uint8_t *data; char bobstr[65],alicestr[65]; int32_t bobwaittimeout,alicewaittimeout,maxlen,n,m,err=0; uint32_t expiration; struct basilisk_swap *swap = _swap;
+    LP_alicequery_clear();
     G.LP_pendingswaps++;
     LP_etomicsymbol(bobstr,swap->I.bobtomic,swap->I.bobstr);
     LP_etomicsymbol(alicestr,swap->I.alicetomic,swap->I.alicestr);