projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Run graph algorithm when replacing a second connection from the same host
[tinc]
/
src
/
cygwin
/
device.c
diff --git
a/src/cygwin/device.c
b/src/cygwin/device.c
index
7cc8b1c
..
3bfc2ab
100644
(file)
--- a/
src/cygwin/device.c
+++ b/
src/cygwin/device.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: device.c,v 1.1.2.
3 2002/09/09 22:33:21
guus Exp $
+ $Id: device.c,v 1.1.2.
4 2002/09/10 21:29:42
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-53,18
+53,21
@@
int setup_device(void)
{
struct ifreq ifr;
{
struct ifreq ifr;
- cp if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+ cp();
+
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
- cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
+
+ if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1;
}
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1;
}
- cp
-
/* Set default MAC address for ethertap devices */
-
mymac.type = SUBNET_MAC;
+
+ /* Set default MAC address for ethertap devices */
+ mymac.type = SUBNET_MAC;
mymac.net.mac.address.x[0] = 0xfe;
mymac.net.mac.address.x[1] = 0xfd;
mymac.net.mac.address.x[2] = 0x00;
mymac.net.mac.address.x[0] = 0xfe;
mymac.net.mac.address.x[1] = 0xfd;
mymac.net.mac.address.x[2] = 0x00;
@@
-75,18
+78,24
@@
int setup_device(void)
device_info = _("Stub device for Cygwin environment");
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
device_info = _("Stub device for Cygwin environment");
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
- cp return 0;
+
+ return 0;
}
void close_device(void)
{
}
void close_device(void)
{
- cp close(device_fd);
+ cp();
+
+ close(device_fd);
}
int read_packet(vpn_packet_t *packet)
{
int lenin;
}
int read_packet(vpn_packet_t *packet)
{
int lenin;
- cp if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+
+ cp();
+
+ if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return -1;
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return -1;
@@
-102,11
+111,13
@@
int read_packet(vpn_packet_t *packet)
}
return 0;
}
return 0;
-
cp
}
+}
int write_packet(vpn_packet_t *packet)
{
int write_packet(vpn_packet_t *packet)
{
- cp if(debug_lvl >= DEBUG_TRAFFIC)
+ cp();
+
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
@@
-117,12
+128,15
@@
int write_packet(vpn_packet_t *packet)
}
device_total_out += packet->len;
}
device_total_out += packet->len;
- cp return 0;
+
+ return 0;
}
void dump_device_stats(void)
{
}
void dump_device_stats(void)
{
- cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
+ cp();
+
+ syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-
cp
}
+}