Set FD_CLOEXEC flag on all sockets.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index b3f924a..ea4bbcf 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -289,7 +289,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 
        /* check input from kernel */
        if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
-               if(read_packet(&packet)) {
+               if(devops.read(&packet)) {
                        errors = 0;
                        packet.priority = 0;
                        route(myself, &packet);
@@ -472,7 +472,7 @@ int main_loop(void) {
 
                        if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
                                logger(LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
-                               sleep(sleeptime);
+                               usleep(sleeptime * 1000000LL);
                                sleeptime *= 2;
                                if(sleeptime < 0)
                                        sleeptime = 3600;