Cmdchannel

iguana/exchanges/LP_commands.c

@@ -752,16 +752,17 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
         {
             if ( strcmp(method,"psock") == 0 )
             {
-                 if ( myipaddr == 0 || myipaddr[0] == 0 || strcmp(myipaddr,"127.0.0.1") == 0 )
-                 {
-                     if ( LP_mypeer != 0 )
-                         myipaddr = LP_mypeer->ipaddr;
-                     else printf("LP_psock dont have actual ipaddr?\n");
-                 }
-                 if ( jint(argjson,"ispaired") != 0 )
-                     return(LP_psock(myipaddr,jint(argjson,"ispaired")));
-                 else return(clonestr("{\"error\":\"you are running an obsolete version, update\"}"));
-             }
+                int32_t psock;
+                if ( myipaddr == 0 || myipaddr[0] == 0 || strcmp(myipaddr,"127.0.0.1") == 0 )
+                {
+                    if ( LP_mypeer != 0 )
+                        myipaddr = LP_mypeer->ipaddr;
+                    else printf("LP_psock dont have actual ipaddr?\n");
+                }
+                if ( jint(argjson,"ispaired") != 0 )
+                    return(LP_psock(&psock,myipaddr,1,jint(argjson,"cmdchannel")));
+                else return(clonestr("{\"error\":\"you are running an obsolete version, update\"}"));
+            }
         }
         else
         {

iguana/exchanges/LP_include.h

@@ -431,7 +431,7 @@ struct LP_pubkey_info
     struct LP_pubswap *bobswaps,*aliceswaps;
     int64_t dynamictrust,unconfcredits;
     uint32_t timestamp,numerrors,lasttime,slowresponse;
-    int32_t istrusted;
+    int32_t istrusted,pairsock;
     uint8_t rmd160[20],sig[65],pubsecp[33],siglen;
 };
 
@@ -486,7 +486,7 @@ int32_t LP_iseligible(uint64_t *valp,uint64_t *val2p,int32_t iambob,char *symbol
 int32_t LP_pullsock_check(void *ctx,char **retstrp,char *myipaddr,int32_t pubsock,int32_t pullsock);
 int64_t LP_listunspent_parseitem(struct iguana_info *coin,bits256 *txidp,int32_t *voutp,int32_t *heightp,cJSON *item);
 void LP_unspents_cache(char *symbol,char *addr,char *arraystr,int32_t updatedflag);
-uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired);
+uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired,int32_t cmdchannel,char *ipaddr);
 //void LP_utxo_clientpublish(struct LP_utxoinfo *utxo);
 //int32_t LP_coinbus(uint16_t coin_busport);
 int32_t LP_nanomsg_recvs(void *ctx);
@@ -546,7 +546,7 @@ void LP_tradebot_pauseall();
 void LP_portfolio_reset();
 uint32_t LP_atomic_locktime(char *base,char *rel);
 struct LP_pubkey_info *LP_pubkeyfind(bits256 pubkey);
-char *issue_LP_psock(char *destip,uint16_t destport,int32_t ispaired);
+char *issue_LP_psock(char *destip,uint16_t destport,int32_t ispaired,int32_t cmdchannel);
 char *LP_unspents_filestr(char *symbol,char *addr);
 cJSON *bitcoin_data2json(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,int32_t height,bits256 *txidp,struct iguana_msgtx *msgtx,uint8_t *extraspace,int32_t extralen,uint8_t *serialized,int32_t len,cJSON *vins,int32_t suppress_pubkeys,int32_t zcash);
 //int32_t LP_butxo_findeither(bits256 txid,int32_t vout);

iguana/exchanges/LP_nativeDEX.c

