zones: add interface/subnet bound LOG rules

[project/firewall3.git] / utils.h

diff --git a/utils.h b/utils.h
index c74a5dd..c8ab0e5 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -30,13 +30,16 @@
 #include <sys/file.h>
 #include <sys/types.h>
 #include <ifaddrs.h>
+#include <netdb.h>
 
 #include <libubox/list.h>
+#include <libubox/blob.h>
 #include <uci.h>
 
 
 #define FW3_STATEFILE  "/var/run/fw3.state"
 #define FW3_LOCKFILE   "/var/run/fw3.lock"
+#define FW3_HELPERCONF "/usr/share/fw3/helpers.conf"
 #define FW3_HOTPLUG     "/sbin/hotplug-call"
 
 extern bool fw3_pr_debug;
@@ -46,6 +49,16 @@ void warn(const char *format, ...);
 void error(const char *format, ...);
 void info(const char *format, ...);
 
+
+#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)))
@@ -103,4 +116,8 @@ 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);
+
+const char * fw3_protoname(void *proto);
+
 #endif