X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fcygwin%2Fdevice.c;h=6266e87e4d270d7c0839bae782bf614d4d03fcf3;hb=70a1a5594af5d4e6a364186b42ba4e34c676009b;hp=869116a88194c9369b1f4ff0dfd868ef69888f9d;hpb=6dfdb323612184529b4b83c1be914dda8262de47;p=meshlink diff --git a/src/cygwin/device.c b/src/cygwin/device.c index 869116a8..6266e87e 100644 --- a/src/cygwin/device.c +++ b/src/cygwin/device.c @@ -1,7 +1,7 @@ /* device.c -- Interaction with Windows tap driver in a Cygwin environment Copyright (C) 2002-2005 Ivo Timmermans, - 2002-2011 Guus Sliepen + 2002-2012 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -77,7 +77,7 @@ static bool setup_device(void) { snprintf(regpath, sizeof regpath, "%s\\%s\\Connection", NETWORK_CONNECTIONS_KEY, adapterid); - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2)) + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2)) continue; len = sizeof adaptername; @@ -127,7 +127,7 @@ static bool setup_device(void) { iface = xstrdup(adaptername); 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. Furthermore I don't really know how to do it the "Windows" way. */ @@ -138,9 +138,9 @@ static bool setup_device(void) { } /* The parent opens the tap device for writing. */ - + device_handle = CreateFile(tapname, GENERIC_WRITE, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM , 0); - + if(device_handle == INVALID_HANDLE_VALUE) { logger(DEBUG_ALWAYS, LOG_ERR, "Could not open Windows tap device %s (%s) for writing: %s", device, iface, winerror(GetLastError())); return false; @@ -171,7 +171,7 @@ static bool setup_device(void) { if(!reader_pid) { /* The child opens the tap device for reading, blocking. It passes everything it reads to the socket. */ - + char buf[MTU]; long inlen; @@ -233,7 +233,7 @@ static bool read_packet(vpn_packet_t *packet) { device, strerror(errno)); return false; } - + packet->len = inlen; device_total_in += packet->len;