projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use netmasks instead of prefix lengths internally
[project/firewall3.git]
/
options.h
diff --git
a/options.h
b/options.h
index
0a2fa7f
..
28de48e
100644
(file)
--- a/
options.h
+++ b/
options.h
@@
-175,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;
@@
-185,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
@@
-563,6
+562,6
@@
bool fw3_parse_blob_options(void *s, const struct fw3_option *opts,
struct blob_attr *a);
const char * fw3_address_to_string(struct fw3_address *address,
struct blob_attr *a);
const char * fw3_address_to_string(struct fw3_address *address,
- bool allow_invert);
+ bool allow_invert
, bool as_cidr
);
#endif
#endif