Merge pull request #809 from jl777/jl777

Jl777

iguana/dpow/dpow_network.c

@@ -84,7 +84,7 @@ int32_t signed_nn_send(struct supernet_info *myinfo,void *ctx,bits256 privkey,in
                         sentbytes = nn_send(sock,sigpacket,size + sizeof(*sigpacket),0);
                         //for (i=0; i<size+sizeof(*sigpacket); i++)
                         //    printf("%02x",((uint8_t *)sigpacket)[i]);
-                        //printf(" <- nnsend\n");
+                        //printf(" <- nnsend.%d\n",sock);
                         free(sigpacket);
                         return(sentbytes - siglen);
                     }
@@ -1824,8 +1824,9 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
         {
             //fprintf(stderr,"{%d %x} ",senderind,paxwdcrc);
         }
-        if ( (bp->notaries[senderind].bestk= bestk) >= 0 )
+        if ( bestk >= 0 )
         {
+            bp->notaries[senderind].bestk = bestk;
             if ( (bp->notaries[senderind].src.siglens[bestk]= siglens[0]) != 0 )
             {
                 memcpy(bp->notaries[senderind].src.sigs[bestk],sigs[0],siglens[0]);
@@ -1944,11 +1945,17 @@ void dpow_nanoutxoget(struct supernet_info *myinfo,struct dpow_info *dp,struct d
 
 void dpow_send(struct supernet_info *myinfo,struct dpow_info *dp,struct dpow_block *bp,bits256 srchash,bits256 desthash,uint32_t channel,uint32_t msgbits,uint8_t *data,int32_t datalen)
 {
-    struct dpow_nanomsghdr *np; int32_t i,src_or_dest,size,extralen=0,sentbytes = 0; uint32_t crc32,paxwdcrc; uint8_t extras[10000];
+    struct dpow_nanomsghdr *np; int32_t i,maxiters,src_or_dest,size,extralen=0,sentbytes = 0; uint32_t crc32,paxwdcrc; uint8_t extras[10000];
     if ( bp->myind < 0 )
+    {
+        printf("bp->myind.%d error\n",bp->myind);
         return;
+    }
     if ( time(NULL) < myinfo->nanoinit+5 )
+    {
+        printf("dpow_send waiting for init\n");
         return;
+    }
     crc32 = calc_crc32(0,data,datalen);
      //dp->crcs[firstz] = crc32;
     size = (int32_t)(sizeof(*np) + datalen);
@@ -1995,18 +2002,21 @@ void dpow_send(struct supernet_info *myinfo,struct dpow_info *dp,struct dpow_blo
     memcpy(np->packet,data,datalen);
     sentbytes = -1;
     // deadlocks! portable_mutex_lock(&myinfo->dpowmutex);
-    for (i=0; i<100; i++)
+    maxiters = 100;
+    for (i=0; i<maxiters; i++)
     {
         struct nn_pollfd pfd;
         pfd.fd = myinfo->dpowsock;
         pfd.events = NN_POLLOUT;
-        if ( nn_poll(&pfd,1,100) > 0 )
+        if ( nn_poll(&pfd,1,1) > 0 )
         {
             sentbytes = signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->dpowsock,np,size);
             break;
         }
         usleep(1000);
     }
+    if ( i == maxiters )
+        printf("maxiters expired for signed_nn_send dpowsock.%d\n",myinfo->dpowsock);
     //portable_mutex_unlock(&myinfo->dpowmutex);
     free(np);
     if ( 0 && bp->myind <= 2 )
@@ -2123,7 +2133,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo)
         } else flags |= 1;
         if ( freeptr != 0 )
             nn_freemsg(freeptr), np = 0, freeptr = 0;
-        if ( 0 && myinfo->dexsock >= 0 ) // from servers
+        /*if ( 0 && myinfo->dexsock >= 0 ) // from servers
         {
             freeptr = 0;
             if ( (flags & 2) == 0 && (size= signed_nn_recv(&freeptr,myinfo,myinfo->notaries,myinfo->numnotaries,myinfo->dexsock,&dexp)) > 0 )
@@ -2140,8 +2150,8 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo)
             } else flags |= 2;
             if ( freeptr != 0 )
                 nn_freemsg(freeptr), dexp = 0, freeptr = 0;
-        }
-        if ( 0 && myinfo->repsock >= 0 ) // from clients
+        }*/
+        /*if ( 0 && myinfo->repsock >= 0 ) // from clients
         {
             dexp = 0;
             if ( (flags & 4) == 0 && (size= nn_recv(myinfo->repsock,&dexp,NN_MSG,0)) > 0 )
@@ -2184,7 +2194,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo)
             } else flags |= 4;
             if ( dexp != 0 )
                 nn_freemsg(dexp), dexp = 0;
-        }
+        }*/
         if ( (num + n + num2) != lastval )
         {
             //printf("lastval.%d: num.%d n.%d num2.%d rep packets\n",lastval,num,n,num2);

iguana/m_notary_run

@@ -19,6 +19,8 @@ sleep 3
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"78.47.196.146\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"82.202.193.98\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"54.95.68.31\"}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"142.54.164.114\"}"
+
 #tests/addnotarys_7776
 coins/btc_7776
 #coins/ltc_7776