j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use 64 bit counters to keep track of bytes sent/received from the virtual network interface.

Browse source
This commit is contained in:
Guus Sliepen 2010-06-04 15:04:08 +02:00
parent 4a21aabada
commit 798fa2f04c
8 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bsd/device.c
View file

@ -47,8 +47,8 @@ int device_fd = -1;
char *device = NULL; char *device = NULL;
char *iface = NULL; char *iface = NULL;
static char *device_info = NULL; static char *device_info = NULL;
static int device_total_in = 0; static uint64_t device_total_in = 0;
static int device_total_out = 0; static uint64_t device_total_out = 0;
#if defined(TUNEMU) #if defined(TUNEMU)
static device_type_t device_type = DEVICE_TYPE_TUNEMU; static device_type_t device_type = DEVICE_TYPE_TUNEMU;
#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD) #elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD)
@ -353,6 +353,6 @@ bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) { void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); 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 in: %10"PRIu64, device_total_in);
logger(LOG_DEBUG, " total bytes out: %10d", device_total_out); logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
} }

8
src/cygwin/device.c
View file

@ -38,8 +38,8 @@ char *device = NULL;
char *iface = NULL; char *iface = NULL;
static char *device_info = NULL; static char *device_info = NULL;
static int device_total_in = 0; static uint64_t device_total_in = 0;
static int device_total_out = 0; static uint64_t device_total_out = 0;
static pid_t reader_pid; static pid_t reader_pid;
static int sp[2]; static int sp[2];
@ -261,6 +261,6 @@ bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) { void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); 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 in: %10"PRIu64, device_total_in);
logger(LOG_DEBUG, " total bytes out: %10d", device_total_out); logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
} }

8
src/dummy/device.c
View file

@ -27,8 +27,8 @@ char *device = "dummy";
char *iface = "dummy"; char *iface = "dummy";
static char *device_info = "dummy device"; static char *device_info = "dummy device";
static int device_total_in = 0; static uint64_t device_total_in = 0;
static int device_total_out = 0; static uint64_t device_total_out = 0;
bool setup_device(void) { bool setup_device(void) {
logger(LOG_INFO, "%s (%s) is a %s", device, iface, device_info); logger(LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
@ -49,6 +49,6 @@ bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) { void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); 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 in: %10"PRIu64, device_total_in);
logger(LOG_DEBUG, " total bytes out: %10d", device_total_out); logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
} }

8
src/linux/device.c
View file

@ -47,8 +47,8 @@ char *iface = NULL;
static char ifrname[IFNAMSIZ]; static char ifrname[IFNAMSIZ];
static char *device_info; static char *device_info;
static int device_total_in = 0; static uint64_t device_total_in = 0;
static int device_total_out = 0; static uint64_t device_total_out = 0;
bool setup_device(void) { bool setup_device(void) {
struct ifreq ifr; struct ifreq ifr;
@ -205,6 +205,6 @@ bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) { void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); 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 in: %10"PRIu64, device_total_in);
logger(LOG_DEBUG, " total bytes out: %10d", device_total_out); logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
} }

8
src/mingw/device.c
View file

@ -38,8 +38,8 @@ char *device = NULL;
char *iface = NULL; char *iface = NULL;
static char *device_info = NULL; static char *device_info = NULL;
static int device_total_in = 0; static uint64_t device_total_in = 0;
static int device_total_out = 0; static uint64_t device_total_out = 0;
extern char *myport; extern char *myport;
@ -247,6 +247,6 @@ bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) { void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); 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 in: %10"PRIu64, device_total_in);
logger(LOG_DEBUG, " total bytes out: %10d", device_total_out); logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
} }

8
src/raw_socket/device.c
View file

@ -35,8 +35,8 @@ char *iface = NULL;
static char ifrname[IFNAMSIZ]; static char ifrname[IFNAMSIZ];
static char *device_info; static char *device_info;
static int device_total_in = 0; static uint64_t device_total_in = 0;
static int device_total_out = 0; static uint64_t device_total_out = 0;
bool setup_device(void) { bool setup_device(void) {
struct ifreq ifr; struct ifreq ifr;
@ -123,6 +123,6 @@ bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) { void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); 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 in: %10"PRIu64, device_total_in);
logger(LOG_DEBUG, " total bytes out: %10d", device_total_out); logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
} }

8
src/solaris/device.c
View file

@ -38,8 +38,8 @@ char *device = NULL;
char *iface = NULL; char *iface = NULL;
static char *device_info = NULL; static char *device_info = NULL;
static int device_total_in = 0; static uint64_t device_total_in = 0;
static int device_total_out = 0; static uint64_t device_total_out = 0;
bool setup_device(void) { bool setup_device(void) {
int ip_fd = -1, if_fd = -1; int ip_fd = -1, if_fd = -1;
@ -163,6 +163,6 @@ bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) { void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); 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 in: %10"PRIu64, device_total_in);
logger(LOG_DEBUG, " total bytes out: %10d", device_total_out); logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
} }

8
src/uml_socket/device.c
View file

@ -41,8 +41,8 @@ static char *device_info;
extern char *identname; extern char *identname;
extern bool running; extern bool running;
static int device_total_in = 0; static uint64_t device_total_in = 0;
static int device_total_out = 0; static uint64_t device_total_out = 0;
enum request_type { REQ_NEW_CONTROL }; enum request_type { REQ_NEW_CONTROL };
@ -272,6 +272,6 @@ bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) { void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); 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 in: %10"PRIu64, device_total_in);
logger(LOG_DEBUG, " total bytes out: %10d", device_total_out); logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
} }