@@ -303,7 +303,7 @@ char *LP_process_message(void *ctx,char *typestr,char *myipaddr,int32_t pubsock,
             if ( jsonstr != 0 && argjson != 0 )
             {
                 len = (int32_t)strlen(jsonstr) + 1;
-                if ( (method= jstr(argjson,"method")) != 0 && strcmp(method,"broadcast") == 0 )
+                if ( (method= jstr(argjson,"method")) != 0 && strcmp(method,"psock") != 0 && strcmp(method,"broadcast") == 0 )
                 {
                     bits256 zero; cJSON *reqjson; char *cipherstr; int32_t cipherlen; uint8_t cipher[LP_ENCRYPTED_MAXSIZE];
                     if ( (reqjson= LP_dereference(argjson,"broadcast")) != 0 )
@@ -1138,9 +1138,28 @@ void LP_reserved_msgs(void *ignore)
 
 int32_t LP_reserved_msg(int32_t priority,char *base,char *rel,bits256 pubkey,char *msg)
 {
-    int32_t n = 0;
+    struct LP_pubkey_info *pubp; int32_t sentbytes,n = 0;
     if ( strcmp(G.USERPASS,"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f") == 0 )
         return(-1);
+    if ( priority > 0 && bits256_nonz(pubkey) != 0 )
+    {
+        if ( (pubp= LP_pubkeyfind(pubkey)) != 0 )
+        {
+            if ( pubp->pairsock > 0 )
+            {
+                if ( (sentbytes= nn_send(pubp->pairsock,msg,(int32_t)strlen(msg)+1,0)) < 0 )
+                {
+                    pubp->pairsock = -1;
+                    printf("mark cmdchannel closed\n");
+                }
+                else
+                {
+                    printf("sent %d bytes to cmdchannel.%d\n",sentbytes,pubp->pairsock);
+                    return(sentbytes);
+                }
+            }
+        }
+    }
     portable_mutex_lock(&LP_reservedmutex);
     if ( num_Reserved_msgs[priority] < sizeof(Reserved_msgs[priority])/sizeof(*Reserved_msgs[priority]) )
     {
@@ -1312,7 +1331,7 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
     printf("got %s, initpeers. LP_mypubsock.%d pullsock.%d RPC_port.%u mypullport.%d mypubport.%d pushaddr.%s\n",myipaddr,LP_mypubsock,LP_mypullsock,RPC_port,mypullport,mypubport,pushaddr);
     LP_passphrase_init(passphrase,jstr(argjson,"gui"),juint(argjson,"netid"),jstr(argjson,"seednode"));
 #ifndef FROM_JS
-    if ( IAMLP != 0 && OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_psockloop,(void *)myipaddr) != 0 )
+    if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_psockloop,(void *)myipaddr) != 0 )
     {
         printf("error launching LP_psockloop for (%s)\n",myipaddr);
         exit(-1);

iguana/exchanges/LP_network.c

@@ -21,12 +21,12 @@
 struct psock
 {
     uint32_t lasttime,lastping,errors;
-    int32_t publicsock,sendsock,ispaired;
+    int32_t publicsock,sendsock,ispaired,cmdchannel;
     uint16_t publicport,sendport;
     char sendaddr[128],publicaddr[128];
 } *PSOCKS;
 
-uint16_t Numpsocks,Psockport = MIN_PSOCK_PORT;
+uint16_t Numpsocks,Psockport = MIN_PSOCK_PORT,Pcmdport = MAX_PSOCK_PORT;
 
 #ifdef FROM_JS
 
@@ -299,16 +299,18 @@ void LP_queuesend(uint32_t crc32,int32_t pubsock,char *base,char *rel,uint8_t *m
 
 void LP_broadcast_finish(int32_t pubsock,char *base,char *rel,uint8_t *msg,cJSON *argjson,uint32_t crc32)
 {
-    int32_t msglen;
+    int32_t msglen; char *method;
+    if ( (method= jstr(argjson,"method")) == 0 )
+        return;
     msg = (void *)jprint(argjson,0);
     msglen = (int32_t)strlen((char *)msg) + 1;
     if ( crc32 == 0 )
         crc32 = calc_crc32(0,&msg[2],msglen - 2);
     //printf("crc32.%x IAMLP.%d pubsock.%d\n",crc32,G.LP_IAMLP,pubsock);
 #ifdef FROM_MARKETMAKER
-    if ( G.LP_IAMLP == 0 || pubsock < 0 )
+    if ( (G.LP_IAMLP == 0 || pubsock < 0) && strcmp(method,"psock") != 0 )
 #else
-    if ( IAMLP == 0 || pubsock < 0 )
+    if ( (IAMLP == 0 || pubsock < 0 && strcmp(method,"psock") != 0 )
 #endif
     {
         free(msg);
@@ -412,10 +414,10 @@ uint32_t LP_swapsend(int32_t pairsock,struct basilisk_swap *swap,uint32_t msgbit
     return(nextbits);
 }
 
-void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to work
+void LP_psockloop(void *_ptr)
 {
     static struct nn_pollfd *pfds;
-    int32_t i,n,nonz,iter,retval,sentbytes,size=0,sendsock = -1; uint32_t now; struct psock *ptr=0; void *buf=0; char keepalive[512];
+    int32_t nexti=0,j,i,n,nonz,iter,retval,sentbytes,size=0,sendsock = -1; uint32_t now; struct psock *ptr=0; void *buf=0; char keepalive[512];
     strcpy(LP_psockloop_stats.name,"LP_psockloop");
     LP_psockloop_stats.threshold = 1000.;
     while ( LP_STOP_RECEIVED == 0 )
@@ -426,7 +428,11 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
         {
             if ( size > 0 )
             {
-                if ( (sentbytes= nn_send(sendsock,buf,size,0)) != size ) // need tight loop
+                if ( ptr->cmdchannel != 0 )
+                {
+                    printf("got cmdchannel.(%s)\n",buf);
+                }
+                else if ( (sentbytes= nn_send(sendsock,buf,size,0)) != size ) // need tight loop
                     printf("LP_psockloop sent %d instead of %d\n",sentbytes,size);
                 if ( buf != 0 )
                 {
@@ -447,8 +453,9 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
             memset(pfds,0,sizeof(*pfds) * ((Numpsocks*2 <= MAX_PSOCK_PORT) ? Numpsocks*2 : MAX_PSOCK_PORT));
             for (iter=0; iter<2; iter++)
             {
-                for (i=n=0; i<Numpsocks; i++)
+                for (j=n=0; j<Numpsocks; j++)
                 {
+                    i = (j + nexti) % Numpsocks;
                     ptr = &PSOCKS[i];
                     if ( iter == 0 )
                     {
@@ -460,6 +467,7 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
                         if ( pfds[n].fd != ptr->publicsock )
                         {
                             printf("unexpected fd.%d mismatched publicsock.%d\n",pfds[n].fd,ptr->publicsock);
+                            nexti = i+1;
                             break;
                         }
                         else if ( (pfds[n].revents & POLLIN) != 0 )
@@ -470,6 +478,7 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
                             {
                                 ptr->lasttime = now;
                                 sendsock = ptr->sendsock;
+                                nexti = i+1;
                                 break;
                             }
                             else if ( buf != 0 )
@@ -491,6 +500,7 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
                         if ( pfds[n].fd != ptr->sendsock )
                         {
                             printf("unexpected fd.%d mismatched sendsock.%d\n",pfds[n].fd,ptr->sendsock);
+                            nexti = i+1;
                             break;
                         }
                         else if ( (pfds[n].revents & POLLIN) != 0 )
@@ -502,6 +512,7 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
                                 if ( ptr->ispaired != 0 )
                                 {
                                     sendsock = ptr->publicsock;
+                                    nexti = i+1;
                                     break;
                                 }
                             }
@@ -537,10 +548,10 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
                         if ( now > ptr->lasttime+PSOCK_KEEPALIVE )
                         {
                             printf("PSOCKS[%d] of %d (%u %u) lag.%d IDLETIMEOUT\n",i,Numpsocks,ptr->publicport,ptr->sendport,now - ptr->lasttime);
+                            if ( ptr->sendsock != ptr->publicsock && ptr->sendsock >= 0 )
+                                nn_close(ptr->sendsock);
                             if ( ptr->publicsock >= 0 )
                                 nn_close(ptr->publicsock);
-                            if ( ptr->sendsock >= 0 )
-                                nn_close(ptr->sendsock);
                             //portable_mutex_lock(&LP_psockmutex);
                             if ( Numpsocks > 1 )
                             {
@@ -573,13 +584,14 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
     }
 }
 
-void LP_psockadd(int32_t ispaired,int32_t publicsock,uint16_t recvport,int32_t sendsock,uint16_t sendport,char *subaddr,char *publicaddr)
+void LP_psockadd(int32_t ispaired,int32_t publicsock,uint16_t recvport,int32_t sendsock,uint16_t sendport,char *subaddr,char *publicaddr,int32_t cmdchannel)
 {
     struct psock *ptr;
     portable_mutex_lock(&LP_psockmutex);
     PSOCKS = realloc(PSOCKS,sizeof(*PSOCKS) * (Numpsocks + 1));
     ptr = &PSOCKS[Numpsocks++];
     ptr->ispaired = ispaired;
+    ptr->cmdchannel = cmdchannel;
     ptr->publicsock = publicsock;
     ptr->publicport = recvport;
     ptr->sendsock = sendsock;
@@ -609,65 +621,87 @@ int32_t LP_psockmark(char *publicaddr)
     return(retval);
 }
 
-char *LP_psock(char *myipaddr,int32_t ispaired)
+char *_LP_psock_create(int32_t *pullsockp,int32_t *pubsockp,char *ipaddr,uint16_t publicport,uint16_t subport,int32_t ispaired,int32_t cmdchannel)
+{
+    int32_t pullsock,pubsock,arg; char pushaddr[64],subaddr[64]; cJSON *retjson = 0;
+    pullsock = pubsock = -1;
+    *pullsockp = *pubsockp = -1;
+    nanomsg_transportname(1,pushaddr,ipaddr,publicport);
+    nanomsg_transportname(1,subaddr,ipaddr,subport);
+    if ( (pullsock= nn_socket(AF_SP,ispaired!=0?NN_PAIR:NN_PULL)) >= 0 && (cmdchannel != 0 ||(pubsock= nn_socket(AF_SP,ispaired!=0?NN_PAIR:NN_PAIR)) >= 0) )
+    {
+        if ( nn_bind(pullsock,pushaddr) >= 0 && (cmdchannel != 0 || nn_bind(pubsock,subaddr) >= 0) )
+        {
+            arg = 100;
+            nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_SNDTIMEO,&arg,sizeof(arg));
+            if ( pubsock >= 0 )
+                nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&arg,sizeof(arg));
+            arg = 1;
+            nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVTIMEO,&arg,sizeof(arg));
+            if ( pubsock >= 0 )
+                nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_RCVTIMEO,&arg,sizeof(arg));
+            arg = 2;
+            nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_MAXTTL,&arg,sizeof(arg));
+            if ( pubsock >= 0 )
+                nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_MAXTTL,&arg,sizeof(arg));
+            nanomsg_transportname(0,pushaddr,ipaddr,publicport);
+            nanomsg_transportname(0,subaddr,ipaddr,subport);
+            LP_psockadd(ispaired,pullsock,publicport,pubsock,subport,subaddr,pushaddr,cmdchannel);
+            jaddstr(retjson,"result","success");
+            jaddstr(retjson,"LPipaddr",ipaddr);
+            jaddstr(retjson,"connectaddr",subaddr);
+            jaddnum(retjson,"connectport",subport);
+            jaddnum(retjson,"ispaired",ispaired);
+            jaddnum(retjson,"cmdchannel",cmdchannel);
+            jaddstr(retjson,"publicaddr",pushaddr);
+            jaddnum(retjson,"publicport",publicport);
+            printf("cmd.%d publicaddr.(%s) for subaddr.(%s), pullsock.%d pubsock.%d\n",cmdchannel,pushaddr,subaddr,pullsock,pubsock);
+            *pullsockp = pullsock;
+            if ( cmdchannel == 0 )
+                *pubsockp = pubsock;
+            else *pubsockp = pullsock;
+            return(jprint(retjson,1));
+        } else printf("bind error on %s or %s\n",pushaddr,subaddr);
+        if ( pullsock >= 0 )
+            nn_close(pullsock);
+        if ( pubsock >= 0 )
+            nn_close(pubsock);
+    }
+    return(0);
+}
+        
+char *LP_psock(int32_t *pubsockp,char *ipaddr,int32_t ispaired,int32_t cmdchannel)
 {
-    char pushaddr[128],subaddr[128]; uint16_t i,publicport,subport,maxiters=100; int32_t timeout,pullsock=-1,pubsock=-1; cJSON *retjson=0;
-    retjson = cJSON_CreateObject();
-    publicport = Psockport++;
-    subport = Psockport++;
-    for (i=0; i<maxiters; i++,publicport+=2,subport+=2)
+    char *retstr=0; uint16_t i,publicport,subport,maxport; int32_t pullsock=-1;
+    *pubsockp = -1;
+    if ( cmdchannel == 0 )
+    {
+        maxport = MAX_PSOCK_PORT;
+        publicport = Psockport++;
+        subport = Psockport++;
+    }
+    else
+    {
+        maxport = 65534;
+        publicport = subport = Pcmdport++;
+    }
+    for (i=0; i<maxport; i++)
     {
         if ( publicport < MIN_PSOCK_PORT )
             publicport = MIN_PSOCK_PORT+1;
         if ( subport <= publicport )
             subport = publicport +  1;
-        pullsock = pubsock = -1;
-        nanomsg_transportname(1,pushaddr,myipaddr,publicport);
-        nanomsg_transportname(1,subaddr,myipaddr,subport);
-        if ( (pullsock= nn_socket(AF_SP,ispaired!=0?NN_PAIR:NN_PULL)) >= 0 && (pubsock= nn_socket(AF_SP,ispaired!=0?NN_PAIR:NN_PAIR)) >= 0 )
-        {
-            if ( nn_bind(pullsock,pushaddr) >= 0 && nn_bind(pubsock,subaddr) >= 0 )
-            {
-                timeout = 100;
-                nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
-                nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));
-                if ( ispaired != 0 )
-                {
-                    //maxsize = 1024 * 1024;
-                    //nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize));
-                }
-                //if ( ispaired != 0 )
-                {
-                    nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
-                    nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));
-                }
-                timeout = 10;
-                nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_MAXTTL,&timeout,sizeof(timeout));
-                nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_MAXTTL,&timeout,sizeof(timeout));
-                nanomsg_transportname(0,pushaddr,myipaddr,publicport);
-                nanomsg_transportname(0,subaddr,myipaddr,subport);
-                LP_psockadd(ispaired,pullsock,publicport,pubsock,subport,subaddr,pushaddr);
-                jaddstr(retjson,"result","success");
-                jaddstr(retjson,"LPipaddr",myipaddr);
-                jaddstr(retjson,"connectaddr",subaddr);
-                jaddnum(retjson,"connectport",subport);
-                jaddnum(retjson,"ispaired",ispaired);
-                jaddstr(retjson,"publicaddr",pushaddr);
-                jaddnum(retjson,"publicport",publicport);
-                printf("i.%d publicaddr.(%s) for subaddr.(%s), pullsock.%d pubsock.%d\n",i,pushaddr,subaddr,pullsock,pubsock);
-                break;
-            } else printf("bind error on %s or %s\n",pushaddr,subaddr);
-            if ( pullsock >= 0 )
-                nn_close(pullsock);
-            if ( pubsock >= 0 )
-                nn_close(pubsock);
-        }
+        if ( (retstr= _LP_psock_create(&pullsock,pubsockp,ipaddr,publicport,subport,ispaired,cmdchannel)) != 0 )
+            return(retstr);
+        if ( cmdchannel == 0 )
+            publicport+=2, subport+=2;
+        else publicport++, subport++;
     }
-    if ( Psockport > MAX_PSOCK_PORT )
+    if ( Psockport >= MAX_PSOCK_PORT )
         Psockport = MIN_PSOCK_PORT;
-    if ( i == maxiters )
-        jaddstr(retjson,"error","cant find psock ports");
-    return(jprint(retjson,1));
+    if ( Pcmdport >= 65534 )
+        Pcmdport = MAX_PSOCK_PORT;
+    return(clonestr("{\"error\",\"cant find psock ports\"}"));
 }
 
 /*
@@ -681,23 +715,26 @@ char *LP_psock(char *myipaddr,int32_t ispaired)
 
 */
 
-char *issue_LP_psock(char *destip,uint16_t destport,int32_t ispaired)
+char *issue_LP_psock(char *destip,uint16_t destport,int32_t ispaired,int32_t cmdchannel)
 {
     char url[512],*retstr;
-    sprintf(url,"http://%s:%u/api/stats/psock?ispaired=%d",destip,destport-1,ispaired);
+    sprintf(url,"http://%s:%u/api/stats/psock?ispaired=%d&cmdchannel=%d",destip,destport-1,ispaired,cmdchannel);
     //return(LP_issue_curl("psock",destip,destport,url));
     retstr = issue_curlt(url,LP_HTTP_TIMEOUT*3);
     printf("issue_LP_psock got (%s) from %s\n",retstr,destip);
     return(retstr);
 }
 
-uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired)
+uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired,int32_t cmdchannel,char *ipaddr)
 {
     uint16_t publicport = 0; char *retstr,*addr; cJSON *retjson; struct LP_peerinfo *peer,*tmp;
+    connectaddr[0] = publicaddr[0] = 0;
     HASH_ITER(hh,LP_peerinfos,peer,tmp)
     {
+        if ( ipaddr != 0 && strcmp(ipaddr,peer->ipaddr) != 0 )
+            continue;
         connectaddr[0] = publicaddr[0] = 0;
-        if ( peer->errors < LP_MAXPEER_ERRORS && (retstr= issue_LP_psock(peer->ipaddr,peer->port,ispaired)) != 0 )
+        if ( peer->errors < LP_MAXPEER_ERRORS && (retstr= issue_LP_psock(peer->ipaddr,peer->port,ispaired,cmdchannel)) != 0 )
         {
             if ( (retjson= cJSON_Parse(retstr)) != 0 )
             {
@@ -706,8 +743,6 @@ uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired)
                     safecopy(publicaddr,addr,128);
                 if ( (addr= jstr(retjson,"connectaddr")) != 0 )
                     safecopy(connectaddr,addr,128);
-                //if ( (addr= jstr(retjson,"connectaddr2")) != 0 )
-                //    safecopy(connectaddr2,addr,128);
                 if ( publicaddr[0] != 0 && connectaddr[0] != 0 )
                     publicport = juint(retjson,"publicport");
                 free_json(retjson);
@@ -748,7 +783,7 @@ int32_t LP_initpublicaddr(void *ctx,uint16_t *mypullportp,char *publicaddr,char
         }
         while ( *mypullportp == 0 )
         {
-            if ( (*mypullportp= LP_psock_get(connectaddr,publicaddr,ispaired)) != 0 )
+            if ( (*mypullportp= LP_psock_get(connectaddr,publicaddr,ispaired,0,0)) != 0 )
                 break;
             sleep(10);
             printf("try to get publicaddr again\n");

iguana/exchanges/LP_ordermatch.c

@@ -478,13 +478,14 @@ int32_t LP_connectstartbob(void *ctx,int32_t pubsock,char *base,char *rel,double
                 if ( (kmdcoin= LP_coinfind("KMD")) != 0 )
                     jadd(reqjson,"proof",LP_instantdex_txids(0,kmdcoin->smartaddr));
                 char str[65]; printf("BOB pubsock.%d binds to %d (%s)\n",pubsock,pair,bits256_str(str,qp->desthash));
-                bits256 zero;
-                memset(zero.bytes,0,sizeof(zero));
-                LP_reserved_msg(1,base,rel,zero,jprint(reqjson,0));
-                sleep(1);
                 LP_reserved_msg(1,qp->srccoin,qp->destcoin,qp->desthash,jprint(reqjson,0));
-                sleep(1);
-                LP_reserved_msg(0,base,rel,zero,jprint(reqjson,0));
+                if ( 0 )
+                {
+                    bits256 zero;
+                    memset(zero.bytes,0,sizeof(zero));
+                    LP_reserved_msg(1,base,rel,zero,jprint(reqjson,0));
+                    LP_reserved_msg(0,base,rel,zero,jprint(reqjson,0));
+                }
                 free_json(reqjson);
                 LP_importaddress(qp->destcoin,qp->destaddr);
                 LP_otheraddress(qp->srccoin,otheraddr,qp->destcoin,qp->destaddr);
@@ -835,8 +836,6 @@ struct LP_quoteinfo *LP_trades_gotrequest(void *ctx,struct LP_quoteinfo *qp,stru
     qp = newqp;
     if ( (coin= LP_coinfind(qp->srccoin)) == 0 )
         return(0);
-    //if ( strcmp(qp->srccoin,"GRS") == 0 || strcmp(qp->destcoin,"GRS") == 0 )
-    //    printf("LP_trades_gotrequest %s/%s myprice %.8f\n",qp->srccoin,qp->destcoin,LP_trades_bobprice(&bid,&ask,qp));
     if ( (myprice= LP_trades_bobprice(&bid,&ask,qp)) == 0. )
         return(0);
     autxo = &A;
@@ -855,8 +854,6 @@ struct LP_quoteinfo *LP_trades_gotrequest(void *ctx,struct LP_quoteinfo *qp,stru
         memset(&qp->txid2,0,sizeof(qp->txid2));
         qp->vout = qp->vout2 = -1;
     } else return(0);
-    //if ( strcmp(qp->srccoin,"GRS") == 0 || strcmp(qp->destcoin,"GRS") == 0 )
-    //    printf("LP_trades_gotrequest qprice %.8f vs myprice %.8f\n",qprice,myprice);
     if ( qprice > myprice )
     {
         r = (LP_rand() % 100);
@@ -893,8 +890,6 @@ struct LP_quoteinfo *LP_trades_gotrequest(void *ctx,struct LP_quoteinfo *qp,stru
     }
     if ( (qprice= LP_trades_pricevalidate(qp,coin,myprice)) < 0. )
         return(0);
-    //if ( strcmp(qp->srccoin,"GRS") == 0 || strcmp(qp->destcoin,"GRS") == 0 )
-    //    printf("final checks\n");
     if ( LP_allocated(qp->txid,qp->vout) == 0 && LP_allocated(qp->txid2,qp->vout2) == 0 )
     {
         reqjson = LP_quotejson(qp);
@@ -905,15 +900,7 @@ struct LP_quoteinfo *LP_trades_gotrequest(void *ctx,struct LP_quoteinfo *qp,stru
         jaddnum(reqjson,"quotetime",qp->quotetime);
         jaddnum(reqjson,"pending",qp->timestamp + LP_RESERVETIME);
         jaddstr(reqjson,"method","reserved");
-        bits256 zero;
-        memset(zero.bytes,0,sizeof(zero));
-        LP_reserved_msg(1,qp->srccoin,qp->destcoin,zero,jprint(reqjson,0));
-        if ( 0 )//if ( IAMLP == 0 )
-        {
-            sleep(1);
-            LP_reserved_msg(1,qp->srccoin,qp->destcoin,qp->desthash,jprint(reqjson,0));
-        }
-        //LP_reserved_msg(0,qp->srccoin,qp->destcoin,zero,jprint(reqjson,0));
+        LP_reserved_msg(1,qp->srccoin,qp->destcoin,qp->desthash,jprint(reqjson,0));
         free_json(reqjson);
         return(qp);
     } else printf("request processing selected ineligible utxos?\n");
@@ -1174,7 +1161,7 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
         LP_tradecommand_log(argjson);
         rq = ((uint64_t)Q.R.requestid << 32) | Q.R.quoteid;
         printf("%-4d (%-10u %10u) %12s id.%-20llu %5s/%-5s %12.8f -> %12.8f (%11.8f) | RT.%d %d n%d\n",(uint32_t)time(NULL) % 3600,Q.R.requestid,Q.R.quoteid,method,(long long)Q.aliceid,Q.srccoin,Q.destcoin,dstr(Q.satoshis),dstr(Q.destsatoshis),(double)Q.destsatoshis/Q.satoshis,LP_RTcount,LP_swapscount,G.netid);
-        if ( Q.timestamp > 0 && time(NULL) > Q.timestamp + LP_AUTOTRADE_TIMEOUT*20 ) // eat expired packets
+        if ( Q.timestamp > 0 && time(NULL) > Q.timestamp + LP_AUTOTRADE_TIMEOUT*20 ) // eat expired packets, some old timestamps floating about?
         {
             //printf("aliceid.%llu is expired by %d\n",(long long)Q.aliceid,(uint32_t)time(NULL) - (Q.timestamp + LP_AUTOTRADE_TIMEOUT*20));
             //return(1);

iguana/exchanges/LP_peers.c

@@ -86,7 +86,7 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
             if ( peer->sessionid == 0 )
                 peer->sessionid = sessionid;*/
         }
-        else if ( IAMLP != 0 || LP_numactive_LP < 3 )
+        else if ( IAMLP != 0 || LP_numactive_LP < 10 )
         {
             //printf("addpeer (%s:%u) pushport.%u subport.%u\n",ipaddr,port,pushport,subport);
             peer = calloc(1,sizeof(*peer));
@@ -163,6 +163,18 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
                 {
                     mypeer->numpeers++;
                     printf("_LPaddpeer %s -> numpeers.%d mypubsock.%d other.(%d)\n",ipaddr,mypeer->numpeers,mypubsock,isLP);
+                    if ( IAMLP == 0 )
+                    {
+                        char connectaddr[64],publicaddr[64],*retstr; int32_t pullsock,pubsock; uint16_t cmdport;
+                        if ( (cmdport= LP_psock_get(connectaddr,publicaddr,1,1,peer->ipaddr)) != 0 )
+                        {
+                            if ( (retstr= _LP_psock_create(&pullsock,&pubsock,peer->ipaddr,cmdport,cmdport,1,1)) != 0 )
+                            {
+                                printf("cmdchannel! %s\n",retstr);
+                                free(retstr);
+                            }
+                        } else printf("error getting cmdchannel with %s\n",peer->ipaddr);
+                    }
                 } else peer->numpeers = 1; // will become mypeer
                 portable_mutex_unlock(&LP_peermutex);
                 /*if ( IAMLP != 0 && mypubsock >= 0 )

iguana/exchanges/LP_signatures.c

@@ -547,7 +547,7 @@ void LP_notify_pubkeys(void *ctx,int32_t pubsock)
         } else printf("no LPipaddr\n");
     }
     jaddnum(reqjson,"session",G.LP_sessionid);
-    LP_reserved_msg(0,"","",zero,jprint(reqjson,1));
+    LP_reserved_msg(1,"","",zero,jprint(reqjson,1));
 }
 
 char *LP_notify_recv(cJSON *argjson)
@@ -675,12 +675,11 @@ void LP_query(void *ctx,char *myipaddr,int32_t mypubsock,char *method,struct LP_
     //if ( bits256_nonz(qp->srchash) == 0 || strcmp(method,"request") != 0 )
     {
         memset(&zero,0,sizeof(zero));
-        LP_reserved_msg(1,qp->srccoin,qp->destcoin,zero,clonestr(msg));
         if ( strcmp(method,"connect") == 0 )
+            LP_reserved_msg(1,qp->srccoin,qp->destcoin,qp->srchash,clonestr(msg));
+        else
         {
-            sleep(1);
             LP_reserved_msg(1,qp->srccoin,qp->destcoin,zero,clonestr(msg));
-            sleep(1);
             LP_reserved_msg(0,qp->srccoin,qp->destcoin,zero,clonestr(msg));
         }
         free(msg);