X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fuml_socket%2Fdevice.c;h=30194d9cf325b026c930d9bb05f7c1cc51b213d4;hp=62a6f2eb65a762f4a940a7e77b13e4dddf91fc69;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hpb=43fa7283ac01f2ecc95381b519ef6b3342546f35 diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c index 62a6f2eb..30194d9c 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) @@ -176,9 +174,8 @@ void close_device(void) if(iface) free(iface); } -bool read_packet(vpn_packet_t *packet) -{ - int lenin; +bool read_packet(vpn_packet_t *packet) { + int inlen; cp(); @@ -208,7 +205,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; @@ -238,14 +235,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; @@ -257,8 +254,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) { @@ -284,8 +280,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);