jl777 7 years ago
parent
commit
07b5a74ba0
  1. 20
      basilisk/basilisk.c
  2. 2
      iguana/dpow/dpow_network.c

20
basilisk/basilisk.c

@ -931,20 +931,20 @@ void basilisks_loop(void *arg)
relay = iguana_coinfind("RELAY");
startmilli = OS_milliseconds();
endmilli = startmilli + 1000;
//fprintf(stderr,"A ");
fprintf(stderr,"A ");
basilisk_issued_purge(myinfo,600000);
//fprintf(stderr,"B ");
fprintf(stderr,"B ");
basilisk_p2pQ_process(myinfo,777);
//fprintf(stderr,"C ");
fprintf(stderr,"C ");
if ( myinfo->IAMNOTARY != 0 )
{
if ( relay != 0 )
{
//fprintf(stderr,"D ");
fprintf(stderr,"D ");
basilisk_ping_send(myinfo,relay);
}
counter++;
//fprintf(stderr,"E ");
fprintf(stderr,"E ");
if ( myinfo->numdpows == 1 )
{
iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]);
@ -961,11 +961,11 @@ void basilisks_loop(void *arg)
}
endmilli = startmilli + 30;
}
//fprintf(stderr,"F ");
fprintf(stderr,"F ");
}
else
{
//fprintf(stderr,"G ");
fprintf(stderr,"G ");
dex_updateclient(myinfo);
if ( myinfo->IAMLP != 0 )
endmilli = startmilli + 500;
@ -973,15 +973,15 @@ void basilisks_loop(void *arg)
}
if ( myinfo->expiration != 0 && (myinfo->dexsock >= 0 || myinfo->IAMLP != 0 || myinfo->DEXactive > time(NULL)) )
{
//fprintf(stderr,"H ");
fprintf(stderr,"H ");
for (i=0; i<100; i++)
if ( basilisk_requests_poll(myinfo) <= 0 )
break;
}
//printf("RELAYID.%d endmilli %f vs now %f\n",myinfo->NOTARY.RELAYID,endmilli,startmilli);
printf("RELAYID.%d endmilli %f vs now %f\n",myinfo->NOTARY.RELAYID,endmilli,startmilli);
while ( OS_milliseconds() < endmilli )
usleep(10000);
//printf("finished waiting numdpow.%d\n",myinfo->numdpows);
printf("finished waiting numdpow.%d\n",myinfo->numdpows);
iter++;
}
}

2
iguana/dpow/dpow_network.c

@ -2015,7 +2015,7 @@ void dpow_ipbitsadd(struct supernet_info *myinfo,struct dpow_info *dp,uint32_t *
if ( j == n )
missing++;
}
if ( (numipbits == 1 || missing < matched || matched > 0) && missing > 0 )
if ( (numipbits == 1 || missing < matched || matched >= 0) && missing > 0 )
{
for (i=0; i<numipbits; i++)
if ( ipbits[i] != 0 )

Loading…
Cancel
Save