projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove outgoing event in free_connection().
[tinc]
/
src
/
solaris
/
device.c
diff --git
a/src/solaris/device.c
b/src/solaris/device.c
index
9018c31
..
37c95c7
100644
(file)
--- a/
src/solaris/device.c
+++ b/
src/solaris/device.c
@@
-1,7
+1,7
@@
/*
device.c -- Interaction with Solaris tun device
Copyright (C) 2001-2005 Ivo Timmermans,
/*
device.c -- Interaction with Solaris tun device
Copyright (C) 2001-2005 Ivo Timmermans,
- 2001-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2001-20
11
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
@@
-34,6
+34,7
@@
#define DEFAULT_DEVICE "/dev/tun"
int device_fd = -1;
#define DEFAULT_DEVICE "/dev/tun"
int device_fd = -1;
+int ip_fd = -1, if_fd = -1;
char *device = NULL;
char *iface = NULL;
static char *device_info = NULL;
char *device = NULL;
char *iface = NULL;
static char *device_info = NULL;
@@
-42,7
+43,6
@@
static uint64_t device_total_in = 0;
static uint64_t device_total_out = 0;
bool setup_device(void) {
static uint64_t device_total_out = 0;
bool setup_device(void) {
- int ip_fd = -1, if_fd = -1;
int ppa;
char *ptr;
int ppa;
char *ptr;
@@
-105,6
+105,8
@@
bool setup_device(void) {
}
void close_device(void) {
}
void close_device(void) {
+ close(if_fd);
+ close(ip_fd);
close(device_fd);
free(device);
close(device_fd);
free(device);
@@
-112,9
+114,9
@@
void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
}
bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
- if((
leni
n = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+ if((
inle
n = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno));
return false;
logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno));
return false;
@@
-136,7
+138,7
@@
bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- packet->len =
leni
n + 14;
+ packet->len =
inle
n + 14;
device_total_in += packet->len;
device_total_in += packet->len;