X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fraw_socket%2Fdevice.c;h=66d63487e7235365098bcf62eba6e6b4967c4136;hb=a22041922f160667573e9a5ae3f4195e1668906a;hp=6c56ed647cf0d0c576652e8a449952b2966a867d;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee;p=tinc

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 6c56ed64..66d63487 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -35,95 +35,83 @@ char *iface = NULL;
 static char ifrname[IFNAMSIZ];
 static char *device_info;
 
-static int device_total_in = 0;
-static int device_total_out = 0;
+static uint64_t device_total_in = 0;
+static uint64_t device_total_out = 0;
 
-bool setup_device(void)
-{
+bool setup_device(void) {
 	struct ifreq ifr;
 	struct sockaddr_ll sa;
 
-	cp();
-
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
 		iface = xstrdup("eth0");
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = xstrdup(iface);
 
-	device_info = _("raw socket");
+	device_info = "raw socket";
 
 	if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
-		logger(LOG_ERR, _("Could not open %s: %s"), device_info,
+		logger(LOG_ERR, "Could not open %s: %s", device_info,
 			   strerror(errno));
 		return false;
 	}
 
-	memset(&ifr, 0, sizeof(ifr));
+	memset(&ifr, 0, sizeof ifr);
 	strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 	if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
 		close(device_fd);
-		logger(LOG_ERR, _("Can't find interface %s: %s"), iface,
+		logger(LOG_ERR, "Can't find interface %s: %s", iface,
 			   strerror(errno));
 		return false;
 	}
 
-	memset(&sa, '0', sizeof(sa));
+	memset(&sa, '0', sizeof sa);
 	sa.sll_family = AF_PACKET;
 	sa.sll_protocol = htons(ETH_P_ALL);
 	sa.sll_ifindex = ifr.ifr_ifindex;
 
-	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
-		logger(LOG_ERR, _("Could not bind %s to %s: %s"), device, iface, strerror(errno));
+	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof sa)) {
+		logger(LOG_ERR, "Could not bind %s to %s: %s", device, iface, strerror(errno));
 		return false;
 	}
 
-	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)
-{
-	int lenin;
-
-	cp();
+bool read_packet(vpn_packet_t *packet) {
+	int inlen;
 
-	if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
-		logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+	if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
+		logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 			   device, strerror(errno));
 		return false;
 	}
 
-	packet->len = lenin;
+	packet->len = inlen;
 
 	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);
 
 	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;
 	}
@@ -133,11 +121,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:  %10"PRIu64, device_total_in);
+	logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }