[gentoo-commits] gentoo-x86 commit in net-misc/tinc/files: fix-missing-vde.patch fix-compile-vde-uml.patch

[Anthony G. Basile (blueness)]

blueness    11/12/21 17:32:22

  Added:                fix-missing-vde.patch fix-compile-vde-uml.patch
  Log:
  Added USE flags for raw, uml and vde sockets, bug #371131
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/tinc/files/fix-missing-vde.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tinc/files/fix-missing-vde.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tinc/files/fix-missing-vde.patch?rev=1.1&content-type=text/plain

Index: fix-missing-vde.patch
===================================================================
diff -Naur src/vde/device.c src/vde/device.c
--- src/vde/device.c	1969-12-31 19:00:00.000000000 -0500
+++ src/vde/device.c	2011-12-21 11:20:34.000000000 -0500
@@ -0,0 +1,134 @@
+/*
+    device.c -- VDE plug
+    Copyright (C) 2011 Guus Sliepen <guus@××××××××.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "system.h"
+
+#include <libvdeplug_dyn.h>
+
+#include "conf.h"
+#include "device.h"
+#include "net.h"
+#include "logger.h"
+#include "utils.h"
+#include "route.h"
+#include "xalloc.h"
+
+int device_fd = -1;
+static struct vdepluglib plug;
+static struct vdeconn *conn = NULL;
+static int port = 0;
+static char *group = NULL;
+char *device = NULL;
+char *iface = NULL;
+static char *device_info;
+
+extern char *identname;
+extern bool running;
+
+static uint64_t device_total_in = 0;
+static uint64_t device_total_out = 0;
+
+bool setup_device(void) {
+	libvdeplug_dynopen(plug);
+
+	if(!plug.dl_handle) {
+		logger(LOG_ERR, "Could not open libvdeplug library!");
+		return false;
+	}
+
+	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+		xasprintf(&device, LOCALSTATEDIR "/run/vde.ctl");
+
+	get_config_string(lookup_config(config_tree, "Interface"), &iface);
+
+	get_config_int(lookup_config(config_tree, "VDEPort"), &port);
+
+	get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
+
+	device_info = "VDE socket";
+
+	struct vde_open_args args = {
+		.port = port,
+		.group = group,
+		.mode = 0700,
+	};
+
+	conn = plug.vde_open(device, identname, &args);
+	if(!conn) {
+		logger(LOG_ERR, "Could not open VDE socket %s", device);
+		return false;
+	}
+
+	device_fd = plug.vde_datafd(conn);
+
+	logger(LOG_INFO, "%s is a %s", device, device_info);
+
+	if(routing_mode == RMODE_ROUTER)
+		overwrite_mac = true;
+
+	return true;
+}
+
+void close_device(void) {
+	if(conn)
+		plug.vde_close(conn);
+
+	if(plug.dl_handle)
+		libvdeplug_dynclose(plug);
+
+	free(device);
+
+	free(iface);
+}
+
+bool read_packet(vpn_packet_t *packet) {
+	int lenin = 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;
+		return false;
+	}
+
+	packet->len = lenin;
+	device_total_in += 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) {
+	if(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;
+		}
+
+		return false;
+	}
+
+	device_total_out += packet->len;
+
+	return true;
+}
+
+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);
+}



1.1                  net-misc/tinc/files/fix-compile-vde-uml.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tinc/files/fix-compile-vde-uml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tinc/files/fix-compile-vde-uml.patch?rev=1.1&content-type=text/plain

Index: fix-compile-vde-uml.patch
===================================================================
diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c
index a2da757..a371e7b 100644
--- a/src/uml_socket/device.c
+++ b/src/uml_socket/device.c
@@ -28,6 +28,7 @@
 #include "logger.h"
 #include "utils.h"
 #include "route.h"
+#include "xalloc.h"
 
 int device_fd = -1;
 static int listen_fd = -1;
@@ -40,7 +41,7 @@ char *iface = NULL;
 static char *device_info;
 
 extern char *identname;
-extern bool running;
+extern volatile bool running;
 
 static uint64_t device_total_in = 0;
 static uint64_t device_total_out = 0;
@@ -175,7 +176,7 @@ bool read_packet(vpn_packet_t *packet) {
 	switch(state) {
 		case 0: {
 			struct sockaddr sa;
-			int salen = sizeof sa;
+			socklen_t salen = sizeof sa;
 
 			request_fd = accept(listen_fd, &sa, &salen);
 			if(request_fd < 0) {
@@ -244,6 +245,10 @@ bool read_packet(vpn_packet_t *packet) {
 
 			return true;
 		}
+
+		default:
+			logger(LOG_ERR, "Invalid value for state variable in " __FILE__);
+			abort();
 	}
 }
 
diff --git a/src/vde/device.c b/src/vde/device.c
index 63171f9..74cf3b6 100644
--- a/src/vde/device.c
+++ b/src/vde/device.c
@@ -39,7 +39,7 @@ char *iface = NULL;
 static char *device_info;
 
 extern char *identname;
-extern bool running;
+extern volatile bool running;
 
 static uint64_t device_total_in = 0;
 static uint64_t device_total_out = 0;