X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils.c;h=17d5bf97d18f43a54cb721604ee60f9bb34590ff;hb=40e5f6a2bd0b5406eff7e1d2d4f95bbf8f9410a4;hp=b465878a71f2bfc4cb3f872fbf23b5d28aec4766;hpb=bf29c1e7e95c00953da9430e4c5144ef2b79a361;p=project%2Ffirewall3.git

diff --git a/utils.c b/utils.c
index b465878..17d5bf9 100644
--- a/utils.c
+++ b/utils.c
@@ -28,7 +28,7 @@
 #include "ipsets.h"
 
 
-static int lock_fd = -1;
+static int fw3_lock_fd = -1;
 static pid_t pipe_pid = -1;
 static FILE *pipe_fd = NULL;
 
@@ -145,7 +145,7 @@ fw3_alloc(size_t size)
 	mem = calloc(1, size);
 
 	if (!mem)
-		error("Out of memory while allocating %d bytes", size);
+		error("Out of memory while allocating %zd bytes", size);
 
 	return mem;
 }
@@ -191,8 +191,7 @@ fw3_find_command(const char *cmd)
 		if ((plen + clen) >= sizeof(path))
 			continue;
 
-		strncpy(path, search, plen);
-		sprintf(path + plen, "/%s", cmd);
+		snprintf(path, sizeof(path), "%.*s/%s", plen, search, cmd);
 
 		if (!stat(path, &s) && S_ISREG(s.st_mode))
 			return path;
@@ -316,23 +315,19 @@ fw3_command_close(void)
 	pipe_pid = -1;
 }
 
