Reformat all code using astyle.

[tinc] / src / vde_device.c

diff --git a/src/vde_device.c b/src/vde_device.c
index 446ca16..e2692eb 100644 (file)
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -36,9 +36,6 @@ static int port = 0;
 static char *group = NULL;
 static char *device_info;
 
-static uint64_t device_total_in = 0;
-static uint64_t device_total_out = 0;
-
 static bool setup_device(void) {
        libvdeplug_dynopen(plug);
 
@@ -47,8 +44,9 @@ static bool setup_device(void) {
                return false;
        }
 
-       if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+       if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
                xasprintf(&device, LOCALSTATEDIR "/run/vde.ctl");
+       }
 
        get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
@@ -65,6 +63,7 @@ static bool setup_device(void) {
        };
 
        conn = plug.vde_open(device, identname, &args);
+
        if(!conn) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Could not open VDE socket %s", device);
                return false;
@@ -78,26 +77,35 @@ static bool setup_device(void) {
 
        logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
-       if(routing_mode == RMODE_ROUTER)
+       if(routing_mode == RMODE_ROUTER) {
                overwrite_mac = true;
+       }
 
        return true;
 }
 
 static void close_device(void) {
-       if(conn)
+       if(conn) {
                plug.vde_close(conn);
+               conn = NULL;
+       }
 
-       if(plug.dl_handle)
+       if(plug.dl_handle) {
                libvdeplug_dynclose(plug);
+       }
 
        free(device);
+       device = NULL;
 
        free(iface);
+       iface = NULL;
+
+       device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-       int lenin = (ssize_t)plug.vde_recv(conn, packet->data, MTU, 0);
+       int lenin = (ssize_t)plug.vde_recv(conn, DATA(packet), MTU, 0);
+
        if(lenin <= 0) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
                event_exit();
@@ -105,14 +113,14 @@ static bool read_packet(vpn_packet_t *packet) {
        }
 
        packet->len = lenin;
-       device_total_in += packet->len;
+
        logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
 
        return true;
 }
 
 static bool write_packet(vpn_packet_t *packet) {
-       if((ssize_t)plug.vde_send(conn, packet->data, packet->len, 0) < 0) {
+       if((ssize_t)plug.vde_send(conn, DATA(packet), packet->len, 0) < 0) {
                if(errno != EINTR && errno != EAGAIN) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
                        event_exit();
@@ -121,21 +129,12 @@ static bool write_packet(vpn_packet_t *packet) {
                return false;
        }
 
-       device_total_out += 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_total_in);
-       logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
-}
-
 const devops_t vde_devops = {
        .setup = setup_device,
        .close = close_device,
        .read = read_packet,
        .write = write_packet,
-       .dump_stats = dump_device_stats,
 };