Reformat all code using astyle.

[tinc] / src / vde_device.c

diff --git a/src/vde_device.c b/src/vde_device.c
index 258945e..d97a694 100644 (file)
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -49,8 +49,9 @@ static bool setup_device(void) {
                return false;
        }
 
                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");
                xasprintf(&device, LOCALSTATEDIR "/run/vde.ctl");

+       }

 
        get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
 
        get_config_string(lookup_config(config_tree, "Interface"), &iface);
 


@@ -67,6 +68,7 @@ static bool setup_device(void) {
        };
 
        conn = plug.vde_open(device, identname, &args);
        };
 
        conn = plug.vde_open(device, identname, &args);

+

        if(!conn) {
                logger(LOG_ERR, "Could not open VDE socket %s", device);
                return false;
        if(!conn) {
                logger(LOG_ERR, "Could not open VDE socket %s", device);
                return false;


@@ -80,18 +82,21 @@ static bool setup_device(void) {
 
        logger(LOG_INFO, "%s is a %s", device, device_info);
 
 
        logger(LOG_INFO, "%s is a %s", device, device_info);
 

-       if(routing_mode == RMODE_ROUTER)
+       if(routing_mode == RMODE_ROUTER) {

                overwrite_mac = true;
                overwrite_mac = true;

+       }

 
        return true;
 }
 
 static void close_device(void) {
 
        return true;
 }
 
 static void close_device(void) {

-       if(conn)
+       if(conn) {

                plug.vde_close(conn);
                plug.vde_close(conn);

+       }

 
 

-       if(plug.dl_handle)
+       if(plug.dl_handle) {

                libvdeplug_dynclose(plug);
                libvdeplug_dynclose(plug);

+       }

 
        free(device);
 
 
        free(device);
 


@@ -99,7 +104,8 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {

-       int lenin = plug.vde_recv(conn, packet->data, MTU, 0);
+       int lenin = (ssize_t)plug.vde_recv(conn, packet->data, MTU, 0);
+

        if(lenin <= 0) {
                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
                running = false;
        if(lenin <= 0) {
                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
                running = false;


@@ -114,7 +120,7 @@ static bool read_packet(vpn_packet_t *packet) {
 }
 
 static bool write_packet(vpn_packet_t *packet) {
 }
 
 static bool write_packet(vpn_packet_t *packet) {

-       if(plug.vde_send(conn, packet->data, packet->len, 0) < 0) {
+       if((ssize_t)plug.vde_send(conn, packet->data, packet->len, 0) < 0) {

                if(errno != EINTR && errno != EAGAIN) {
                        logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
                        running = false;
                if(errno != EINTR && errno != EAGAIN) {
                        logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
                        running = false;