Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / raw_socket_device.c

diff --git a/src/raw_socket_device.c b/src/raw_socket_device.c
index 1dd726f888de2d172efb9b7a8eeea2f7efaa9f29..3785dcf69782012ad78280b840d7ead2aeeed58e 100644 (file)
--- a/src/raw_socket_device.c
+++ b/src/raw_socket_device.c
@@ -56,11 +56,12 @@ static bool setup_device(void) {
                return false;
        }
 
+       memset(&ifr, 0, sizeof ifr);
+
 #ifdef FD_CLOEXEC
        fcntl(device_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-       memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
        if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
                close(device_fd);
@@ -69,12 +70,12 @@ static bool setup_device(void) {
                return false;
        }
 
-       memset(&sa, '0', sizeof(sa));
+       memset(&sa, '0', sizeof sa);
        sa.sll_family = AF_PACKET;
        sa.sll_protocol = htons(ETH_P_ALL);
        sa.sll_ifindex = ifr.ifr_ifindex;
 
-       if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
+       if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof sa)) {
                logger(LOG_ERR, "Could not bind %s to %s: %s", device, iface, strerror(errno));
                return false;
        }
@@ -92,15 +93,15 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-       int lenin;
+       int inlen;
 
-       if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+       if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
                           device, strerror(errno));
                return false;
        }
 
-       packet->len = lenin;
+       packet->len = inlen;
 
        device_total_in += packet->len;