DragonFlyBSD support

[tinc] / src / bsd / device.c

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 4dd2b57..d0de6d9 100644 (file)
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -2,6 +2,7 @@
     device.c -- Interaction BSD tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,
                   2001-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2009      Grzegorz Dymarek <gregd72002@googlemail.com>
 
     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
@@ -46,11 +47,11 @@ int device_fd = -1;
 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;
-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;
 #if defined(TUNEMU)
 static device_type_t device_type = DEVICE_TYPE_TUNEMU;
-#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD)
+#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD) || defined(HAVE_DRAGONFLY)
 static device_type_t device_type = DEVICE_TYPE_TUNIFHEAD;
 #else
 static device_type_t device_type = DEVICE_TYPE_TUN;
@@ -63,7 +64,7 @@ bool setup_device(void) {
                device = xstrdup(DEFAULT_DEVICE);
 
        if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-               iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
+               iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
 
        if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
                if(!strcasecmp(type, "tun"))
@@ -149,6 +150,17 @@ bool setup_device(void) {
                        if(routing_mode == RMODE_ROUTER)
                                overwrite_mac = true;
                        device_info = "Generic BSD tap device";
+#ifdef TAPGIFNAME
+                       {
+                               struct ifreq ifr;
+                               if(ioctl(device_fd, TAPGIFNAME, (void*)&ifr) == 0) {
+                                       if(iface)
+                                               free(iface);
+                                       iface = xstrdup(ifr.ifr_name);
+                               }
+                       }
+                       
+#endif
                        break;
 #ifdef HAVE_TUNEMU
                case DEVICE_TYPE_TUNEMU:
@@ -187,9 +199,8 @@ bool read_packet(vpn_packet_t *packet) {
                        if(device_type == DEVICE_TYPE_TUNEMU)
                                lenin = tunemu_read(device_fd, packet->data + 14, MTU - 14);
                        else
-#else
-                               lenin = read(device_fd, packet->data + 14, MTU - 14);
 #endif
+                               lenin = read(device_fd, packet->data + 14, MTU - 14);
 
                        if(lenin <= 0) {
                                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
@@ -208,7 +219,7 @@ bool read_packet(vpn_packet_t *packet) {
                                        break;
                                default:
                                        ifdebug(TRAFFIC) logger(LOG_ERR,
-                                                          _ ("Unknown IP version %d while reading packet from %s %s"),
+                                                          "Unknown IP version %d while reading packet from %s %s",
                                                           packet->data[14] >> 4, device_info, device);
                                        return false;
                        }
@@ -239,7 +250,7 @@ bool read_packet(vpn_packet_t *packet) {
 
                                default:
                                        ifdebug(TRAFFIC) logger(LOG_ERR,
-                                                          _ ("Unknown address family %x while reading packet from %s %s"),
+                                                          "Unknown address family %x while reading packet from %s %s",
                                                           ntohl(type), device_info, device);
                                        return false;
                        }
@@ -267,7 +278,6 @@ bool read_packet(vpn_packet_t *packet) {
        ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s",
                           packet->len, device_info);
 
-       logger(LOG_INFO, "E:fd_read");
        return true;
 }
 
@@ -342,6 +352,6 @@ bool write_packet(vpn_packet_t *packet) {
 
 void dump_device_stats(void) {
        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, " total bytes in:  %10"PRIu64, device_total_in);
+       logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }