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.15 2003/07/12 17:41:48 guus Exp $
+ $Id: device.c,v 1.1.2.17 2003/07/22 20:55:21 guus Exp $
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <utils.h>
+#include "system.h"
+
#include "conf.h"
-#include "net.h"
#include "logger.h"
-
-#include "system.h"
+#include "net.h"
+#include "utils.h"
#define DEFAULT_DEVICE "/dev/tun0"
#define DEVICE_TYPE_TUNTAP 1
int device_fd = -1;
-int device_type;
char *device;
-char *interface;
+char *iface;
char *device_info;
int device_total_in = 0;
int device_total_out = 0;
-int setup_device(void)
+bool setup_device(void)
{
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;
+ if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+ iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
- return -1;
+ return false;
}
device_info = _("OpenBSD tun device");
logger(LOG_INFO, _("%s is a %s"), device, device_info);
- return 0;
+ return true;
}
void close_device(void)
close(device_fd);
}
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
{
int lenin;
u_int32_t type;
if((lenin = readv(device_fd, vector, 2)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
- return -1;
+ return false;
}
switch (ntohl(type)) {
ifdebug(TRAFFIC) logger(LOG_ERR,
_ ("Unknown address family %d while reading packet from %s %s"),
ntohl(type), device_info, device);
- return -1;
+ return false;
}
packet->len = lenin + 10;
device_info);
}
- return 0;
+ return true;
}
-int write_packet(vpn_packet_t *packet)
+bool write_packet(vpn_packet_t *packet)
{
u_int32_t type;
struct iovec vector[2];
ifdebug(TRAFFIC) logger(LOG_ERR,
_("Unknown address family %d while writing packet to %s %s"),
af, device_info, device);
- return -1;
+ return false;
}
vector[0].iov_base = &type;
if(writev(device_fd, vector, 2) < 0) {
logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
strerror(errno));
- return -1;
+ return false;
}
device_total_out += packet->len;
+
+ return true;
}
void dump_device_stats(void)