test

basilisk/basilisk_MSG.c

@@ -77,7 +77,7 @@ cJSON *basilisk_respond_getmessage(struct supernet_info *myinfo,uint8_t *key,int
     cJSON *msgjson = 0; struct basilisk_message *msg;
     portable_mutex_lock(&myinfo->messagemutex);
     HASH_FIND(hh,myinfo->messagetable,key,keylen,msg);
-    if ( msg != 0 )
+    if ( msg != 0 && msg->broadcast == 0 )
         msgjson = basilisk_msgjson(msg,key,keylen);
     portable_mutex_unlock(&myinfo->messagemutex);
     return(msgjson);
@@ -126,11 +126,12 @@ int32_t basilisk_msgcmp(struct basilisk_message *msg,int32_t width,uint32_t chan
 {
     uint32_t keychannel,keymsgid; bits256 keysrc,keydest;
     basilisk_messagekeyread(msg->key,&keychannel,&keymsgid,&keysrc,&keydest);
-    if ( keymsgid >= msgid && keymsgid+width <= msgid && keychannel == channel )
-    {
     if ( bits256_nonz(srchash) == 0 || bits256_cmp(srchash,keysrc) == 0 )
     {
         if ( bits256_nonz(desthash) == 0 || bits256_cmp(desthash,keydest) == 0 )
+        {
+            printf("key.(%u %u) channel.%u msgid.%u width.%d\n",keychannel,keymsgid,channel,msgid,width);
+            if ( keymsgid >= msgid && keymsgid+width <= msgid && keychannel == channel )
                 return(0);
             else return(-1);
         } else return(-2);
@@ -142,17 +143,17 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
     struct basilisk_message *msg,*tmpmsg; uint8_t key[BASILISK_KEYSIZE]; int32_t i,keylen,width; cJSON *item,*retjson,*array; bits256 zero;
     memset(zero.bytes,0,sizeof(zero));
     array = cJSON_CreateArray();
-    portable_mutex_lock(&myinfo->messagemutex);
-    portable_mutex_unlock(&myinfo->messagemutex);
     if ( (width= origwidth) > 3600 )
         width = 3600;
     else if ( width < 1 )
         width = 1;
+    portable_mutex_lock(&myinfo->messagemutex);
     HASH_ITER(hh,myinfo->messagetable,msg,tmpmsg)
     {
         if ( msg->broadcast != 0 && basilisk_msgcmp(msg,origwidth,channel,msgid,zero,zero) == 0 )
             jaddi(array,basilisk_msgjson(msg,msg->key,msg->keylen));
     }
+    portable_mutex_unlock(&myinfo->messagemutex);
     //printf("iterate_MSG width.%d channel.%d msgid.%d src.%llx -> %llx\n",origwidth,channel,msgid,(long long)srchash.txid,(long long)desthash.txid);
     for (i=0; i<width; i++)
     {

iguana/iguana_rpc.c

@@ -836,7 +836,7 @@ cJSON *SuperNET_urlconv(char *value,int32_t bufsize,char *urlstr)
 char *SuperNET_rpcparse(struct supernet_info *myinfo,char *retbuf,int32_t bufsize,int32_t *jsonflagp,int32_t *postflagp,char *urlstr,char *remoteaddr,char *filetype,uint16_t port)
 {
     cJSON *tokens,*argjson,*origargjson,*json = 0; long filesize; struct iguana_info *coin = 0;
-    char symbol[64],buf[4096],urlmethod[16],*data,url[8192],furl[8192],*retstr,*filestr,*token = 0; int32_t i,j,n,num=0;
+    char symbol[64],buf[4096],*originstr,urlmethod[16],*data,url[8192],furl[8192],*retstr,*filestr,*token = 0; int32_t i,j,n,num=0;
     //printf("rpcparse.(%s)\n",urlstr);
     if ( myinfo->remoteorigin == 0 )
     {
@@ -844,7 +844,8 @@ char *SuperNET_rpcparse(struct supernet_info *myinfo,char *retbuf,int32_t bufsiz
         for (i=0; i<n; i++)
             if ( strncmp("Origin: ",&urlstr[i],strlen("Origin: ")) == 0 )
             {
-                if ( strncmp("Origin: null",&urlstr[i],strlen("Origin: null")) != 0 )
+                originstr = &urlstr[i + strlen("Origin: ")];
+                if ( strncmp("null",originstr,strlen("null")) != 0 && strncmp("http://localhost:",originstr,strlen("http://localhost:")) != 0 && strncmp("http://127.0.0.1:",originstr,strlen("http://127.0.0.1:")) != 0 )
                 {
                     printf("remote Origin REJECT.(%s)\n",urlstr);
                     return(clonestr("{\"error\":\"remote origin not enabled\"}"));