#include "address_cache.h"
#include "conf.h"
#include "connection.h"
+#include "crypto.h"
#include "list.h"
#include "logger.h"
#include "names.h"
listen_socket_t listen_socket[MAXSOCKETS];
int listen_sockets;
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
io_t unix_socket;
#endif
int status;
#endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */
- if(!get_config_string(lookup_config(config_tree, "BindToInterface"), &iface)) {
+ if(!get_config_string(lookup_config(&config_tree, "BindToInterface"), &iface)) {
return true;
}
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(get_config_string
- (lookup_config(config_tree, "BindToInterface"), &iface)) {
+ (lookup_config(&config_tree, "BindToInterface"), &iface)) {
#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
struct ifreq ifr;
#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;
}
}
timeout_add(&outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval) {
- outgoing->timeout, rand() % 100000
+ outgoing->timeout, jitter()
});
logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout);
}
static void do_outgoing_pipe(connection_t *c, const char *command) {
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
int fd[2];
if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) {
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);
c->allow_request = ID;
}
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
/*
accept a new UNIX socket connection
*/
/* Make sure there is one outgoing_t in the list for each ConnectTo. */
- for(config_t *cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+ for(config_t *cfg = lookup_config(&config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(&config_tree, cfg)) {
char *name;
get_config_string(cfg, &name);