projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load running state after lock is acquired
[project/firewall3.git]
/
options.h
diff --git
a/options.h
b/options.h
index 30c0a95bdd57f2201c7442408f0b8b5689dc9951..a2baccec8fc6309d71c0610ee356dad3b7c7fbb9 100644
(file)
--- a/
options.h
+++ b/
options.h
@@
-41,6
+41,7
@@
#include <libubox/list.h>
#include <libubox/utils.h>
#include <libubox/list.h>
#include <libubox/utils.h>
+#include <libubox/blobmsg.h>
#include "icmp_codes.h"
#include "utils.h"
#include "icmp_codes.h"
#include "utils.h"
@@
-174,7
+175,6
@@
struct fw3_address
bool invert;
bool resolved;
enum fw3_family family;
bool invert;
bool resolved;
enum fw3_family family;
- int mask;
union {
struct in_addr v4;
struct in6_addr v6;
union {
struct in_addr v4;
struct in6_addr v6;
@@
-184,7
+184,7
@@
struct fw3_address
struct in_addr v4;
struct in6_addr v6;
struct ether_addr mac;
struct in_addr v4;
struct in6_addr v6;
struct ether_addr mac;
- }
address2
;
+ }
mask
;
};
struct fw3_mac
};
struct fw3_mac
@@
-314,6
+314,8
@@
struct fw3_zone
bool custom_chains;
uint32_t flags[2];
bool custom_chains;
uint32_t flags[2];
+
+ struct list_head old_addrs;
};
struct fw3_rule
};
struct fw3_rule
@@
-558,8
+560,10
@@
bool fw3_parse_direction(void *ptr, const char *val, bool is_list);
bool fw3_parse_options(void *s, const struct fw3_option *opts,
struct uci_section *section);
bool fw3_parse_options(void *s, const struct fw3_option *opts,
struct uci_section *section);
+bool fw3_parse_blob_options(void *s, const struct fw3_option *opts,
+ struct blob_attr *a, const char *name);
const char * fw3_address_to_string(struct fw3_address *address,
const char * fw3_address_to_string(struct fw3_address *address,
- bool allow_invert);
+ bool allow_invert
, bool as_cidr
);
#endif
#endif