Browse Source

Test

etomic
jl777 7 years ago
parent
commit
a5bcbfdffe
  1. 2
      iguana/exchanges/LP_forwarding.c
  2. 4
      iguana/exchanges/LP_nativeDEX.c
  3. 2
      iguana/exchanges/LP_network.c
  4. 3
      iguana/exchanges/LP_ordermatch.c

2
iguana/exchanges/LP_forwarding.c

@ -88,7 +88,6 @@ char *LP_register(bits256 pubkey,char *ipaddr)
return(clonestr("{\"error\":\"couldnt create pushsock\"}")); return(clonestr("{\"error\":\"couldnt create pushsock\"}"));
else else
{ {
char str[65]; printf("registered (%s) -> (%s)\n",bits256_str(str,pubkey),pushaddr);
ptr = calloc(1,sizeof(*ptr)); ptr = calloc(1,sizeof(*ptr));
ptr->pubkey = pubkey; ptr->pubkey = pubkey;
strcpy(ptr->pushaddr,pushaddr); strcpy(ptr->pushaddr,pushaddr);
@ -97,6 +96,7 @@ char *LP_register(bits256 pubkey,char *ipaddr)
portable_mutex_lock(&LP_forwardmutex); portable_mutex_lock(&LP_forwardmutex);
HASH_ADD_KEYPTR(hh,LP_forwardinfos,&ptr->pubkey,sizeof(ptr->pubkey),ptr); HASH_ADD_KEYPTR(hh,LP_forwardinfos,&ptr->pubkey,sizeof(ptr->pubkey),ptr);
portable_mutex_unlock(&LP_forwardmutex); portable_mutex_unlock(&LP_forwardmutex);
char str[65]; printf("registered (%s) -> (%s) pushsock.%d\n",bits256_str(str,pubkey),pushaddr,ptr->pushsock);
return(LP_lookup(pubkey)); return(LP_lookup(pubkey));
} }
} }

4
iguana/exchanges/LP_nativeDEX.c

@ -97,7 +97,7 @@ char *LP_command_process(char *myipaddr,int32_t pubsock,cJSON *argjson,uint8_t *
void LP_process_message(char *typestr,char *myipaddr,int32_t pubsock,double profitmargin,void *ptr,int32_t recvlen) void LP_process_message(char *typestr,char *myipaddr,int32_t pubsock,double profitmargin,void *ptr,int32_t recvlen)
{ {
int32_t len,datalen=0,nonz = 0; char *retstr,*jsonstr=0; cJSON *argjson,*reqjson; int32_t len,datalen=0; char *retstr,*jsonstr=0; cJSON *argjson,*reqjson;
if ( (datalen= is_hexstr((char *)ptr,0)) > 0 ) if ( (datalen= is_hexstr((char *)ptr,0)) > 0 )
{ {
datalen >>= 1; datalen >>= 1;
@ -383,7 +383,6 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,double profit
{ {
pubsock = -1; pubsock = -1;
nanomsg_tcpname(subaddr,myipaddr,mypubport); nanomsg_tcpname(subaddr,myipaddr,mypubport);
printf(">>>>>>>>> myipaddr.%s (%s %s)\n",myipaddr,pushaddr,subaddr);
if ( (pubsock= nn_socket(AF_SP,NN_PUB)) >= 0 ) if ( (pubsock= nn_socket(AF_SP,NN_PUB)) >= 0 )
{ {
if ( nn_bind(pubsock,subaddr) >= 0 ) if ( nn_bind(pubsock,subaddr) >= 0 )
@ -398,6 +397,7 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,double profit
nn_close(pubsock), pubsock = -1; nn_close(pubsock), pubsock = -1;
} }
} else printf("error getting sockets %d %d\n",pullsock,pubsock); } else printf("error getting sockets %d %d\n",pullsock,pubsock);
printf(">>>>>>>>> myipaddr.%s (%s %s) pubsock.%d pullsock.%d\n",myipaddr,pushaddr,subaddr,pubsock,pullsock);
LP_mypubsock = pubsock; LP_mypubsock = pubsock;
LP_mypeer = mypeer = LP_addpeer(mypeer,pubsock,myipaddr,myport,0,0,profitmargin,0,0); LP_mypeer = mypeer = LP_addpeer(mypeer,pubsock,myipaddr,myport,0,0,profitmargin,0,0);
} }

2
iguana/exchanges/LP_network.c

@ -50,7 +50,7 @@ int32_t LP_send(int32_t sock,char *msg,int32_t freeflag)
} }
usleep(1000); usleep(1000);
} }
printf("error LP_send, pipeline timeout.(%s)\n",msg); printf("error LP_send sock.%d, pipeline timeout.(%s)\n",sock,msg);
//if ( (sentbytes= nn_send(sock,msg,len,0)) != len ) //if ( (sentbytes= nn_send(sock,msg,len,0)) != len )
// printf("LP_send sent %d instead of %d\n",sentbytes,len); // printf("LP_send sent %d instead of %d\n",sentbytes,len);
if ( freeflag != 0 ) if ( freeflag != 0 )

3
iguana/exchanges/LP_ordermatch.c

@ -348,6 +348,7 @@ int32_t LP_nanobind(int32_t pair,char *pairstr,char *myipaddr)
timeout = 100; timeout = 100;
nn_setsockopt(pair,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(pair,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
nn_setsockopt(pair,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(pair,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));
printf("nanobind %s to %d\n",pairstr,pair);
return(0); return(0);
} }
} }
@ -444,7 +445,7 @@ char *LP_connectedalice(cJSON *argjson) // alice
swap->N.pair = pairsock; swap->N.pair = pairsock;
autxo->S.swap = swap; autxo->S.swap = swap;
swap->utxo = autxo; swap->utxo = autxo;
printf("alice pairstr.(%s)\n",pairstr); printf("alice pairstr.(%s) pairsock.%d\n",pairstr,pairsock);
if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_aliceloop,(void *)swap) == 0 ) if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_aliceloop,(void *)swap) == 0 )
{ {
jaddstr(retjson,"result","success"); jaddstr(retjson,"result","success");

Loading…
Cancel
Save