firewall3: fix left shift on 64 bit systems in fw3_bitlen2netmask

[project/firewall3.git] / utils.h

diff --git a/utils.h b/utils.h
index 60e87c2..834d979 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -28,6 +28,8 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/file.h>
 #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>
 
 #include <libubox/list.h>
 #include <uci.h>


@@ -35,6 +37,7 @@
 
 #define FW3_STATEFILE  "/var/run/fw3.state"
 #define FW3_LOCKFILE   "/var/run/fw3.lock"
 
 #define FW3_STATEFILE  "/var/run/fw3.state"
 #define FW3_LOCKFILE   "/var/run/fw3.lock"

+#define FW3_HOTPLUG     "/sbin/hotplug-call"

 
 extern bool fw3_pr_debug;
 
 
 extern bool fw3_pr_debug;
 


@@ -68,6 +71,9 @@ void info(const char *format, ...);
                 (1<<FW3_TABLE_MANGLE)|(1<<FW3_TABLE_RAW))))
 
 
                 (1<<FW3_TABLE_MANGLE)|(1<<FW3_TABLE_RAW))))
 
 

+void * fw3_alloc(size_t size);
+char * fw3_strdup(const char *s);
+

 const char * fw3_find_command(const char *cmd);
 
 bool fw3_stdout_pipe(void);
 const char * fw3_find_command(const char *cmd);
 
 bool fw3_stdout_pipe(void);


@@ -83,29 +89,18 @@ bool fw3_lock(void);
 void fw3_unlock(void);
 
 
 void fw3_unlock(void);
 
 

-enum fw3_statefile_type
-{
-       FW3_TYPE_DEFAULTS = 0,
-       FW3_TYPE_ZONE     = 1,
-       FW3_TYPE_IPSET    = 2,
-};
-
-bool fw3_read_statefile(void *state);

 void fw3_write_statefile(void *state);
 
 void fw3_write_statefile(void *state);
 

-void fw3_set_running(void *object, struct list_head *dest);
-

 void fw3_free_object(void *obj, const void *opts);
 
 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);

 
 

-struct fw3_rule_spec {
-       int family;
-       int table;
-       int flag;
-       const char *format;
-};
+bool fw3_bitlen2netmask(int family, int bits, void *mask);

 
 

-bool fw3_pr_rulespec(int table, int family, uint32_t *flags, uint32_t mask,
-                     const struct fw3_rule_spec *r, const char *fmt, ...);
+void fw3_flush_conntrack(void *zone);

 
 #endif
 
 #endif