projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update README and links to required libraries.
[tinc]
/
src
/
cygwin
/
device.c
diff --git
a/src/cygwin/device.c
b/src/cygwin/device.c
index
d3a4303
..
6d94988
100644
(file)
--- a/
src/cygwin/device.c
+++ b/
src/cygwin/device.c
@@
-38,7
+38,7
@@
int device_fd = -1;
static HANDLE device_handle = INVALID_HANDLE_VALUE;
char *device = NULL;
char *iface = NULL;
static HANDLE device_handle = INVALID_HANDLE_VALUE;
char *device = NULL;
char *iface = NULL;
-static c
har *device_info = NULL
;
+static c
onst char *device_info = "Windows tap device"
;
static pid_t reader_pid;
static int sp[2];
static pid_t reader_pid;
static int sp[2];
@@
-59,8
+59,9
@@
static bool setup_device(void) {
get_config_string(lookup_config(config_tree, "Device"), &device);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
get_config_string(lookup_config(config_tree, "Device"), &device);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
- if(device && iface)
+ if(device && iface)
{
logger(LOG_WARNING, "Warning: both Device and Interface specified, results may not be as expected");
logger(LOG_WARNING, "Warning: both Device and Interface specified, results may not be as expected");
+ }
/* Open registry and look for network adapters */
/* Open registry and look for network adapters */
@@
-69,44
+70,51
@@
static bool setup_device(void) {
return false;
}
return false;
}
- for (i = 0; ; i++) {
- len = sizeof adapterid;
- if(RegEnumKeyEx(key, i, adapterid, &len, 0, 0, 0, NULL))
+ for(i = 0; ; i++) {
+ len = sizeof(adapterid);
+
+ if(RegEnumKeyEx(key, i, adapterid, &len, 0, 0, 0, NULL)) {
break;
break;
+ }
/* Find out more about this adapter */
/* 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))
+ if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
{
continue;
continue;
+ }
- len = sizeof
adaptername
;
+ len = sizeof
(adaptername)
;
err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
RegCloseKey(key2);
err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
RegCloseKey(key2);
- if(err)
+ if(err)
{
continue;
continue;
+ }
if(device) {
if(!strcmp(device, adapterid)) {
found = true;
break;
if(device) {
if(!strcmp(device, adapterid)) {
found = true;
break;
- } else
+ } else
{
continue;
continue;
+ }
}
if(iface) {
if(!strcmp(iface, adaptername)) {
found = true;
break;
}
if(iface) {
if(!strcmp(iface, adaptername)) {
found = true;
break;
- } else
+ } else
{
continue;
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);
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);
found = true;
if(device_handle != INVALID_HANDLE_VALUE) {
CloseHandle(device_handle);
found = true;
@@
-121,13
+129,15
@@
static bool setup_device(void) {
return false;
}
return false;
}
- if(!device)
+ if(!device)
{
device = xstrdup(adapterid);
device = xstrdup(adapterid);
+ }
- if(!iface)
+ if(!iface)
{
iface = xstrdup(adaptername);
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.
/* 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.
@@
-140,7
+150,7
@@
static bool setup_device(void) {
/* The parent opens the tap device for writing. */
/* The parent opens the tap device for writing. */
- device_handle = CreateFile(tapname, GENERIC_WRITE, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM
, 0);
+ 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()));
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()));
@@
-151,7
+161,7
@@
static bool setup_device(void) {
/* Get MAC address from tap device */
/* 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(DEBUG_ALWAYS, LOG_ERR, "Could not get MAC address from Windows tap device %s (%s): %s", device, iface, winerror(GetLastError()));
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Could not get MAC address from Windows tap device %s (%s): %s", device, iface, winerror(GetLastError()));
return false;
}
@@
-203,13
+213,12
@@
static bool setup_device(void) {
}
read(device_fd, &gelukt, 1);
}
read(device_fd, &gelukt, 1);
+
if(gelukt != 1) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Tap reader failed!");
return false;
}
if(gelukt != 1) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Tap reader failed!");
return false;
}
- device_info = "Windows tap device";
-
logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
return true;
logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
return true;
@@
-218,12
+227,15
@@
static bool setup_device(void) {
static void close_device(void) {
close(sp[0]);
close(sp[1]);
static void close_device(void) {
close(sp[0]);
close(sp[1]);
- CloseHandle(device_handle); device_handle = INVALID_HANDLE_VALUE;
+ CloseHandle(device_handle);
+ device_handle = INVALID_HANDLE_VALUE;
kill(reader_pid, SIGKILL);
kill(reader_pid, SIGKILL);
- free(device); device = NULL;
- free(iface); iface = NULL;
+ free(device);
+ device = NULL;
+ free(iface);
+ iface = NULL;
device_info = NULL;
}
device_info = NULL;
}
@@
-232,14
+244,14
@@
static bool read_packet(vpn_packet_t *packet) {
if((inlen = read(sp[0], DATA(packet), MTU)) <= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
if((inlen = read(sp[0], DATA(packet), MTU)) <= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
-
device, strerror(errno));
+ device, strerror(errno));
return false;
}
packet->len = inlen;
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
return false;
}
packet->len = inlen;
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
-
device_info);
+ device_info);
return true;
}
return true;
}
@@
-248,9
+260,9
@@
static bool write_packet(vpn_packet_t *packet) {
long outlen;
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
long outlen;
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
-
packet->len, device_info);
+ packet->len, device_info);
- if(!WriteFile
(device_handle, DATA(packet), packet->len, &outlen, NULL)) {
+ if(!WriteFile(device_handle, DATA(packet), packet->len, &outlen, NULL)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s", device_info, device, winerror(GetLastError()));
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s", device_info, device, winerror(GetLastError()));
return false;
}