X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Fmisc-progs%2Fopenvpnctrl.c;h=5d3f8af73b43ba7b8c6f734ae74648c93bfae567;hp=d20cced7743b80bdfc91c1875b54c2e33d0ca337;hb=e1297cbb7659618c526fdc1ab07e97f57f55fd78;hpb=6b7cbc8f335106a0d8e8860f343a51bda8e14dbb

diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c
index d20cced774..5d3f8af73b 100644
--- a/src/misc-progs/openvpnctrl.c
+++ b/src/misc-progs/openvpnctrl.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
@@ -7,6 +8,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <fcntl.h>
+#include <ftw.h>
 #include "setuid.h"
 #include "netutil.h"
 #include "libsmooth.h"
@@ -572,23 +574,44 @@ int killNet2Net(char *name) {
 	return 0;
 }
 
-int deleterrd(char *name) {
-	connection *conn = getConnections();
 
-	char rrd_file[STRING_SIZE];
-	snprintf(rrd_file, STRING_SIZE - 1, "/var/log/rrd/collectd/localhost/openvpn-%s/if_octets.rrd", name);
+static int recursive_remove_callback(const char* fpath, const struct stat* sb, int typeflag, struct FTW* ftwbuf) {
+	int rv = remove(fpath);
+	if (rv)
+		perror(fpath);
+
+	return rv;
+}
+
+static int recursive_remove(const char* path) {
+	return nftw(path, recursive_remove_callback, 64, FTW_DEPTH | FTW_PHYS);
+}
 
+int deleterrd(char *name) {
 	char rrd_dir[STRING_SIZE];
-	snprintf(rrd_dir, STRING_SIZE - 1, "/var/log/rrd/collectd/localhost/openvpn-%s", name);
 
+	connection *conn = getConnections();
 	while(conn) {
-		/* Find only RW-Connections with the given name. */
-		if (((strcmp(conn->type, "host") == 0) && (strcmp(conn->name, name) == 0))) {
-			remove(rrd_file);
-			remove(rrd_dir);
-			return 0;
+		if (strcmp(conn->name, name) != 0) {
+			conn = conn->next;
+			continue;
 		}
-		conn = conn->next;
+
+		// Handle RW connections
+		if (strcmp(conn->type, "host") == 0) {
+			snprintf(rrd_dir, STRING_SIZE - 1, "/var/log/rrd/collectd/localhost/openvpn-%s", name);
+
+		// Handle N2N connections
+		} else if (strcmp(conn->type, "net") == 0) {
+			snprintf(rrd_dir, STRING_SIZE - 1, "/var/log/rrd/collectd/localhost/openvpn-%s-n2n/", name);
+
+		// Unhandled connection type
+		} else {
+			conn = conn->next;
+			continue;
+		}
+
+		return recursive_remove(rrd_dir);
 	}
 
 	return 1;