X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils.h;h=9a716aec1a9dd8dc03fff00aeaf4cb9d304a1c5c;hb=a4d98aea373e04f3fdc3c492c1688ba52ce490a9;hp=166ac26cfd0768a511e9215cef284996d777e68d;hpb=be8ead27f625b3e4ed383f270dcfee2d158231ec;p=project%2Ffirewall3.git

diff --git a/utils.h b/utils.h
index 166ac26..9a716ae 100644
--- a/utils.h
+++ b/utils.h
@@ -32,6 +32,7 @@
 #include <ifaddrs.h>
 
 #include <libubox/list.h>
+#include <libubox/blob.h>
 #include <uci.h>
 
 
@@ -46,13 +47,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); \
@@ -103,4 +114,6 @@ bool fw3_bitlen2netmask(int family, int bits, void *mask);
 
 void fw3_flush_conntrack(void *zone);
 
+bool fw3_attr_parse_name_type(struct blob_attr *entry, const char **name, const char **type);
+
 #endif