MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "system.h"
#endif
#include "conf.h"
+#include "device.h"
#include "logger.h"
#include "net.h"
#include "route.h"
+#include "threads.h"
#include "utils.h"
#include "xalloc.h"
} device_type_t;
int device_fd = -1;
+int fd = -1;
static device_type_t device_type;
char *device = NULL;
char *iface = NULL;
static char ifrname[IFNAMSIZ];
static char *device_info;
-static int device_total_in = 0;
-static int device_total_out = 0;
+static uint64_t device_total_in = 0;
+static uint64_t device_total_out = 0;
+
+thread_t thread;
+
+static void read_thread(void *arg) {
+ static vpn_packet_t packet;
+ errno = 0;
+
+ while(true) {
+ if(read_packet(&packet)) {
+ route(myself, &packet);
+ } else {
+ if(errno == EAGAIN || errno == EINTR) {
+ errno = 0;
+ continue;
+ }
+
+ return;
+ }
+ }
+}
bool setup_device(void) {
struct ifreq ifr;
-
- cp();
+ bool t1q = false;
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = xstrdup(DEFAULT_DEVICE);
if (netname != NULL)
iface = xstrdup(netname);
#else
- iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
+ iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
#endif
- device_fd = open(device, O_RDWR | O_NONBLOCK);
+ fd = open(device, O_RDWR);
- if(device_fd < 0) {
- logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+ if(fd < 0) {
+ logger(LOG_ERR, "Could not open %s: %s", device, strerror(errno));
return false;
}
if(routing_mode == RMODE_ROUTER) {
ifr.ifr_flags = IFF_TUN;
device_type = DEVICE_TYPE_TUN;
- device_info = _("Linux tun/tap device (tun mode)");
+ device_info = "Linux tun/tap device (tun mode)";
} else {
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
device_type = DEVICE_TYPE_TAP;
- device_info = _("Linux tun/tap device (tap mode)");
+ device_info = "Linux tun/tap device (tap mode)";
}
+#ifdef IFF_ONE_QUEUE
+ /* Set IFF_ONE_QUEUE flag... */
+ if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q)
+ ifr.ifr_flags |= IFF_ONE_QUEUE;
+#endif
+
if(iface)
strncpy(ifr.ifr_name, iface, IFNAMSIZ);
- if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
+ if(!ioctl(fd, TUNSETIFF, &ifr)) {
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
if(iface) free(iface);
iface = xstrdup(ifrname);
- } else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) {
- logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
+ } else if(!ioctl(fd, (('T' << 8) | 202), &ifr)) {
+ logger(LOG_WARNING, "Old ioctl() request was needed for %s", device);
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
if(iface) free(iface);
iface = xstrdup(ifrname);
{
if(routing_mode == RMODE_ROUTER)
overwrite_mac = true;
- device_info = _("Linux ethertap device");
+ device_info = "Linux ethertap device";
device_type = DEVICE_TYPE_ETHERTAP;
if(iface)
free(iface);
- iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
+ iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
}
- logger(LOG_INFO, _("%s is a %s"), device, device_info);
+ logger(LOG_INFO, "%s is a %s", device, device_info);
- return true;
+ return thread_create(&thread, read_thread, NULL);
}
void close_device(void) {
- cp();
-
- close(device_fd);
+ close(fd);
+ thread_destroy(&thread);
free(device);
free(iface);
bool read_packet(vpn_packet_t *packet) {
int inlen;
- cp();
-
switch(device_type) {
case DEVICE_TYPE_TUN:
- inlen = read(device_fd, packet->data + 10, MTU - 10);
+ inlen = read(fd, packet->data + 10, MTU - 10);
if(inlen <= 0) {
- logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+ logger(LOG_ERR, "Error while reading from %s %s: %s",
device_info, device, strerror(errno));
return false;
}
packet->len = inlen + 10;
break;
case DEVICE_TYPE_TAP:
- inlen = read(device_fd, packet->data, MTU);
+ inlen = read(fd, packet->data, MTU);
if(inlen <= 0) {
- logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+ logger(LOG_ERR, "Error while reading from %s %s: %s",
device_info, device, strerror(errno));
return false;
}
packet->len = inlen;
break;
case DEVICE_TYPE_ETHERTAP:
- inlen = read(device_fd, packet->data - 2, MTU + 2);
+ inlen = read(fd, packet->data - 2, MTU + 2);
if(inlen <= 0) {
- logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+ logger(LOG_ERR, "Error while reading from %s %s: %s",
device_info, device, strerror(errno));
return false;
}
device_total_in += packet->len;
- ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+ ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
device_info);
return true;
}
bool write_packet(vpn_packet_t *packet) {
- cp();
-
- ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+ ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
packet->len, device_info);
switch(device_type) {
case DEVICE_TYPE_TUN:
packet->data[10] = packet->data[11] = 0;
- if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {
- logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+ if(write(fd, packet->data + 10, packet->len - 10) < 0) {
+ logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
strerror(errno));
return false;
}
break;
case DEVICE_TYPE_TAP:
- if(write(device_fd, packet->data, packet->len) < 0) {
- logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+ if(write(fd, packet->data, packet->len) < 0) {
+ logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
strerror(errno));
return false;
}
case DEVICE_TYPE_ETHERTAP:
*(short int *)(packet->data - 2) = packet->len;
- if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
- logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+ if(write(fd, packet->data - 2, packet->len + 2) < 0) {
+ logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
strerror(errno));
return false;
}
}
void dump_device_stats(void) {
- cp();
-
- logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
- logger(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
- logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
+ logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
+ logger(LOG_DEBUG, " total bytes in: %10"PRIu64, device_total_in);
+ logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
}
projects / tinc / blobdiff