-bool
-fw3_has_table(bool ipv6, const char *table)
+static bool
+file_contains(const char *path, const char *str)
 {
 	FILE *f;
-
 	char line[12];
 	bool seen = false;
 
-	const char *path = ipv6
-		? "/proc/net/ip6_tables_names" : "/proc/net/ip_tables_names";
-
 	if (!(f = fopen(path, "r")))
 		return false;
 
 	while (fgets(line, sizeof(line), f))
 	{
-		if (!strncmp(line, table, strlen(table)))
+		if (!strncmp(line, str, strlen(str)))
 		{
 			seen = true;
 			break;
@@ -344,40 +339,74 @@ fw3_has_table(bool ipv6, const char *table)
 	return seen;
 }
 
+bool
+fw3_has_table(const bool ipv6, const char *table)
+{
+	const char *path = ipv6
+		? "/proc/net/ip6_tables_names" : "/proc/net/ip_tables_names";
+
+	return file_contains(path, table);
+}
 
 bool
-fw3_lock(void)
+fw3_has_target(const bool ipv6, const char *target)
 {
-	lock_fd = open(FW3_LOCKFILE, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
+	const char *path = ipv6
+		? "/proc/net/ip6_tables_targets" : "/proc/net/ip_tables_targets";
+
+	return file_contains(path, target);
+}
+
+bool
+fw3_lock_path(int *fd, const char *path)
+{
+	int lock_fd = open(path, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
 
 	if (lock_fd < 0)
 	{
-		warn("Cannot create lock file %s: %s", FW3_LOCKFILE, strerror(errno));
+		warn("Cannot create lock file %s: %s", path, strerror(errno));
 		return false;
 	}
 
 	if (flock(lock_fd, LOCK_EX))
 	{
 		warn("Cannot acquire exclusive lock: %s", strerror(errno));
+		close(lock_fd);
 		return false;
 	}
 
+	*fd = lock_fd;
+
 	return true;
 }
 
+bool
+fw3_lock()
+{
+	return fw3_lock_path(&fw3_lock_fd, FW3_LOCKFILE);
+}
+
+
 void
-fw3_unlock(void)
+fw3_unlock_path(int *fd, const char *lockpath)
 {
-	if (lock_fd < 0)
+	if (*fd < 0)
 		return;
 
-	if (flock(lock_fd, LOCK_UN))
+	if (flock(*fd, LOCK_UN))
 		warn("Cannot release exclusive lock: %s", strerror(errno));
 
-	close(lock_fd);
+	close(*fd);
 	unlink(FW3_LOCKFILE);
 
-	lock_fd = -1;
+	*fd = -1;
+}
+
+
+void
+fw3_unlock(void)
+{
+	fw3_unlock_path(&fw3_lock_fd, FW3_LOCKFILE);
 }
 
 
@@ -385,7 +414,7 @@ static void
 write_defaults_uci(struct uci_context *ctx, struct fw3_defaults *d,
                    struct uci_package *dest)
 {
-	char buf[sizeof("0xffffffff\0")];
+	char buf[sizeof("0xffffffff")];
 	struct uci_ptr ptr = { .p = dest };
 
 	uci_add_section(ctx, dest, "defaults", &ptr.s);
@@ -405,13 +434,13 @@ write_defaults_uci(struct uci_context *ctx, struct fw3_defaults *d,
 	ptr.value  = fw3_flag_names[d->policy_forward];
 	uci_set(ctx, &ptr);
 
-	sprintf(buf, "0x%x", d->flags[0]);
+	snprintf(buf, sizeof(buf), "0x%x", d->flags[0]);
 	ptr.o      = NULL;
 	ptr.option = "__flags_v4";
 	ptr.value  = buf;
 	uci_set(ctx, &ptr);
 
-	sprintf(buf, "0x%x", d->flags[1]);
+	snprintf(buf, sizeof(buf), "0x%x", d->flags[1]);
 	ptr.o      = NULL;
 	ptr.option = "__flags_v6";
 	ptr.value  = buf;
@@ -552,13 +581,29 @@ write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,
 		}
 	}
 
-	sprintf(buf, "0x%x", z->flags[0]);
+	if (z->extra_src)
+	{
+		ptr.o      = NULL;
+		ptr.option = "extra_src";
+		ptr.value  = z->extra_src;
+		uci_set(ctx, &ptr);
+	}
+
+	if (z->extra_dest)
+	{
+		ptr.o      = NULL;
+		ptr.option = "extra_dest";
+		ptr.value  = z->extra_dest;
+		uci_set(ctx, &ptr);
+	}
+
+	snprintf(buf, sizeof(buf), "0x%x", z->flags[0]);
 	ptr.o      = NULL;
 	ptr.option = "__flags_v4";
 	ptr.value  = buf;
 	uci_set(ctx, &ptr);
 
-	sprintf(buf, "0x%x", z->flags[1]);
+	snprintf(buf, sizeof(buf), "0x%x", z->flags[1]);
 	ptr.o      = NULL;
 	ptr.option = "__flags_v6";
 	ptr.value  = buf;
@@ -571,7 +616,7 @@ write_ipset_uci(struct uci_context *ctx, struct fw3_ipset *s,
 {
 	struct fw3_ipset_datatype *type;
 
-	char buf[sizeof("65535-65535\0")];
+	char buf[sizeof("65535-65535")];
 
 	struct uci_ptr ptr = { .p = dest };
 
@@ -600,7 +645,7 @@ write_ipset_uci(struct uci_context *ctx, struct fw3_ipset *s,
 
 	list_for_each_entry(type, &s->datatypes, list)
 	{
-		sprintf(buf, "%s_%s", type->dir, fw3_ipset_type_names[type->type]);
+		snprintf(buf, sizeof(buf), "%s_%s", type->dir, fw3_ipset_type_names[type->type]);
 		ptr.o      = NULL;
 		ptr.option = "match";
 		ptr.value  = buf;
@@ -617,7 +662,7 @@ write_ipset_uci(struct uci_context *ctx, struct fw3_ipset *s,
 
 	if (s->portrange.set)
 	{
-		sprintf(buf, "%u-%u", s->portrange.port_min, s->portrange.port_max);
+		snprintf(buf, sizeof(buf), "%u-%u", s->portrange.port_min, s->portrange.port_max);
 		ptr.o      = NULL;
 		ptr.option = "portrange";
 		ptr.value  = buf;
@@ -961,7 +1006,7 @@ fw3_check_loopback_dev(const char *name)
 		return false;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name) - 1);
+	snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", name);
 
 	if (ioctl(s, SIOCGIFFLAGS, &ifr) >= 0) {
 		if (ifr.ifr_flags & IFF_LOOPBACK)