test

basilisk/basilisk_CMD.c

@@ -15,6 +15,15 @@
 
 // included from basilisk.c
 
+/*int32_t basilisk_relayid(struct supernet_info *myinfo,char *ipaddr)
+{
+    uint32_t i,ipbits = (uint32_t)calc_ipbits(ipaddr);
+    for (i=0; i<myinfo->numrelays; i++)
+        if ( ipbits == myinfo->relays[i].ipbits )
+            return(i);
+    return(-1);
+}*/
+
 struct iguana_peer *basilisk_ensurerelay(struct supernet_info *myinfo,struct iguana_info *btcd,uint32_t ipbits)
 {
     struct iguana_peer *addr; int32_t i;

basilisk/basilisk_ping.c

@@ -181,7 +181,7 @@ void basilisk_ping_process(struct supernet_info *myinfo,struct iguana_peer *addr
     //else printf("\n");
     //for (i=0; i<datalen; i++)
     //    printf("%02x",data[i]);
-    printf(" <- input ping from.(%s) numrelays.%d datalen.%d relay.%d\n",ipbuf,numrelays,datalen,myinfo->RELAYID);
+    printf(" <- input ping from.(%s) rel.%d numrelays.%d datalen.%d relay.%d\n",ipbuf,basilisk_relayid(myinfo,(uint32_t)calc_ipbits(ipbuf)),numrelays,datalen,myinfo->RELAYID);
 }
 
 int32_t basilisk_ping_gen(struct supernet_info *myinfo,uint8_t *data,int32_t maxlen)
@@ -204,15 +204,18 @@ int32_t basilisk_ping_gen(struct supernet_info *myinfo,uint8_t *data,int32_t max
 
 void basilisk_ping_send(struct supernet_info *myinfo,struct iguana_info *btcd)
 {
-    struct iguana_peer *addr; char ipaddr[64]; struct basilisk_relay *rp; int32_t i,incr,datalen=0;
+    struct iguana_peer *addr; char ipaddr[64]; struct basilisk_relay *rp; int32_t i,j,incr,datalen=0;
     if ( btcd == 0 )
         return;
     if ( myinfo->pingbuf == 0 )
         myinfo->pingbuf = malloc(IGUANA_MAXPACKETSIZE);
     datalen = basilisk_ping_gen(myinfo,&myinfo->pingbuf[sizeof(struct iguana_msghdr)],IGUANA_MAXPACKETSIZE-sizeof(struct iguana_msghdr));
-    incr = sqrt(myinfo->numrelays);
-    for (i=myinfo->RELAYID; i<myinfo->numrelays; i+=incr)
+    incr = sqrt(myinfo->numrelays) + 1;
+    for (j=0; j<incr; j++)
     {
+        i = (j == 0) ? myinfo->RELAYID : (rand() % myinfo->numrelays);
+        if ( j != 0 && i == myinfo->RELAYID )
+            i = (myinfo->RELAYID + 1) % myinfo->numrelays;
         rp = &myinfo->relays[i];
         addr = 0;
         expand_ipbits(ipaddr,rp->ipbits);

crypto777/OS_portable.c

@@ -127,7 +127,7 @@ int32_t OS_portable_removefile(char *fname)
 
 int32_t OS_portable_rmdir(char *dirname,int32_t diralso)
 {
-    char cmdstr[1024],tmp[512]; int32_t i;
+    char cmdstr[1024],tmp[512]; //int32_t i;
     strcpy(tmp,dirname);
     OS_portable_path(tmp);
 #ifdef _WIN32