Initial events test

iguana/exchanges/LP_network.c

@@ -426,6 +426,7 @@ struct LP_queuedcommand
     struct LP_queuedcommand *next,*prev;
     char **retstrp;
     int32_t responsesock,msglen,stats_JSONonly;
+    uint32_t queueid;
     char msg[];
 } *LP_commandQ;
     
@@ -446,8 +447,11 @@ void LP_commandQ_loop(void *ctx)
                 if ( (retstr= LP_command_process(ctx,"127.0.0.1",ptr->responsesock,argjson,(uint8_t *)ptr->msg,ptr->msglen,ptr->stats_JSONonly)) != 0 )
                 {
                     //printf("processed.(%s)\n",retstr);
-                    if ( ptr->responsesock >= 0  && (size= nn_send(ptr->responsesock,retstr,(int32_t)strlen(retstr)+1,0)) <= 0 )
-                        printf("error sending result\n");
+                    if ( ptr->responsesock >= 0  )
+                    {
+                        if ( (size= nn_send(ptr->responsesock,retstr,(int32_t)strlen(retstr)+1,0)) <= 0 )
+                            printf("error sending result\n");
+                    }
                     if ( ptr->retstrp != 0 )
                         (*ptr->retstrp) = retstr;
                     else free(retstr);
@@ -463,7 +467,7 @@ void LP_commandQ_loop(void *ctx)
     }
 }
     
-void LP_queuecommand(char **retstrp,char *buf,int32_t responsesock,int32_t stats_JSONonly)
+void LP_queuecommand(char **retstrp,char *buf,int32_t responsesock,int32_t stats_JSONonly,uint32_t queueid)
 {
     struct LP_queuedcommand *ptr; int32_t msglen;
     msglen = (int32_t)strlen(buf) + 1;
@@ -471,8 +475,10 @@ void LP_queuecommand(char **retstrp,char *buf,int32_t responsesock,int32_t stats
     ptr = calloc(1,sizeof(*ptr) + msglen);
     if ( (ptr->retstrp= retstrp) != 0 )
         *retstrp = 0;
-    ptr->responsesock = responsesock;
     ptr->msglen = msglen;
+    if ( (ptr->queueid= queueid) != 0 && responsesock < 0 )
+        ptr->responsesock = IPC_ENDPOINT;
+    else ptr->responsesock = responsesock;
     ptr->stats_JSONonly = stats_JSONonly;
     memcpy(ptr->msg,buf,msglen);
     DL_APPEND(LP_commandQ,ptr);

iguana/exchanges/getendpoint

@@ -0,0 +1,3 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getendpoint\"}"

iguana/exchanges/stats.c

@@ -29,7 +29,7 @@
 #define STATS_DEST "/var/www/html/DEXstats.json"
 #include "DEXstats.h"
 char *stats_JSON(void *ctx,char *myipaddr,int32_t mypubsock,cJSON *argjson,char *remoteaddr,uint16_t port);
-void LP_queuecommand(char **retstrp,char *buf,int32_t responsesock,int32_t stats_JSONonly);
+void LP_queuecommand(char **retstrp,char *buf,int32_t responsesock,int32_t stats_JSONonly,uint32_t queueid);
 extern uint32_t DOCKERFLAG;
 
 char *stats_validmethods[] =
@@ -335,7 +335,7 @@ extern int32_t IPC_ENDPOINT;
 char *stats_rpcparse(char *retbuf,int32_t bufsize,int32_t *jsonflagp,int32_t *postflagp,char *urlstr,char *remoteaddr,char *filetype,uint16_t port)
 {
     static void *ctx;
-    cJSON *tokens,*argjson,*origargjson,*tmpjson=0,*json = 0; long filesize; char symbol[64],buf[4096],*userpass=0,urlmethod[16],*data,url[8192],furl[8192],*retstr=0,*filestr,*token = 0; int32_t i,j,n,num=0;
+    cJSON *tokens,*argjson,*origargjson,*tmpjson=0,*json = 0; long filesize; char symbol[64],buf[4096],*userpass=0,urlmethod[16],*data,url[8192],furl[8192],*retstr=0,*filestr,*token = 0; int32_t i,j,n,num=0; uint32_t queueid;
     if ( ctx == 0 )
         ctx = bitcoin_ctx();
     for (i=0; i<sizeof(urlmethod)-1&&urlstr[i]!=0&&urlstr[i]!=' '; i++)
@@ -570,23 +570,21 @@ char *stats_rpcparse(char *retbuf,int32_t bufsize,int32_t *jsonflagp,int32_t *po
 #ifdef FROM_MARKETMAKER
                 if ( strcmp(remoteaddr,"127.0.0.1") == 0 || LP_valid_remotemethod(arg) > 0 )
                 {
-                    if ( IPC_ENDPOINT >= 0 )
+                    if ( IPC_ENDPOINT >= 0 && (queueid= juint(arg,"queueid")) > 0 )
                     {
-                        if ( jobj(arg,"id") == 0 )
-                            jaddnum(arg,"id",rand());
                         buf = jprint(arg,0);
-                        LP_queuecommand(&retstr,buf,-1,1);
+                        LP_queuecommand(&retstr,buf,-1,1,queueid);
                         free(buf);
                         retstr = clonestr("{\"result\":\"success\",\"status\":\"queued\"}");
                     } else retstr = stats_JSON(ctx,"127.0.0.1",-1,arg,remoteaddr,port);
                 } else retstr = clonestr("{\"error\":\"invalid remote method\"}");
 #else
-                if ( IPC_ENDPOINT >= 0 )
+                if ( IPC_ENDPOINT >= 0 && (queueid= juint(arg,"queueid")) > 0 )
                 {
                     if ( jobj(arg,"id") == 0 )
                         jaddnum(arg,"id",rand());
                     buf = jprint(arg,0);
-                    LP_queuecommand(&retstr,buf,-1,1);
+                    LP_queuecommand(&retstr,buf,-1,1,queueid);
                     free(buf);
                 } else retstr = stats_JSON(ctx,myipaddr,-1,arg,remoteaddr,port);
 #endif