test

basilisk/basilisk.c

@@ -671,7 +671,7 @@ void basilisk_msgprocess(struct supernet_info *myinfo,void *_addr,uint32_t sende
                     //printf("services %s\n",type);
                     if ( (retstr= (*basilisk_services[i][1])(myinfo,type,addr,remoteaddr,basilisktag,valsobj,data,datalen,hash,from_basilisk)) != 0 )
                     {
-                        printf("from_basilisk.%d ret.(%s)\n",from_basilisk,retstr);
+                        //printf("from_basilisk.%d ret.(%s)\n",from_basilisk,retstr);
                         //if ( from_basilisk != 0 || strcmp(CMD,"GET") == 0 )
                             basilisk_sendback(myinfo,CMD,symbol,remoteaddr,basilisktag,retstr);
                         if ( retstr != 0 )

basilisk/basilisk_MSG.c

@@ -128,7 +128,7 @@ char *basilisk_respond_OUT(struct supernet_info *myinfo,char *CMD,void *addr,cha
     int32_t keylen; uint8_t key[64];
     keylen = basilisk_messagekey(key,hash,valsobj);
     //printf("keylen.%d datalen.%d\n",keylen,datalen);
-    char str[65]; printf("add message channel.%u msgid.%x %s\n",juint(valsobj,"channel"),juint(valsobj,"msgid"),bits256_str(str,hash));
+    char str[65]; printf("add message.[%d] channel.%u msgid.%x %s\n",datalen,juint(valsobj,"channel"),juint(valsobj,"msgid"),bits256_str(str,hash));
     return(basilisk_respond_addmessage(myinfo,key,keylen,data,datalen,1));
 }
 
@@ -136,7 +136,7 @@ char *basilisk_respond_MSG(struct supernet_info *myinfo,char *CMD,void *addr,cha
 {
     int32_t keylen; uint8_t key[64];
     keylen = basilisk_messagekey(key,hash,valsobj);
-    char str[65]; printf("%s channel.%u msgid.%u\n",bits256_str(str,hash),juint(valsobj,"channel"),juint(valsobj,"msgid"));
+    char str[65]; printf("%s channel.%u msgid.%u datalen.%d\n",bits256_str(str,hash),juint(valsobj,"channel"),juint(valsobj,"msgid"),datalen);
     return(basilisk_respond_getmessage(myinfo,key,keylen));
 }
 
@@ -174,12 +174,13 @@ HASH_ARRAY_STRING(basilisk,sendmessage,hash,vals,hexstr)
 
 int32_t basilisk_channelsend(struct supernet_info *myinfo,bits256 hash,uint32_t channel,uint32_t msgid,uint8_t *data,int32_t datalen)
 {
-    char *retstr,*hexstr,strbuf[16384],*ptr = 0; int32_t retval = -1; cJSON *retarray,*item,*valsobj;
+    char *retstr,*hexstr,strbuf[4096],*ptr = 0; int32_t retval = -1; cJSON *retarray,*item,*valsobj;
     if ( (hexstr= basilisk_addhexstr(&ptr,0,strbuf,sizeof(strbuf),data,datalen)) != 0 )
     {
         valsobj = cJSON_CreateObject();
         jaddnum(valsobj,"channel",channel);
         jaddnum(valsobj,"msgid",msgid);
+        char str[65]; printf("sendmessage.[%d] channel.%u msgid.%x -> %s\n",datalen,channel,msgid,bits256_str(str,hash));
         if ( (retstr= basilisk_sendmessage(myinfo,0,0,0,hash,valsobj,hexstr)) != 0 )
         {
             if ( (retarray= cJSON_Parse(retstr)) != 0 )

basilisk/basilisk_swap.c

@@ -371,13 +371,6 @@ void basilisk_swap_purge(struct supernet_info *myinfo,struct basilisk_swap *swap
     portable_mutex_unlock(&myinfo->DEX_swapmutex);
 }
 
-uint32_t basilisk_swapsend(struct supernet_info *myinfo,struct basilisk_swap *swap,uint32_t msgbits,uint8_t *data,int32_t datalen,uint32_t nextbits)
-{
-    if ( basilisk_channelsend(myinfo,swap->otherhash,swap->req.quoteid,msgbits,data,datalen) == 0 )
-        return(nextbits);
-    else return(0);
-}
-
 int32_t basilisk_verify_statebits(struct supernet_info *myinfo,struct basilisk_swap *swap,uint8_t *data,int32_t datalen)
 {
     iguana_rwnum(0,data,sizeof(swap->otherstatebits),&swap->otherstatebits);
@@ -515,6 +508,13 @@ int32_t basilisk_swapget(struct supernet_info *myinfo,struct basilisk_swap *swap
     else return(-1);
 }
 
+uint32_t basilisk_swapsend(struct supernet_info *myinfo,struct basilisk_swap *swap,uint32_t msgbits,uint8_t *data,int32_t datalen,uint32_t nextbits)
+{
+    if ( basilisk_channelsend(myinfo,swap->otherhash,swap->req.quoteid,msgbits,data,datalen) == 0 )
+        return(nextbits);
+    else return(0);
+}
+
 uint32_t basilisk_swapdata_rawtxsend(struct supernet_info *myinfo,struct basilisk_swap *swap,uint32_t msgbits,uint8_t *data,int32_t maxlen,struct basilisk_rawtx *rawtx,uint32_t nextbits)
 {
     if ( basilisk_swapdata_rawtx(myinfo,swap,data,maxlen,rawtx) != 0 )
@@ -536,7 +536,7 @@ void basilisk_swaploop(void *_swap)
     while ( time(NULL) < swap->expiration )
     {
         fprintf(stderr,"swapstate.%x\n",swap->statebits);
-        data[0] = swap->statebits;
+        /*data[0] = swap->statebits;
         data[1] = swap->statebits >> 8;
         datalen = 2;
         basilisk_swapsend(myinfo,swap,0,data,datalen,0);
@@ -554,7 +554,7 @@ void basilisk_swaploop(void *_swap)
                 iguana_rwnum(1,data,sizeof(swap->choosei),&swap->choosei);
                 basilisk_swapsend(myinfo,swap,0x08,data,datalen,0);
             }
-        }
+        }*/
         if ( (swap->statebits & 0x01) == 0 ) // send pubkeys
         {
             datalen = basilisk_swapdata_deck(myinfo,swap,data,maxlen);