Const correctness.

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 6d68bc781aa7a66c71414e41cb63259e36099f4b..5a572ba361d6ecdeab34ceeb682c456cabd9b5d0 100644 (file)
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -56,7 +56,7 @@ typedef enum device_type {
 int device_fd = -1;
 char *device = NULL;
 char *iface = NULL;
-static char *device_info = NULL;
+static const char *device_info = "OS X utun device";
 #if defined(ENABLE_TUNEMU)
 static device_type_t device_type = DEVICE_TYPE_TUNEMU;
 #elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD) || defined(HAVE_DRAGONFLY)
@@ -116,8 +116,6 @@ static bool setup_utun(void) {
                iface = xstrdup(name);
        }
 
-       device_info = "OS X utun device";
-
        logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
        return true;

diff --git a/src/cygwin/device.c b/src/cygwin/device.c
index 1265f9d596a2c23303e92bf25d3602411257d388..6d94988e34b8a8472ee58e944fc2180ee4ff8012 100644 (file)
--- a/src/cygwin/device.c
+++ b/src/cygwin/device.c
@@ -38,7 +38,7 @@ int device_fd = -1;
 static HANDLE device_handle = INVALID_HANDLE_VALUE;
 char *device = NULL;
 char *iface = NULL;
-static char *device_info = NULL;
+static const char *device_info = "Windows tap device";
 
 static pid_t reader_pid;
 static int sp[2];
@@ -219,8 +219,6 @@ static bool setup_device(void) {
                return false;
        }
 
-       device_info = "Windows tap device";
-
        logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
 
        return true;

diff --git a/src/dummy_device.c b/src/dummy_device.c
index c43d586258503efdf6fd0a632fb7423a45f45848..80232e1edee976ff70e13dda524ceac0a82fc98e 100644 (file)
--- a/src/dummy_device.c
+++ b/src/dummy_device.c
@@ -22,12 +22,13 @@
 #include "device.h"
 #include "logger.h"
 #include "net.h"
+#include "xalloc.h"
 
-static char *device_info = "dummy device";
+static const char *device_info = "dummy device";
 
 static bool setup_device(void) {
-       device = "dummy";
-       iface = "dummy";
+       device = xstrdup("dummy");
+       iface = xstrdup("dummy");
        logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
        return true;
 }

diff --git a/src/linux/device.c b/src/linux/device.c
index 23178a3624c26ca8695983e701c0d39db3b7749d..54ea5dcac1937cb951b3be180d8c084e95e20ca7 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -44,7 +44,7 @@ char *device = NULL;
 char *iface = NULL;
 static char *type = NULL;
 static char ifrname[IFNAMSIZ];
-static char *device_info;
+static const char *device_info;
 
 static bool setup_device(void) {
        if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 1116b5e18ab79aeead7cb4514f6c28d730547716..49d0cd341c8229785bd67035fa69c17d4259ff56 100644 (file)
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -43,7 +43,7 @@ static vpn_packet_t device_read_packet;
 static vpn_packet_t device_write_packet;
 char *device = NULL;
 char *iface = NULL;
-static char *device_info = NULL;
+static const char *device_info = "Windows tap device";
 
 extern char *myport;
 

diff --git a/src/multicast_device.c b/src/multicast_device.c
index c19852bfca7f855ba5e0c9543f8e894bf3996d2d..99f26ca9e038d18947ef3f8e7706a50bdbbe4e90 100644 (file)
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -29,7 +29,7 @@
 #include "route.h"
 #include "xalloc.h"
 
-static char *device_info;
+static const char *device_info = "multicast socket";
 
 static struct addrinfo *ai = NULL;
 static mac_t ignore_src = {{0}};
@@ -40,8 +40,6 @@ static bool setup_device(void) {
        char *space;
        int ttl = 1;
 
-       device_info = "multicast socket";
-
        get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
        if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {

diff --git a/src/raw_socket_device.c b/src/raw_socket_device.c
index 0ac970cf4cae56641c651cfd80eabde2130c3d8a..3ec8e5715474014f5706c4978b8445ee4ba51a25 100644 (file)
--- a/src/raw_socket_device.c
+++ b/src/raw_socket_device.c
@@ -33,7 +33,7 @@
 #include "xalloc.h"
 
 #if defined(PF_PACKET) && defined(ETH_P_ALL) && defined(AF_PACKET) && defined(SIOCGIFINDEX)
-static char *device_info;
+static const char *device_info = "raw_socket";
 
 static bool setup_device(void) {
        struct ifreq ifr;
@@ -47,8 +47,6 @@ static bool setup_device(void) {
                device = xstrdup(iface);
        }
 
-       device_info = "raw socket";
-
        if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", device_info,
                       strerror(errno));

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 9480ddab5d2ad06a4bfc425e88ab8031ae00f21c..f27954b1d05e6ce1674633a2683ae6c9a0c8aa7a 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -53,7 +53,7 @@ int device_fd = -1;
 static int ip_fd = -1;
 char *device = NULL;
 char *iface = NULL;
-static char *device_info = NULL;
+static const char *device_info = NULL;
 
 static bool setup_device(void) {
        char *type;

diff --git a/src/uml_device.c b/src/uml_device.c
index 3f521040f8ceb25827866ebf261d5181e1885391..dbb13e937b3dbcdc79302ffa2d3e4ba55226f8c0 100644 (file)
--- a/src/uml_device.c
+++ b/src/uml_device.c
@@ -36,7 +36,7 @@ static int request_fd = -1;
 static int data_fd = -1;
 static int write_fd = -1;
 static int state = 0;
-static char *device_info;
+static const char *device_info = "UML network socket";
 
 enum request_type { REQ_NEW_CONTROL };
 
@@ -65,8 +65,6 @@ static bool setup_device(void) {
 
        get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
-       device_info = "UML network socket";
-
        if((write_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Could not open write %s: %s", device_info, strerror(errno));
                event_exit();

diff --git a/src/vde_device.c b/src/vde_device.c
index 4cbf712894ab056aae99f1d01570d35aa14b85ae..0170af32401f6dad1c3674a53c9ccdcb0ab89002 100644 (file)
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -34,7 +34,7 @@ static struct vdepluglib plug;
 static struct vdeconn *conn = NULL;
 static int port = 0;
 static char *group = NULL;
-static char *device_info;
+static const char *device_info = "VDE socket";
 
 static bool setup_device(void) {
        libvdeplug_dynopen(plug);
@@ -54,8 +54,6 @@ static bool setup_device(void) {
 
        get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
 
-       device_info = "VDE socket";
-
        struct vde_open_args args = {
                .port = port,
                .group = group,