X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=4940ddb593b87810885c58b0368508013970b9f1;hb=4c819a6e3a59da17142bc7bafd0455ca4bf049ac;hp=303da913484ff754e95a031c0a0f07d38c7081e6;hpb=c9bdac68e1b56d34b8fd8bff03bddda1d2cca516;p=meshlink diff --git a/src/solaris/device.c b/src/solaris/device.c index 303da913..4940ddb5 100644 --- a/src/solaris/device.c +++ b/src/solaris/device.c @@ -33,7 +33,11 @@ #include "../route.h" #include "../utils.h" #include "../xalloc.h" -#include "../if_tun.h" + +#ifndef TUNNEWPPA +#warning Missing net/if_tun.h, using hardcoded value for TUNNEWPPA +#define TUNNEWPPA (('T'<<16) | 0x0001) +#endif #define DEFAULT_TUN_DEVICE "/dev/tun" #define DEFAULT_TAP_DEVICE "/dev/tap" @@ -46,16 +50,10 @@ static enum { int device_fd = -1; static int if_fd = -1; static int ip_fd = -1; -static int arp_fd = -1; char *device = NULL; char *iface = NULL; static char *device_info = NULL; -uint64_t device_in_packets = 0; -uint64_t device_in_bytes = 0; -uint64_t device_out_packets = 0; -uint64_t device_out_bytes = 0; - static bool setup_device(void) { char *type; @@ -337,9 +335,6 @@ static bool read_packet(vpn_packet_t *packet) { abort(); } - device_in_packets++; - device_in_bytes += packet->len; - logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info); return true; @@ -367,22 +362,12 @@ static bool write_packet(vpn_packet_t *packet) { abort(); } - device_out_packets++; - device_out_bytes += packet->len; - return true; } -static void dump_device_stats(void) { - logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device); - logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in: %10"PRIu64, device_in_bytes); - logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_out_bytes); -} - const devops_t os_devops = { .setup = setup_device, .close = close_device, .read = read_packet, .write = write_packet, - .dump_stats = dump_device_stats, };