Ignore REQ_KEY only if we very recently sent one ourselves.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 52f5e820ffcf8c40e884e5f9c9cf9190f6a91fa2..ccfaacce0bb1e9e33f345a991240b0de09b73017 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -321,7 +321,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
        struct addrinfo *ai;
 
        struct addrinfo hint = {
-               .ai_family = addressfamily,
+               .ai_family = AF_UNSPEC,
                .ai_socktype = SOCK_STREAM,
                .ai_protocol = IPPROTO_TCP,
                .ai_flags = AI_PASSIVE,
@@ -395,15 +395,11 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 bool setup_myself(meshlink_handle_t *mesh) {
        /* Set some defaults */
 
-       mesh->localdiscovery = true;
-       keylifetime = 3600; // TODO: check if this can be removed as well
        mesh->maxtimeout = 900;
-       mesh->self->options |= OPTION_PMTU_DISCOVERY;
 
        /* Done */
 
        mesh->self->nexthop = mesh->self;
-       mesh->self->via = mesh->self;
        mesh->self->status.reachable = true;
        mesh->self->last_state_change = mesh->loop.now.tv_sec;
 
@@ -459,7 +455,6 @@ bool setup_network(meshlink_handle_t *mesh) {
 
        mesh->pinginterval = 60;
        mesh->pingtimeout = 5;
-       maxoutbufsize = 10 * MTU;
 
        if(!setup_myself(mesh)) {
                return false;