From 827dc933c11bfdc40085cfc928628a0f95f6ee2d Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 17 Jan 2016 22:40:46 -0300 Subject: [PATCH] test --- iguana/SuperNET.c | 4 ++-- iguana/iguana777.h | 1 + iguana/iguana_accept.c | 2 +- iguana/main.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/iguana/SuperNET.c b/iguana/SuperNET.c index 888500502..615bc7ac2 100644 --- a/iguana/SuperNET.c +++ b/iguana/SuperNET.c @@ -28,10 +28,10 @@ int32_t SuperNET_delaymillis(struct supernet_info *myinfo,int32_t maxdelay) void SuperNET_remotepeer(struct supernet_info *myinfo,struct iguana_info *coin,char *symbol,char *ipaddr,int32_t supernetflag) { uint64_t ipbits; struct iguana_peer *addr; + ipbits = calc_ipbits(ipaddr); printf("got %s remotepeer.(%s) supernet.%d\n",symbol,ipaddr,supernetflag); - if ( supernetflag != 0 ) + if ( supernetflag != 0 && (uint32_t)myinfo->myaddr.selfipbits != (uint32_t)ipbits ) { - ipbits = calc_ipbits(ipaddr); if ( (addr= iguana_peerslot(coin,ipbits)) != 0 ) { printf("launch startconnection to supernet peer.(%s)\n",ipaddr); diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 47b66e22b..d9927836d 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -693,6 +693,7 @@ void ramcoder_test(void *data,int64_t len); void iguana_exit(); int32_t iguana_pendingaccept(struct iguana_info *coin); char *iguana_blockingjsonstr(struct supernet_info *myinfo,char *jsonstr,uint64_t tag,int32_t maxmillis,char *remoteaddr); +void iguana_iAkill(struct iguana_info *coin,struct iguana_peer *addr,int32_t markflag); extern queue_t bundlesQ; diff --git a/iguana/iguana_accept.c b/iguana/iguana_accept.c index 861404e16..7926e98af 100755 --- a/iguana/iguana_accept.c +++ b/iguana/iguana_accept.c @@ -91,7 +91,7 @@ void iguana_acceptloop(void *args) if ( coin->peers.active[i].ipbits == (uint32_t)ipbits && coin->peers.active[i].usock >= 0 ) { printf("found existing peer.(%s) in slot[%d]\n",ipaddr,i); - coin->peers.active[i].dead = (uint32_t)time(NULL); + iguana_iAkill(coin,addr,0); sleep(1); } } diff --git a/iguana/main.c b/iguana/main.c index 0fb9e4af2..fb1aaf62a 100644 --- a/iguana/main.c +++ b/iguana/main.c @@ -321,7 +321,7 @@ void iguana_main(void *arg) #ifdef __APPLE__ sleep(1); char *str; - if ( (str= SuperNET_JSON(&MYINFO,cJSON_Parse("{\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":0,\"maxpeers\":2,\"activecoin\":\"BTCD\",\"active\":1}"),0)) != 0 ) + if ( (str= SuperNET_JSON(&MYINFO,cJSON_Parse("{\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":128,\"maxpeers\":2,\"activecoin\":\"BTCD\",\"active\":1}"),0)) != 0 ) { printf("got.(%s)\n",str); free(str);