wg: fix errno propagation and messages

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/src/ipc.c b/src/ipc.c
index 3f23d1d0922f486b7b1feff93c157e2f4c999eef..cdb152b8669e21b0aa312acdc39bf4520bd513d3 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -185,7 +185,7 @@ static int userspace_get_wireguard_interfaces(struct inflatable_buffer *buffer)
 
        dir = opendir(SOCK_PATH);
        if (!dir)
-               return errno == ENOENT ? 0 : errno;
+               return errno == ENOENT ? 0 : -errno;
        while ((ent = readdir(dir))) {
                len = strlen(ent->d_name);
                if (len <= strlen(SOCK_SUFFIX))
@@ -964,7 +964,6 @@ char *ipc_list_devices(void)
 cleanup:
        errno = -ret;
        if (errno) {
-               perror("Error when trying to get a list of WireGuard interfaces");
                free(buffer.buffer);
                return NULL;
        }

diff --git a/src/set.c b/src/set.c
index b3f57effe3323961fb0a523a8f3445d3739dea1e..d44fed902bfb7b5efe2fad8df2c9d24b69a72752 100644 (file)
--- a/src/set.c
+++ b/src/set.c
@@ -29,7 +29,7 @@ int set_main(int argc, char *argv[])
        device->name[IFNAMSIZ - 1] = '\0';
 
        if (ipc_set_device(device) != 0) {
-               perror("Unable to set device");
+               perror("Unable to modify interface");
                goto cleanup;
        }
 

diff --git a/src/setconf.c b/src/setconf.c
index f146a48591d2b640bb26b001b0f1a4573b0dd0bf..012c245867ae52e8f32cb9f87c9c4133f0194f36 100644 (file)
--- a/src/setconf.c
+++ b/src/setconf.c
@@ -51,7 +51,7 @@ int setconf_main(int argc, char *argv[])
        device->name[IFNAMSIZ - 1] = '\0';
 
        if (ipc_set_device(device) != 0) {
-               perror("Unable to set device");
+               perror("Unable to modify interface");
                goto cleanup;
        }
 

diff --git a/src/show.c b/src/show.c
index 3fd6a6758f6b28c93da01216f29008453bbed76f..1b8712feeb7dff2437108f22e2f701affc60dd0e 100644 (file)
--- a/src/show.c
+++ b/src/show.c
@@ -390,7 +390,7 @@ int show_main(int argc, char *argv[])
                char *interfaces = ipc_list_devices(), *interface;
 
                if (!interfaces) {
-                       perror("Unable to get devices");
+                       perror("Unable to list interfaces");
                        return 1;
                }
                interface = interfaces;
@@ -398,7 +398,7 @@ int show_main(int argc, char *argv[])
                        struct wgdevice *device = NULL;
 
                        if (ipc_get_device(&device, interface) < 0) {
-                               perror("Unable to get device");
+                               perror("Unable to access interface");
                                continue;
                        }
                        if (argc == 3) {
@@ -424,7 +424,7 @@ int show_main(int argc, char *argv[])
                }
                interfaces = ipc_list_devices();
                if (!interfaces) {
-                       perror("Unable to get devices");
+                       perror("Unable to list interfaces");
                        return 1;
                }
                interface = interfaces;
@@ -437,7 +437,7 @@ int show_main(int argc, char *argv[])
                struct wgdevice *device = NULL;
 
                if (ipc_get_device(&device, argv[1]) < 0) {
-                       perror("Unable to get device");
+                       perror("Unable to access interface");
                        return 1;
                }
                if (argc == 3) {

diff --git a/src/showconf.c b/src/showconf.c
index fa3fd2d456f1bdb42d2f7bbca18f14892fa18127..390273aefe188d0319e3d1041c9b1124ef6a8d66 100644 (file)
--- a/src/showconf.c
+++ b/src/showconf.c
@@ -32,7 +32,7 @@ int showconf_main(int argc, char *argv[])
        }
 
        if (ipc_get_device(&device, argv[1])) {
-               perror("Unable to get device");
+               perror("Unable to access interface");
                goto cleanup;
        }