X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=64bca947ff08b80c25b4735e68b06321c4e5ae39;hp=528e046b9464a9903a79bad73aceaccc8d123cbf;hb=df985256a766ee90f2fa4269b95fa0565c969dda;hpb=9f53ab209d8a6a7622a49ed03cef735b6e3f3eeb diff --git a/src/net.c b/src/net.c index 528e046b..64bca947 100644 --- a/src/net.c +++ b/src/net.c @@ -297,7 +297,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) { if(FD_ISSET(c->socket, readset)) { if(c->status.connecting) { c->status.connecting = false; - getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len); + getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len); if(!result) finish_connecting(c); @@ -506,10 +506,15 @@ int main_loop(void) { subnet = node->data; if(subnet->expires == 1) { send_del_subnet(broadcast, subnet); + if(subnet->owner->status.reachable) + subnet_update(subnet->owner, subnet, false); subnet_del(subnet->owner, subnet); } else if(subnet->expires == -1) { - send_add_subnet(broadcast, subnet); subnet->expires = 0; + } else { + send_add_subnet(broadcast, subnet); + if(subnet->owner->status.reachable) + subnet_update(subnet->owner, subnet, true); } } }