From 6d43bb444148ea09f0bdc0a76bf65649a820649d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 26 Oct 2017 21:33:07 +0300
Subject: [PATCH] Test

---
 iguana/exchanges/LP_commands.c  |  4 ++--
 iguana/exchanges/LP_nativeDEX.c | 12 +++++++++++-
 iguana/exchanges/LP_network.c   |  8 +++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/iguana/exchanges/LP_commands.c b/iguana/exchanges/LP_commands.c
index c632adbb6..f549526d9 100644
--- a/iguana/exchanges/LP_commands.c
+++ b/iguana/exchanges/LP_commands.c
@@ -97,7 +97,7 @@ char *stats_JSON(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,char *r
      else if ( strcmp(method,"help") == 0 )
          return(clonestr("{\"result\":\" \
 available localhost RPC commands: \n \
-pricearray(base, rel, firsttime=0, lasttime=-1, timescale=60) -> [timestamp, avebid, aveask, highbid, lowask]\n\
+pricearray(base, rel, starttime=0, endtime=-1, timescale=60) -> [timestamp, avebid, aveask, highbid, lowask]\n\
 setprice(base, rel, price)\n\
 autoprice(base, rel, minprice, margin, refbase, refrel, factor, offset)*\n\
 goal(coin=*, val=<autocalc>)\n\
@@ -259,7 +259,7 @@ stop()\n\
             }
             else if ( strcmp(method,"pricearray") == 0 )
             {
-                return(jprint(LP_pricearray(base,rel,juint(argjson,"firsttime"),juint(argjson,"lasttime"),jint(argjson,"timescale")),1));
+                return(jprint(LP_pricearray(base,rel,juint(argjson,"starttime"),juint(argjson,"endtime"),jint(argjson,"timescale")),1));
             }
             else if ( strcmp(method,"myprice") == 0 )
             {
diff --git a/iguana/exchanges/LP_nativeDEX.c b/iguana/exchanges/LP_nativeDEX.c
index 29f7ba595..d355bbb2a 100644
--- a/iguana/exchanges/LP_nativeDEX.c
+++ b/iguana/exchanges/LP_nativeDEX.c
@@ -815,7 +815,7 @@ int32_t LP_reserved_msg(char *base,char *rel,bits256 pubkey,char *msg)
 
 void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybusport,char *passphrase,int32_t amclient,char *userhome,cJSON *argjson)
 {
-    char *myipaddr=0; long filesize,n; int32_t timeout,pubsock=-1; struct LP_peerinfo *mypeer=0; char pushaddr[128],subaddr[128],bindaddr[128],*coins_str=0; cJSON *coinsjson=0; void *ctx = bitcoin_ctx();
+    char *myipaddr=0; long filesize,n; int32_t timeout,pubsock=-1; struct LP_peerinfo *mypeer=0; char pushaddr[128],bindaddr2[128],subaddr[128],bindaddr[128],*coins_str=0; cJSON *coinsjson=0; void *ctx = bitcoin_ctx();
     LP_showwif = juint(argjson,"wif");
     if ( passphrase == 0 || passphrase[0] == 0 )
     {
@@ -899,6 +899,7 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
         pubsock = -1;
         nanomsg_transportname(0,subaddr,myipaddr,mypubport);
         nanomsg_transportname(1,bindaddr,myipaddr,mypubport);
+        nanomsg_transportname2(1,bindaddr2,myipaddr,mypubport+10);
         if ( (pubsock= nn_socket(AF_SP,NN_PUB)) >= 0 )
         {
             if ( nn_bind(pubsock,bindaddr) >= 0 )
@@ -912,6 +913,15 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
                 if ( pubsock >= 0 )
                     nn_close(pubsock), pubsock = -1;
             }
+            if ( nn_bind(pubsock,bindaddr2) >= 0 )
+            {
+                timeout = 1;
+                nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
+            }
+            else
+            {
+                printf("error binding2 to (%s)\n",bindaddr2);
+            }
         } else printf("error getting pubsock %d\n",pubsock);
         printf(">>>>>>>>> myipaddr.%s (%s) pullsock.%d\n",myipaddr,subaddr,pubsock);
         LP_mypubsock = pubsock;
diff --git a/iguana/exchanges/LP_network.c b/iguana/exchanges/LP_network.c
index 09d387f37..221d6175c 100644
--- a/iguana/exchanges/LP_network.c
+++ b/iguana/exchanges/LP_network.c
@@ -30,7 +30,13 @@ uint16_t Numpsocks,Psockport = MIN_PSOCK_PORT;
 
 char *nanomsg_transportname(int32_t bindflag,char *str,char *ipaddr,uint16_t port)
 {
-    sprintf(str,"ws://%s:%u",bindflag == 0 ? ipaddr : "*",port); // ws is worse
+    sprintf(str,"ws://%s:%u",bindflag == 0 ? ipaddr : "*",port);
+    return(str);
+}
+
+char *nanomsg_transportname2(int32_t bindflag,char *str,char *ipaddr,uint16_t port)
+{
+    sprintf(str,"tcp://%s:%u",bindflag == 0 ? ipaddr : "*",port); 
     return(str);
 }