X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=0045cd6ffdf12d35d3f3797d5699149d117fbe8f;hb=8538d6c661a083774e5b54163eaf5cdbcadcda6d;hp=52f5e820ffcf8c40e884e5f9c9cf9190f6a91fa2;hpb=1442d234fb6681e32b10348a6c7b226c11629203;p=meshlink diff --git a/src/net_setup.c b/src/net_setup.c index 52f5e820..0045cd6f 100644 --- a/src/net_setup.c +++ b/src/net_setup.c @@ -85,11 +85,11 @@ bool node_read_partial(meshlink_handle_t *mesh, node_t *n) { } } - int32_t devclass = packmsg_get_int32(&in); + dev_class_t devclass = packmsg_get_int32(&in); bool blacklisted = packmsg_get_bool(&in); config_free(&config); - if(!packmsg_input_ok(&in) || devclass < 0 || devclass > _DEV_CLASS_MAX) { + if(!packmsg_input_ok(&in) || devclass < 0 || devclass >= DEV_CLASS_COUNT) { return false; } @@ -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;