jl777 9 years ago
parent
commit
52c24c0658
  1. 4
      iguana/main.c
  2. 3
      iguana/tests/notaryinit

4
iguana/main.c

@ -210,7 +210,7 @@ int32_t iguana_jsonQ(struct supernet_info *myinfo,struct iguana_info *coin)
{ {
if ( (ptr->retjsonstr= SuperNET_jsonstr(ptr->myinfo,ptr->jsonstr,ptr->remoteaddr,ptr->port)) == 0 ) if ( (ptr->retjsonstr= SuperNET_jsonstr(ptr->myinfo,ptr->jsonstr,ptr->remoteaddr,ptr->port)) == 0 )
ptr->retjsonstr = clonestr("{\"error\":\"null return from iguana_jsonstr\"}"); ptr->retjsonstr = clonestr("{\"error\":\"null return from iguana_jsonstr\"}");
printf("finished.(%s) -> (%s) %.0f\n",ptr->jsonstr,ptr->retjsonstr!=0?ptr->retjsonstr:"null return",OS_milliseconds()); //printf("finished.(%s) -> (%s) %.0f\n",ptr->jsonstr,ptr->retjsonstr!=0?ptr->retjsonstr:"null return",OS_milliseconds());
queue_enqueue("finishedQ",finishedQ,&ptr->DL,0); queue_enqueue("finishedQ",finishedQ,&ptr->DL,0);
return(1); return(1);
} }
@ -1410,6 +1410,8 @@ ZERO_ARGS(SuperNET,activehandle)
jaddstr(retjson,"handle",myinfo->handle); jaddstr(retjson,"handle",myinfo->handle);
if ( myinfo->ipaddr[0] != 0 ) if ( myinfo->ipaddr[0] != 0 )
jaddstr(retjson,"myip",myinfo->ipaddr); jaddstr(retjson,"myip",myinfo->ipaddr);
if ( myinfo->IAMRELAY != 0 )
jaddnum(retjson,"notary",myinfo->NOTARY.RELAYID);
jaddbits256(retjson,"persistent",myinfo->myaddr.persistent); jaddbits256(retjson,"persistent",myinfo->myaddr.persistent);
if ( myinfo->expiration != 0 ) if ( myinfo->expiration != 0 )
{ {

3
iguana/tests/notaryinit

@ -3,6 +3,7 @@ pkill iguana
../agents/iguana notary & ../agents/iguana notary &
sleep 3 sleep 3
coins/gennotary coins/gennotary
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"SuperNET\",\"method\":\"myipaddr\",\"ipaddr\":\"$myip\"}"
tests/addnotarys_7776 tests/addnotarys_7776
tests/getinfoN_7776 tests/getinfoN_7776
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"SuperNET\",\"method\":\"myipaddr\",\"ipaddr\":\"$myip\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"SuperNET\",\"method\":\"activehandle\"}"

Loading…
Cancel
Save