X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fuml_socket%2Fdevice.c;h=27fdd337aea77445a1268c1d1e06877ac1f35702;hb=fbf305c09d91bf34b1504b58d50392df2e6bcfba;hp=a7a70fb380a895cb42d72d8ce7e70f933c0d40cd;hpb=de78d79db84c486afcc353884ec1770866beb653;p=tinc diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c index a7a70fb3..27fdd337 100644 --- a/src/uml_socket/device.c +++ b/src/uml_socket/device.c @@ -57,8 +57,7 @@ static struct request { static struct sockaddr_un data_sun; -bool setup_device(void) -{ +bool setup_device(void) { struct sockaddr_un listen_sun; static const int one = 1; struct { @@ -154,8 +153,7 @@ bool setup_device(void) return true; } -void close_device(void) -{ +void close_device(void) { cp(); if(listen_fd >= 0) @@ -173,9 +171,8 @@ void close_device(void) unlink(device); } -bool read_packet(vpn_packet_t *packet) -{ - int lenin; +bool read_packet(vpn_packet_t *packet) { + int inlen; cp(); @@ -205,7 +202,7 @@ bool read_packet(vpn_packet_t *packet) } case 1: { - if((lenin = read(request_fd, &request, sizeof request)) != sizeof request) { + if((inlen = read(request_fd, &request, sizeof request)) != sizeof request) { logger(LOG_ERR, _("Error while reading request from %s %s: %s"), device_info, device, strerror(errno)); running = false; @@ -235,14 +232,14 @@ bool read_packet(vpn_packet_t *packet) } case 2: { - if((lenin = read(data_fd, packet->data, MTU)) <= 0) { + if((inlen = read(data_fd, packet->data, MTU)) <= 0) { logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); running = false; return false; } - packet->len = lenin; + packet->len = inlen; device_total_in += packet->len; @@ -254,8 +251,7 @@ bool read_packet(vpn_packet_t *packet) } } -bool write_packet(vpn_packet_t *packet) -{ +bool write_packet(vpn_packet_t *packet) { cp(); if(state != 2) { @@ -281,8 +277,7 @@ bool write_packet(vpn_packet_t *packet) return true; } -void dump_device_stats(void) -{ +void dump_device_stats(void) { cp(); logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);