From 39b7b043b23d9eaff04e460e5f1bb45a3a52ba3e Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Mon, 19 Jun 2017 11:14:05 +0300
Subject: [PATCH] Test

---
 iguana/exchanges/LP_nativeDEX.c  | 14 ++++----------
 iguana/exchanges/LP_network.c    |  4 ++--
 iguana/exchanges/LP_ordermatch.c |  8 ++------
 iguana/exchanges/LP_peers.c      |  4 ++--
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/iguana/exchanges/LP_nativeDEX.c b/iguana/exchanges/LP_nativeDEX.c
index 4019b1d28..fac19be10 100644
--- a/iguana/exchanges/LP_nativeDEX.c
+++ b/iguana/exchanges/LP_nativeDEX.c
@@ -403,18 +403,12 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,double profit
                 myipaddr[--n] = 0;
         } else printf("error getting myipaddr\n");
     } else printf("error issuing curl\n");
-    sprintf(pushaddr,"ws://%s:%u",myipaddr,mypullport);
-    //nanomsg_tcpname(pushaddr,myipaddr,mypullport);
+    nanomsg_transportname(0,pushaddr,myipaddr,mypullport);
     if ( (pullsock= nn_socket(AF_SP,NN_PULL)) >= 0 )
     {
         timeout = 1;
         nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));
-#ifdef __APPLE__
-        sprintf(bindaddr,"ws://*:%u",mypullport);
-        //nanomsg_tcpname(bindaddr,myipaddr,mypullport);
-#else
-        nanomsg_tcpname(bindaddr,myipaddr,mypullport);
-#endif
+        nanomsg_transportname(1,bindaddr,myipaddr,mypullport);
         if ( nn_bind(pullsock,bindaddr) >= 0 )
         {
             maxsize = 2 * 1024 * 1024;
@@ -434,8 +428,8 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,double profit
         if ( myipaddr != 0 )
         {
             pubsock = -1;
-            nanomsg_tcpname(subaddr,myipaddr,mypubport);
-            nanomsg_tcpname(bindaddr,myipaddr,mypubport);
+            nanomsg_transportname(0,subaddr,myipaddr,mypubport);
+            nanomsg_transportname(1,bindaddr,myipaddr,mypubport);
             if ( (pubsock= nn_socket(AF_SP,NN_PUB)) >= 0 )
             {
                 if ( nn_bind(pubsock,bindaddr) >= 0 )
diff --git a/iguana/exchanges/LP_network.c b/iguana/exchanges/LP_network.c
index 4a328a213..da995ef5f 100644
--- a/iguana/exchanges/LP_network.c
+++ b/iguana/exchanges/LP_network.c
@@ -19,9 +19,9 @@
 //
 // jl777: might need to queue outbound packets and send via separate thread
 
-char *nanomsg_tcpname(char *str,char *ipaddr,uint16_t port)
+char *nanomsg_transportname(int32_t bindflag,char *str,char *ipaddr,uint16_t port)
 {
-    sprintf(str,"tcp://%s:%u",ipaddr,port);
+    sprintf(str,"ws://%s:%u",bindflag == 0 ? ipaddr : "*",port);
     return(str);
 }
 
diff --git a/iguana/exchanges/LP_ordermatch.c b/iguana/exchanges/LP_ordermatch.c
index b19679ae3..f9562a7b7 100644
--- a/iguana/exchanges/LP_ordermatch.c
+++ b/iguana/exchanges/LP_ordermatch.c
@@ -344,12 +344,8 @@ int32_t LP_nanobind(int32_t pair,char *pairstr,char *myipaddr)
     for (i=0; i<10; i++)
     {
         r = (10000 + (rand() % 50000)) & 0xffff;
-        nanomsg_tcpname(pairstr,myipaddr,r);
-#ifdef __APPLE__
-        nanomsg_tcpname(bindaddr,"*",r);
-#else
-        nanomsg_tcpname(bindaddr,myipaddr,r);
-#endif
+        nanomsg_transportname(0,pairstr,myipaddr,r);
+        nanomsg_transportname(1,bindaddr,myipaddr,r);
         if ( nn_bind(pair,bindaddr) >= 0 )
         {
             timeout = 100;
diff --git a/iguana/exchanges/LP_peers.c b/iguana/exchanges/LP_peers.c
index 89fac7909..7207e53a7 100644
--- a/iguana/exchanges/LP_peers.c
+++ b/iguana/exchanges/LP_peers.c
@@ -72,7 +72,7 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
             strcpy(peer->ipaddr,ipaddr);
             if ( pushport != 0 && subport != 0 && (pushsock= nn_socket(AF_SP,NN_PUSH)) >= 0 )
             {
-                nanomsg_tcpname(pushaddr,peer->ipaddr,pushport);
+                nanomsg_transportname(0,pushaddr,peer->ipaddr,pushport);
                 if ( nn_connect(pushsock,pushaddr) >= 0 )
                 {
                     timeout = 100;
@@ -87,7 +87,7 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
                         timeout = 1;
                         nn_setsockopt(subsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));
                         nn_setsockopt(subsock,NN_SUB,NN_SUB_SUBSCRIBE,"",0);
-                        nanomsg_tcpname(subaddr,peer->ipaddr,subport);
+                        nanomsg_transportname(0,subaddr,peer->ipaddr,subport);
                         if ( nn_connect(subsock,subaddr) >= 0 )
                         {
                             peer->subsock = subsock;