projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow gateways to be specified for routes.
[tinc]
/
src
/
cygwin
/
device.c
diff --git
a/src/cygwin/device.c
b/src/cygwin/device.c
index
d522b4f
..
d3a4303
100644
(file)
--- 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,
/*
device.c -- Interaction with Windows tap driver in a Cygwin environment
Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-201
3
Guus Sliepen <guus@tinc-vpn.org>
+ 2002-201
4
Guus Sliepen <guus@tinc-vpn.org>
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
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
@@
-19,6
+19,7
@@
*/
#include "../system.h"
*/
#include "../system.h"
+#include "../net.h"
#include <w32api/windows.h>
#include <w32api/winioctl.h>
#include <w32api/windows.h>
#include <w32api/winioctl.h>
@@
-27,7
+28,6
@@
#include "../device.h"
#include "../logger.h"
#include "../names.h"
#include "../device.h"
#include "../logger.h"
#include "../names.h"
-#include "../net.h"
#include "../route.h"
#include "../utils.h"
#include "../xalloc.h"
#include "../route.h"
#include "../utils.h"
#include "../xalloc.h"
@@
-59,6
+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)
+ logger(LOG_WARNING, "Warning: both Device and Interface specified, results may not be as expected");
+
/* Open registry and look for network adapters */
if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, NETWORK_CONNECTIONS_KEY, 0, KEY_READ, &key)) {
/* Open registry and look for network adapters */
if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, NETWORK_CONNECTIONS_KEY, 0, KEY_READ, &key)) {
@@
-227,7
+230,7
@@
static void close_device(void) {
static bool read_packet(vpn_packet_t *packet) {
int inlen;
static bool read_packet(vpn_packet_t *packet) {
int inlen;
- if((inlen = read(sp[0],
packet->data
, MTU)) <= 0) {
+ 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));
return false;
logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno));
return false;
@@
-247,7
+250,7
@@
static bool write_packet(vpn_packet_t *packet) {
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
packet->len, device_info);
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
packet->len, device_info);
- if(!WriteFile (device_handle,
packet->data
, 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;
}