X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fuml_socket%2Fdevice.c;h=a371e7b439eb1cb1efb0b8199aef2291054032f0;hp=a2da75759c2aa1fa7f132dffe9c42e7e6bb389fa;hb=2c7c87ec75c94d0b3cca9f7a5aeba34384f77cc1;hpb=6d08eb1614b59d5f86a43edda9db06fca72b76cd diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c index a2da7575..a371e7b4 100644 --- a/src/uml_socket/device.c +++ b/src/uml_socket/device.c @@ -28,6 +28,7 @@ #include "logger.h" #include "utils.h" #include "route.h" +#include "xalloc.h" int device_fd = -1; static int listen_fd = -1; @@ -40,7 +41,7 @@ char *iface = NULL; static char *device_info; extern char *identname; -extern bool running; +extern volatile bool running; static uint64_t device_total_in = 0; static uint64_t device_total_out = 0; @@ -175,7 +176,7 @@ bool read_packet(vpn_packet_t *packet) { switch(state) { case 0: { struct sockaddr sa; - int salen = sizeof sa; + socklen_t salen = sizeof sa; request_fd = accept(listen_fd, &sa, &salen); if(request_fd < 0) { @@ -244,6 +245,10 @@ bool read_packet(vpn_packet_t *packet) { return true; } + + default: + logger(LOG_ERR, "Invalid value for state variable in " __FILE__); + abort(); } }