return true;
}
+static bool try_bind(int nfd, const sockaddr_t *sa, const char *type) {
+ if(!bind(nfd, &sa->sa, SALEN(sa->sa))) {
+ return true;
+ }
+
+ closesocket(nfd);
+ char *addrstr = sockaddr2hostname(sa);
+ logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s/%s: %s", addrstr, type, sockstrerror(sockerrno));
+ free(addrstr);
+ return false;
+}
+
int setup_listen_socket(const sockaddr_t *sa) {
int nfd;
- char *addrstr;
int option;
char *iface;
#endif
}
- if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
- closesocket(nfd);
- addrstr = sockaddr2hostname(sa);
- logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s/tcp: %s", addrstr, sockstrerror(sockerrno));
- free(addrstr);
+ if(!try_bind(nfd, sa, "tcp")) {
return -1;
}
}
}
-
int setup_vpn_in_socket(const sockaddr_t *sa) {
int nfd;
- char *addrstr;
int option;
nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
return -1;
}
- if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
- closesocket(nfd);
- addrstr = sockaddr2hostname(sa);
- logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s/udp: %s", addrstr, sockstrerror(sockerrno));
- free(addrstr);
+ if(!try_bind(nfd, sa, "udp")) {
return -1;
}
sockaddr2str(&c->address, &host, &port);
setenv("REMOTEADDRESS", host, true);
setenv("REMOTEPORT", port, true);
- setenv("NODE", c->name, true);
setenv("NAME", myself->name, true);
+ if(c->name) {
+ setenv("NODE", c->name, true);
+ }
+
if(netname) {
setenv("NETNAME", netname, true);
}
c->last_ping_time = time(NULL);
c->status.connecting = true;
c->name = xstrdup(outgoing->node->name);
-#ifndef DISABLE_LEGACY
- c->outcipher = myself->connection->outcipher;
- c->outdigest = myself->connection->outdigest;
-#endif
c->outmaclength = myself->connection->outmaclength;
- c->outcompression = myself->connection->outcompression;
c->last_ping_time = now.tv_sec;
connection_add(c);
c = new_connection();
c->name = xstrdup("<unknown>");
-#ifndef DISABLE_LEGACY
- c->outcipher = myself->connection->outcipher;
- c->outdigest = myself->connection->outdigest;
-#endif
c->outmaclength = myself->connection->outmaclength;
- c->outcompression = myself->connection->outcompression;
c->address = sa;
c->hostname = sockaddr2hostname(&sa);