Drop support for localisation.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index 6d02b47..35c66d5 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -50,12 +50,9 @@ static char *device_info;
 static int device_total_in = 0;
 static int device_total_out = 0;
 
-bool setup_device(void)
-{
+bool setup_device(void) {
        struct ifreq ifr;
 
-       cp();
-
        if(!get_config_string(lookup_config(config_tree, "Device"), &device))
                device = xstrdup(DEFAULT_DEVICE);
 
@@ -69,7 +66,7 @@ bool setup_device(void)
        device_fd = open(device, O_RDWR | O_NONBLOCK);
 
        if(device_fd < 0) {
-               logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+               logger(LOG_ERR, "Could not open %s: %s", device, strerror(errno));
                return false;
        }
 
@@ -80,11 +77,11 @@ bool setup_device(void)
        if(routing_mode == RMODE_ROUTER) {
                ifr.ifr_flags = IFF_TUN;
                device_type = DEVICE_TYPE_TUN;
-               device_info = _("Linux tun/tap device (tun mode)");
+               device_info = "Linux tun/tap device (tun mode)";
        } else {
                ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
                device_type = DEVICE_TYPE_TAP;
-               device_info = _("Linux tun/tap device (tap mode)");
+               device_info = "Linux tun/tap device (tap mode)";
        }
 
        if(iface)
@@ -95,7 +92,7 @@ bool setup_device(void)
                if(iface) free(iface);
                iface = xstrdup(ifrname);
        } else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) {
-               logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
+               logger(LOG_WARNING, "Old ioctl() request was needed for %s", device);
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
                if(iface) free(iface);
                iface = xstrdup(ifrname);
@@ -104,40 +101,34 @@ bool setup_device(void)
        {
                if(routing_mode == RMODE_ROUTER)
                        overwrite_mac = true;
-               device_info = _("Linux ethertap device");
+               device_info = "Linux ethertap device";
                device_type = DEVICE_TYPE_ETHERTAP;
                if(iface)
                        free(iface);
                iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
        }
 
-       logger(LOG_INFO, _("%s is a %s"), device, device_info);
+       logger(LOG_INFO, "%s is a %s", device, device_info);
 
        return true;
 }
 
-void close_device(void)
-{
-       cp();
-       
+void close_device(void) {
        close(device_fd);
 
        free(device);
        free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
+bool read_packet(vpn_packet_t *packet) {
        int lenin;
        
-       cp();
-
        switch(device_type) {
                case DEVICE_TYPE_TUN:
                        lenin = read(device_fd, packet->data + 10, MTU - 10);
 
                        if(lenin <= 0) {
-                               logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(LOG_ERR, "Error while reading from %s %s: %s",
                                           device_info, device, strerror(errno));
                                return false;
                        }
@@ -148,7 +139,7 @@ bool read_packet(vpn_packet_t *packet)
                        lenin = read(device_fd, packet->data, MTU);
 
                        if(lenin <= 0) {
-                               logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(LOG_ERR, "Error while reading from %s %s: %s",
                                           device_info, device, strerror(errno));
                                return false;
                        }
@@ -159,7 +150,7 @@ bool read_packet(vpn_packet_t *packet)
                        lenin = read(device_fd, packet->data - 2, MTU + 2);
 
                        if(lenin <= 0) {
-                               logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(LOG_ERR, "Error while reading from %s %s: %s",
                                           device_info, device, strerror(errno));
                                return false;
                        }
@@ -170,31 +161,28 @@ 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)
-{
-       cp();
-
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+bool write_packet(vpn_packet_t *packet) {
+       ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
                           packet->len, device_info);
 
        switch(device_type) {
                case DEVICE_TYPE_TUN:
                        packet->data[10] = packet->data[11] = 0;
                        if(write(device_fd, packet->data + 10, packet->len - 10) < 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;
                        }
                        break;
                case DEVICE_TYPE_TAP:
                        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;
                        }
@@ -203,7 +191,7 @@ bool write_packet(vpn_packet_t *packet)
                        *(short int *)(packet->data - 2) = packet->len;
 
                        if(write(device_fd, packet->data - 2, packet->len + 2) < 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;
                        }
@@ -215,11 +203,8 @@ bool write_packet(vpn_packet_t *packet)
        return true;
 }
 
-void dump_device_stats(void)
-{
-       cp();
-
-       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);
+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);
 }