projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanups:
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
450fcd1
..
0088acc
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-1,7
+1,7
@@
/*
device.c -- Interaction with Linux ethertap and tun/tap device
/*
device.c -- Interaction with Linux ethertap and tun/tap device
- Copyright (C) 2001-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>,
- 2001-2002 Guus Sliepen <guus@sliepen.
warande.net
>
+ Copyright (C) 2001-2002 Ivo Timmermans <i
vo@o2w.nl
>,
+ 2001-2002 Guus Sliepen <guus@sliepen.
eu.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
@@
-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.
7 2002/02/18 16:25:19
guus Exp $
+ $Id: device.c,v 1.1.2.
10 2002/09/09 19:40:12
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-84,7
+84,9
@@
cp
interface = rindex(device, '/')?rindex(device, '/')+1:device;
#endif
cp
interface = rindex(device, '/')?rindex(device, '/')+1:device;
#endif
cp
- if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
+ device_fd = open(device, O_RDWR | O_NONBLOCK);
+
+ if(device_fd < 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;
@@
-130,6
+132,7
@@
cp
{
device_info = _("Linux ethertap device");
device_type = DEVICE_TYPE_ETHERTAP;
{
device_info = _("Linux ethertap device");
device_type = DEVICE_TYPE_ETHERTAP;
+ interface = rindex(device, '/')?rindex(device, '/')+1:device;
}
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
}
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
@@
-153,7
+156,9
@@
int read_packet(vpn_packet_t *packet)
cp
if(device_type == DEVICE_TYPE_TUNTAP)
{
cp
if(device_type == DEVICE_TYPE_TUNTAP)
{
- if((lenin = read(device_fd, packet->data, MTU)) <= 0)
+ lenin = read(device_fd, packet->data, MTU);
+
+ if(lenin <= 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;
@@
-163,7
+168,9
@@
cp
}
else /* ethertap */
{
}
else /* ethertap */
{
- if((lenin = read(device_fd, packet->data - 2, MTU + 2)) <= 0)
+ lenin = read(device_fd, packet->data - 2, MTU + 2);
+
+ if(lenin <= 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;