projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Skip rules with invalid options
[project/firewall3.git]
/
utils.h
diff --git
a/utils.h
b/utils.h
index
c3dc974
..
cd478f9
100644
(file)
--- a/
utils.h
+++ b/
utils.h
@@
-24,6
+24,7
@@
#include <unistd.h>
#include <signal.h>
#include <fcntl.h>
#include <unistd.h>
#include <signal.h>
#include <fcntl.h>
+#include <limits.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/file.h>
@@
-34,6
+35,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;
@@
-46,6
+48,10
@@
void info(const char *format, ...);
#define delbit(field, flag) field &= ~(1 << (flag))
#define hasbit(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 fw3_foreach(p, h) \
for (p = list_empty(h) ? NULL : list_first_entry(h, typeof(*p), list); \
list_empty(h) ? (p == NULL) : (&p->list != (h)); \
#define fw3_foreach(p, h) \
for (p = list_empty(h) ? NULL : list_first_entry(h, typeof(*p), list); \
list_empty(h) ? (p == NULL) : (&p->list != (h)); \
@@
-58,6
+64,14
@@
void info(const char *format, ...);
#define fw3_no_family(flags) \
(!(flags & ((1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6))))
#define fw3_no_family(flags) \
(!(flags & ((1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6))))
+#define fw3_no_table(flags) \
+ (!(flags & ((1<<FW3_TABLE_FILTER)|(1<<FW3_TABLE_NAT)| \
+ (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);
@@
-73,18
+87,12
@@
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);
+
#endif
#endif