Fix a few small memory leaks.

[oweals/tinc.git] / src / raw_socket / device.c

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index e52097eb5964ed3cb5836ebbfcd29bdd3969a48d..abe368ad9e60351541df7753561d2f044c1a89af 100644 (file)
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -23,6 +23,7 @@
 #include <netpacket/packet.h>
 
 #include "conf.h"
+#include "device.h"
 #include "net.h"
 #include "logger.h"
 #include "utils.h"
@@ -35,8 +36,8 @@ 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;
 
 bool setup_device(void) {
        struct ifreq ifr;
@@ -48,10 +49,10 @@ bool setup_device(void) {
        if(!get_config_string(lookup_config(config_tree, "Device"), &device))
                device = xstrdup(iface);
 
-       device_info = _("raw socket");
+       device_info = "raw socket";
 
        if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
-               logger(LOG_ERR, _("Could not open %s: %s"), device_info,
+               logger(LOG_ERR, "Could not open %s: %s", device_info,
                           strerror(errno));
                return false;
        }
@@ -60,7 +61,7 @@ bool setup_device(void) {
        strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
        if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
                close(device_fd);
-               logger(LOG_ERR, _("Can't find interface %s: %s"), iface,
+               logger(LOG_ERR, "Can't find interface %s: %s", iface,
                           strerror(errno));
                return false;
        }
@@ -71,11 +72,11 @@ bool setup_device(void) {
        sa.sll_ifindex = ifr.ifr_ifindex;
 
        if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
-               logger(LOG_ERR, _("Could not bind %s to %s: %s"), device, iface, strerror(errno));
+               logger(LOG_ERR, "Could not bind %s to %s: %s", device, iface, strerror(errno));
                return false;
        }
 
-       logger(LOG_INFO, _("%s is a %s"), device, device_info);
+       logger(LOG_INFO, "%s is a %s", device, device_info);
 
        return true;
 }
@@ -91,7 +92,7 @@ bool read_packet(vpn_packet_t *packet) {
        int lenin;
 
        if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
-               logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+               logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
                           device, strerror(errno));
                return false;
        }
@@ -100,18 +101,18 @@ bool read_packet(vpn_packet_t *packet) {
 
        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) {
-       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);
 
        if(write(device_fd, packet->data, packet->len) < 0) {
-               logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+               logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
                           strerror(errno));
                return false;
        }
@@ -122,7 +123,7 @@ 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, "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);
 }