From 82d883aa276afb8f26b0b53203f63decd183698b Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 21 Jun 2017 20:30:04 +0300 Subject: [PATCH] Test --- iguana/exchanges/LP_nativeDEX.c | 3 ++- iguana/exchanges/LP_ordermatch.c | 18 ++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/iguana/exchanges/LP_nativeDEX.c b/iguana/exchanges/LP_nativeDEX.c index d63b7ca89..2681d5dad 100644 --- a/iguana/exchanges/LP_nativeDEX.c +++ b/iguana/exchanges/LP_nativeDEX.c @@ -30,7 +30,7 @@ struct LP_forwardinfo *LP_forwardinfos; char *activecoins[] = { "BTC", "KMD" }; char GLOBAL_DBDIR[] = { "DB" }; -char USERPASS[65],USERPASS_WIFSTR[64],USERHOME[512] = { "/root" }; +char USERPASS[65],USERPASS_WIFSTR[64],LP_myipaddr[64],USERHOME[512] = { "/root" }; char *default_LPnodes[] = { "5.9.253.195", "5.9.253.196", "5.9.253.197", "5.9.253.198", "5.9.253.199", "5.9.253.200", "5.9.253.201", "5.9.253.202", "5.9.253.203", };//"5.9.253.204" }; // @@ -438,6 +438,7 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,double profit n = strlen(myipaddr); if ( myipaddr[n-1] == '\n' ) myipaddr[--n] = 0; + strcpy(LP_myipaddr,myipaddr); } else printf("error getting myipaddr\n"); } else printf("error issuing curl\n"); if ( IAMLP != 0 ) diff --git a/iguana/exchanges/LP_ordermatch.c b/iguana/exchanges/LP_ordermatch.c index 929d0aac5..a59f825d0 100644 --- a/iguana/exchanges/LP_ordermatch.c +++ b/iguana/exchanges/LP_ordermatch.c @@ -338,21 +338,11 @@ double LP_query(void *ctx,char *myipaddr,int32_t mypubsock,double profitmargin,c return(price); } -int32_t LP_nanobind(void *ctx,char *pairstr,char *myipaddr) +int32_t LP_nanobind(void *ctx,char *pairstr) { int32_t i,timeout,r,pairsock = -1; uint16_t mypullport; char bindaddr[128]; if ( LP_canbind != 0 ) { - if ( strcmp(myipaddr,"127.0.0.1") == 0 ) - { - if ( LP_mypeer != 0 ) - myipaddr = LP_mypeer->ipaddr; - } - if ( strcmp(myipaddr,"127.0.0.1") == 0 ) - { - printf("cant nanobind to localhost\n"); - return(-1); - } if ( (pairsock= nn_socket(AF_SP,NN_PAIR)) < 0 ) printf("error creating utxo->pair\n"); else @@ -360,8 +350,8 @@ int32_t LP_nanobind(void *ctx,char *pairstr,char *myipaddr) for (i=0; i<10; i++) { r = (10000 + (rand() % 50000)) & 0xffff; - nanomsg_transportname(0,pairstr,myipaddr,r); - nanomsg_transportname(1,bindaddr,myipaddr,r); + nanomsg_transportname(0,pairstr,LP_myipaddr,r); + nanomsg_transportname(1,bindaddr,LP_myipaddr,r); if ( nn_bind(pairsock,bindaddr) >= 0 ) { timeout = 100; @@ -372,7 +362,7 @@ int32_t LP_nanobind(void *ctx,char *pairstr,char *myipaddr) } else printf("error binding to %s for %s\n",bindaddr,pairstr); } } - } else pairsock = LP_initpublicaddr(ctx,&mypullport,pairstr,myipaddr,0,1); + } else pairsock = LP_initpublicaddr(ctx,&mypullport,pairstr,"127.0.0.1",0,1); return(pairsock); }