Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index a696127..40671db 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -25,10 +25,8 @@
 #include "address_cache.h"
 #include "conf.h"
 #include "connection.h"
-#include "control_common.h"
 #include "list.h"
 #include "logger.h"
-#include "meta.h"
 #include "names.h"
 #include "net.h"
 #include "netutl.h"
@@ -41,6 +39,8 @@ int maxtimeout = 900;
 int seconds_till_retry = 5;
 int udp_rcvbuf = 1024 * 1024;
 int udp_sndbuf = 1024 * 1024;
+bool udp_rcvbuf_warnings;
+bool udp_sndbuf_warnings;
 int max_connection_burst = 10;
 int fwmark;
 
@@ -242,6 +242,35 @@ int setup_listen_socket(const sockaddr_t *sa) {
        return nfd;
 }
 
+static void set_udp_buffer(int nfd, int type, const char *name, int size, bool warnings) {
+       if(!size) {
+               return;
+       }
+
+       if(setsockopt(nfd, SOL_SOCKET, type, (void *)&size, sizeof(size))) {
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP %s to %i: %s", name, size, sockstrerror(sockerrno));
+               return;
+       }
+
+       if(!warnings) {
+               return;
+       }
+
+       // The system may cap the requested buffer size.
+       // Read back the value and check if it is now as requested.
+       int actual = -1;
+       socklen_t optlen = sizeof(actual);
+
+       if(getsockopt(nfd, SOL_SOCKET, type, (void *)&actual, &optlen)) {
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Can't read back UDP %s: %s", name, sockstrerror(sockerrno));
+       } else if(optlen != sizeof(actual)) {
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Can't read back UDP %s: unexpected returned optlen %d", name, (int)optlen);
+       } else if(actual < size) {
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP %s to %i, the system set it to %i instead", name, size, actual);
+       }
+}
+
+
 int setup_vpn_in_socket(const sockaddr_t *sa) {
        int nfd;
        char *addrstr;
@@ -285,13 +314,8 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
        setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
        setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof(option));
 
-       if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf))) {
-               logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, sockstrerror(sockerrno));
-       }
-
-       if(udp_sndbuf && setsockopt(nfd, SOL_SOCKET, SO_SNDBUF, (void *)&udp_sndbuf, sizeof(udp_sndbuf))) {
-               logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP SO_SNDBUF to %i: %s", udp_sndbuf, sockstrerror(sockerrno));
-       }
+       set_udp_buffer(nfd, SO_RCVBUF, "SO_RCVBUF", udp_rcvbuf, udp_rcvbuf_warnings);
+       set_udp_buffer(nfd, SO_SNDBUF, "SO_SNDBUF", udp_sndbuf, udp_sndbuf_warnings);
 
 #if defined(IPV6_V6ONLY)
 
@@ -527,7 +551,7 @@ bool do_outgoing_connection(outgoing_t *outgoing) {
        int result;
 
 begin:
-       sa = get_recent_address(outgoing->address_cache);
+       sa = get_recent_address(outgoing->node->address_cache);
 
        if(!sa) {
                logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not set up a meta connection to %s", outgoing->node->name);
@@ -632,6 +656,10 @@ void setup_outgoing_connection(outgoing_t *outgoing, bool verbose) {
 
        node_t *n = outgoing->node;
 
+       if(!n->address_cache) {
+               n->address_cache = open_address_cache(n);
+       }
+
        if(n->connection) {
                logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", n->name);
 
@@ -643,10 +671,6 @@ void setup_outgoing_connection(outgoing_t *outgoing, bool verbose) {
                }
        }
 
-       if(!outgoing->address_cache) {
-               outgoing->address_cache = open_address_cache(n);
-       }
-
        do_outgoing_connection(outgoing);
        return;
 
@@ -680,8 +704,8 @@ void handle_new_meta_connection(void *data, int flags) {
        static sockaddr_t prev_sa;
 
        if(!sockaddrcmp_noport(&sa, &prev_sa)) {
-               static int samehost_burst;
-               static int samehost_burst_time;
+               static time_t samehost_burst;
+               static time_t samehost_burst_time;
 
                if(now.tv_sec - samehost_burst_time > samehost_burst) {
                        samehost_burst = 0;
@@ -702,8 +726,8 @@ void handle_new_meta_connection(void *data, int flags) {
 
        // Check if we get many connections from different hosts
 
-       static int connection_burst;
-       static int connection_burst_time;
+       static time_t connection_burst;
+       static time_t connection_burst_time;
 
        if(now.tv_sec - connection_burst_time > connection_burst) {
                connection_burst = 0;
@@ -787,11 +811,6 @@ void handle_new_unix_connection(void *data, int flags) {
 
 static void free_outgoing(outgoing_t *outgoing) {
        timeout_del(&outgoing->ev);
-
-       if(outgoing->address_cache) {
-               close_address_cache(outgoing->address_cache);
-       }
-
        free(outgoing);
 }
 
@@ -845,6 +864,8 @@ void try_outgoing_connections(void) {
                                node_add(n);
                        }
 
+                       free(name);
+
                        outgoing->node = n;
                        list_insert_tail(outgoing_list, outgoing);
                        setup_outgoing_connection(outgoing, true);