projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sr.ht CI: update FreeBSD and OpenBSD image versions
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
3ac5a67
..
dd6c58f
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-184,8
+184,7
@@
void load_all_nodes(void) {
read_host_config(&config, ent->d_name, true);
if(!n) {
read_host_config(&config, ent->d_name, true);
if(!n) {
- n = new_node();
- n->name = xstrdup(ent->d_name);
+ n = new_node(ent->d_name);
node_add(n);
}
node_add(n);
}
@@
-675,6
+674,7
@@
static bool add_listen_address(char *address, bool bindto) {
}
if(listen_sockets >= MAXSOCKETS) {
}
if(listen_sockets >= MAXSOCKETS) {
+ listen_sockets = MAXSOCKETS;
logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
freeaddrinfo(ai);
return false;
logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
freeaddrinfo(ai);
return false;
@@
-764,10
+764,9
@@
static bool setup_myself(void) {
}
myname = xstrdup(name);
}
myname = xstrdup(name);
- myself = new_node();
+ myself = new_node(
name
);
myself->connection = new_connection();
myself->connection = new_connection();
- myself->name = name;
- myself->connection->name = xstrdup(name);
+ myself->connection->name = name;
read_host_config(&config_tree, name, true);
if(!get_config_string(lookup_config(&config_tree, "Port"), &myport.tcp)) {
read_host_config(&config_tree, name, true);
if(!get_config_string(lookup_config(&config_tree, "Port"), &myport.tcp)) {
@@
-1087,16
+1086,19
@@
static bool setup_myself(void) {
/* Open sockets */
/* Open sockets */
- if(!do_detach && getenv("LISTEN_FDS")) {
+ const char *listen_fds = getenv("LISTEN_FDS");
+
+ if(!do_detach && listen_fds) {
sockaddr_t sa;
socklen_t salen;
sockaddr_t sa;
socklen_t salen;
- listen_sockets = atoi(
getenv("LISTEN_FDS")
);
+ listen_sockets = atoi(
listen_fds
);
#ifdef HAVE_UNSETENV
unsetenv("LISTEN_FDS");
#endif
if(listen_sockets > MAXSOCKETS) {
#ifdef HAVE_UNSETENV
unsetenv("LISTEN_FDS");
#endif
if(listen_sockets > MAXSOCKETS) {
+ listen_sockets = MAXSOCKETS;
logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
return false;
}