X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fcygwin%2Fdevice.c;h=97b2a38d0c60ef327317efec5359d032c9e3bd58;hp=c6e6f35392a4f0e76704f75d1991255bafe20977;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hpb=43fa7283ac01f2ecc95381b519ef6b3342546f35

diff --git a/src/cygwin/device.c b/src/cygwin/device.c
index c6e6f353..97b2a38d 100644
--- a/src/cygwin/device.c
+++ b/src/cygwin/device.c
@@ -46,8 +46,7 @@ static int device_total_out = 0;
 static pid_t reader_pid;
 static int sp[2];
 
-bool setup_device(void)
-{
+bool setup_device(void) {
 	HKEY key, key2;
 	int i, err;
 
@@ -73,18 +72,18 @@ bool setup_device(void)
 	}
 
 	for (i = 0; ; i++) {
-		len = sizeof(adapterid);
+		len = sizeof adapterid;
 		if(RegEnumKeyEx(key, i, adapterid, &len, 0, 0, 0, NULL))
 			break;
 
 		/* Find out more about this adapter */
 
-		snprintf(regpath, sizeof(regpath), "%s\\%s\\Connection", NETWORK_CONNECTIONS_KEY, adapterid);
+		snprintf(regpath, sizeof regpath, "%s\\%s\\Connection", NETWORK_CONNECTIONS_KEY, adapterid);
 
                 if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
 			continue;
 
-		len = sizeof(adaptername);
+		len = sizeof adaptername;
 		err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
 
 		RegCloseKey(key2);
@@ -108,7 +107,7 @@ bool setup_device(void)
 				continue;
 		}
 
-		snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, adapterid);
+		snprintf(tapname, sizeof tapname, USERMODEDEVICEDIR "%s" TAPSUFFIX, adapterid);
 		device_handle = CreateFile(tapname, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0);
 		if(device_handle != INVALID_HANDLE_VALUE) {
 			CloseHandle(device_handle);
@@ -130,7 +129,7 @@ bool setup_device(void)
 	if(!iface)
 		iface = xstrdup(adaptername);
 
-	snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, device);
+	snprintf(tapname, sizeof tapname, USERMODEDEVICEDIR "%s" TAPSUFFIX, device);
 	
 	/* Now we are going to open this device twice: once for reading and once for writing.
 	   We do this because apparently it isn't possible to check for activity in the select() loop.
@@ -154,7 +153,7 @@ bool setup_device(void)
 
 	/* Get MAC address from tap device */
 
-	if(!DeviceIoControl(device_handle, TAP_IOCTL_GET_MAC, mymac.x, sizeof(mymac.x), mymac.x, sizeof(mymac.x), &len, 0)) {
+	if(!DeviceIoControl(device_handle, TAP_IOCTL_GET_MAC, mymac.x, sizeof mymac.x, mymac.x, sizeof mymac.x, &len, 0)) {
 		logger(LOG_ERR, _("Could not get MAC address from Windows tap device %s (%s): %s"), device, iface, winerror(GetLastError()));
 		return false;
 	}
@@ -177,7 +176,7 @@ bool setup_device(void)
 		   It passes everything it reads to the socket. */
 	
 		char buf[MTU];
-		long lenin;
+		long inlen;
 
 		CloseHandle(device_handle);
 
@@ -200,8 +199,8 @@ bool setup_device(void)
 		/* Pass packets */
 
 		for(;;) {
-			ReadFile(device_handle, buf, MTU, &lenin, NULL);
-			write(sp[1], buf, lenin);
+			ReadFile(device_handle, buf, MTU, &inlen, NULL);
+			write(sp[1], buf, inlen);
 		}
 	}
 
@@ -218,8 +217,7 @@ bool setup_device(void)
 	return true;
 }
 
-void close_device(void)
-{
+void close_device(void) {
 	cp();
 
 	close(sp[0]);
@@ -232,19 +230,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(sp[0], packet->data, MTU)) <= 0) {
+	if((inlen = read(sp[0], 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;
 
@@ -254,16 +251,15 @@ bool read_packet(vpn_packet_t *packet)
 	return true;
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
-	long lenout;
+bool write_packet(vpn_packet_t *packet) {
+	long outlen;
 
 	cp();
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
 			   packet->len, device_info);
 
-	if(!WriteFile (device_handle, packet->data, packet->len, &lenout, NULL)) {
+	if(!WriteFile (device_handle, packet->data, packet->len, &outlen, NULL)) {
 		logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
 		return false;
 	}
@@ -273,8 +269,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);