X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fraw_socket%2Fdevice.c;h=412ba41be55d6683e0fe43042820614437d68eda;hp=f2a135d3de57bea591b83d94447660d0db6a5caf;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hpb=43fa7283ac01f2ecc95381b519ef6b3342546f35

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index f2a135d3..412ba41b 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -40,8 +40,7 @@ static char *device_info;
 static int device_total_in = 0;
 static int device_total_out = 0;
 
-bool setup_device(void)
-{
+bool setup_device(void) {
 	struct ifreq ifr;
 	struct sockaddr_ll sa;
 
@@ -61,7 +60,7 @@ bool setup_device(void)
 		return false;
 	}
 
-	memset(&ifr, 0, sizeof(ifr));
+	memset(&ifr, 0, sizeof ifr);
 	strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 	if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
 		close(device_fd);
@@ -70,12 +69,12 @@ 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;
 	}
@@ -85,8 +84,7 @@ bool setup_device(void)
 	return true;
 }
 
-void close_device(void)
-{
+void close_device(void) {
 	cp();
 
 	close(device_fd);
@@ -95,19 +93,18 @@ void close_device(void)
 	free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
-	int lenin;
+bool read_packet(vpn_packet_t *packet) {
+	int inlen;
 
 	cp();
 
-	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;
 
@@ -117,8 +114,7 @@ bool read_packet(vpn_packet_t *packet)
 	return true;
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
+bool write_packet(vpn_packet_t *packet) {
 	cp();
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
@@ -135,8 +131,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);