X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.h;h=98e1eec937333e688110c6b51c57d208931f73dd;hp=0d1b9d836a56b6f194d3cbd0ed8f72fb8ddb6e06;hb=e264c8e585ea37ccb1739e7a8e12f8454da1d8a4;hpb=f12271d15da3796c558b6649e97dad988ae2c057

diff --git a/utils.h b/utils.h
index 0d1b9d8..98e1eec 100644
--- a/utils.h
+++ b/utils.h
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -28,6 +28,8 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/file.h>
+#include <sys/types.h>
+#include <ifaddrs.h>
 
 #include <libubox/list.h>
 #include <uci.h>
@@ -44,13 +46,23 @@ void warn(const char *format, ...);
 void error(const char *format, ...);
 void info(const char *format, ...);
 
-#define setbit(field, flag) field |= (1 << (flag))
-#define delbit(field, flag) field &= ~(1 << (flag))
-#define hasbit(field, flag) (field & (1 << (flag)))
 
-#define set(field, family, flag) setbit(field[family == FW3_FAMILY_V6], flag)
-#define del(field, family, flag) delbit(field[family == FW3_FAMILY_V6], flag)
-#define has(field, family, flag) hasbit(field[family == FW3_FAMILY_V6], flag)
+#define warn_section(t, r, e, fmt, ...)					\
+	do {									\
+		if (e)								\
+			warn_elem(e, fmt, ##__VA_ARGS__);			\
+		else								\
+			warn("Warning: ubus " t " (%s) " fmt, 			\
+				(r && r->name) ? r->name : "?", ##__VA_ARGS__);	\
+	} while(0)
+
+#define fw3_setbit(field, flag) field |= (1 << (flag))
+#define fw3_delbit(field, flag) field &= ~(1 << (flag))
+#define fw3_hasbit(field, flag) (field & (1 << (flag)))
+
+#define set(field, family, flag) fw3_setbit(field[family == FW3_FAMILY_V6], flag)
+#define del(field, family, flag) fw3_delbit(field[family == FW3_FAMILY_V6], flag)
+#define has(field, family, flag) fw3_hasbit(field[family == FW3_FAMILY_V6], flag)
 
 #define fw3_foreach(p, h)                                                  \
 	for (p = list_empty(h) ? NULL : list_first_entry(h, typeof(*p), list); \
@@ -91,6 +103,14 @@ void fw3_write_statefile(void *state);
 
 void fw3_free_object(void *obj, const void *opts);
 
+void fw3_free_list(struct list_head *head);
+
 bool fw3_hotplug(bool add, void *zone, void *device);
 
+int fw3_netmask2bitlen(int family, void *mask);
+
+bool fw3_bitlen2netmask(int family, int bits, void *mask);
+
+void fw3_flush_conntrack(void *zone);
+
 #endif