X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=options.h;h=15cd504faef277c120a040f050912653868c7de1;hp=e903ab3ffe972365a81446b5738ccc5d6df9857a;hb=35b3e74a184b709b8ddfaaa094919a656a6ec059;hpb=1fbc7b77f4b7748b8ebfea201a3eb09153e35c23 diff --git a/options.h b/options.h index e903ab3..15cd504 100644 --- a/options.h +++ b/options.h @@ -1,7 +1,7 @@ /* * firewall3 - 3rd OpenWrt UCI firewall implementation * - * Copyright (C) 2013 Jo-Philipp Wich + * Copyright (C) 2013-2014 Jo-Philipp Wich * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -32,6 +32,8 @@ #include #include #include +#define _LINUX_IN_H +#define _LINUX_IN6_H #include #include @@ -41,6 +43,7 @@ #include #include +#include #include "icmp_codes.h" #include "utils.h" @@ -68,17 +71,19 @@ enum fw3_flag FW3_FLAG_REJECT = 7, FW3_FLAG_DROP = 8, FW3_FLAG_NOTRACK = 9, - FW3_FLAG_MARK = 10, - FW3_FLAG_DNAT = 11, - FW3_FLAG_SNAT = 12, - FW3_FLAG_SRC_ACCEPT = 13, - FW3_FLAG_SRC_REJECT = 14, - FW3_FLAG_SRC_DROP = 15, - FW3_FLAG_CUSTOM_CHAINS = 16, - FW3_FLAG_SYN_FLOOD = 17, - FW3_FLAG_MTU_FIX = 18, - FW3_FLAG_DROP_INVALID = 19, - FW3_FLAG_HOTPLUG = 20, + FW3_FLAG_HELPER = 10, + FW3_FLAG_MARK = 11, + FW3_FLAG_DNAT = 12, + FW3_FLAG_SNAT = 13, + FW3_FLAG_MASQUERADE = 14, + FW3_FLAG_SRC_ACCEPT = 15, + FW3_FLAG_SRC_REJECT = 16, + FW3_FLAG_SRC_DROP = 17, + FW3_FLAG_CUSTOM_CHAINS = 18, + FW3_FLAG_SYN_FLOOD = 19, + FW3_FLAG_MTU_FIX = 20, + FW3_FLAG_DROP_INVALID = 21, + FW3_FLAG_HOTPLUG = 22, __FW3_FLAG_MAX }; @@ -141,7 +146,16 @@ struct fw3_ipset_datatype { struct list_head list; enum fw3_ipset_type type; - bool dest; + const char *dir; +}; + +struct fw3_setmatch +{ + bool set; + bool invert; + char name[32]; + const char *dir[3]; + struct fw3_ipset *ptr; }; struct fw3_device @@ -162,8 +176,8 @@ struct fw3_address bool set; bool range; bool invert; + bool resolved; enum fw3_family family; - int mask; union { struct in_addr v4; struct in6_addr v6; @@ -173,7 +187,7 @@ struct fw3_address struct in_addr v4; struct in6_addr v6; struct ether_addr mac; - } address2; + } mask; }; struct fw3_mac @@ -245,6 +259,16 @@ struct fw3_mark uint32_t mask; }; +struct fw3_cthelpermatch +{ + struct list_head list; + + bool set; + bool invert; + char name[32]; + struct fw3_cthelper *ptr; +}; + struct fw3_defaults { enum fw3_flag policy_input; @@ -257,13 +281,16 @@ struct fw3_defaults struct fw3_limit syn_flood_rate; bool tcp_syncookies; - bool tcp_ecn; + int tcp_ecn; bool tcp_window_scaling; bool accept_redirects; bool accept_source_route; bool custom_chains; + bool auto_helper; + bool flow_offloading; + bool flow_offloading_hw; bool disable_ipv6; @@ -291,18 +318,23 @@ struct fw3_zone const char *extra_dest; bool masq; + bool masq_allow_invalid; struct list_head masq_src; struct list_head masq_dest; - bool conntrack; bool mtu_fix; - bool log; + struct list_head cthelpers; + + int log; struct fw3_limit log_limit; bool custom_chains; + bool auto_helper; uint32_t flags[2]; + + struct list_head old_addrs; }; struct fw3_rule @@ -317,11 +349,13 @@ struct fw3_rule struct fw3_zone *_src; struct fw3_zone *_dest; + const char *device; + bool direction_out; + struct fw3_device src; struct fw3_device dest; - - struct fw3_ipset *_ipset; - struct fw3_device ipset; + struct fw3_setmatch ipset; + struct fw3_cthelpermatch helper; struct list_head proto; @@ -341,6 +375,7 @@ struct fw3_rule enum fw3_flag target; struct fw3_mark set_mark; struct fw3_mark set_xmark; + struct fw3_cthelpermatch set_helper; const char *extra; }; @@ -359,9 +394,8 @@ struct fw3_redirect struct fw3_device src; struct fw3_device dest; - - struct fw3_ipset *_ipset; - struct fw3_device ipset; + struct fw3_setmatch ipset; + struct fw3_cthelpermatch helper; struct list_head proto; @@ -375,6 +409,7 @@ struct fw3_redirect struct fw3_address ip_redir; struct fw3_port port_redir; + struct fw3_limit limit; struct fw3_time time; struct fw3_mark mark; @@ -382,10 +417,48 @@ struct fw3_redirect const char *extra; + bool local; bool reflection; enum fw3_reflection_source reflection_src; }; +struct fw3_snat +{ + struct list_head list; + + bool enabled; + const char *name; + + enum fw3_family family; + + struct fw3_zone *_src; + + struct fw3_device src; + struct fw3_setmatch ipset; + struct fw3_cthelpermatch helper; + const char *device; + + struct list_head proto; + + struct fw3_address ip_src; + struct fw3_port port_src; + + struct fw3_address ip_dest; + struct fw3_port port_dest; + + struct fw3_address ip_snat; + struct fw3_port port_snat; + + struct fw3_limit limit; + struct fw3_time time; + struct fw3_mark mark; + bool connlimit_ports; + + enum fw3_flag target; + + const char *extra; +}; + struct fw3_forward { struct list_head list; @@ -424,6 +497,9 @@ struct fw3_ipset const char *external; + struct list_head entries; + const char *loadfile; + uint32_t flags[2]; }; @@ -441,6 +517,25 @@ struct fw3_include bool reload; }; +struct fw3_cthelper +{ + struct list_head list; + + bool enabled; + const char *name; + const char *module; + const char *description; + enum fw3_family family; + struct fw3_protocol proto; + struct fw3_port port; +}; + +struct fw3_setentry +{ + struct list_head list; + const char *value; +}; + struct fw3_state { struct uci_context *uci; @@ -448,14 +543,23 @@ struct fw3_state struct list_head zones; struct list_head rules; struct list_head redirects; + struct list_head snats; struct list_head forwards; struct list_head ipsets; struct list_head includes; + struct list_head cthelpers; bool disable_ipsets; bool statefile; }; +struct fw3_chain_spec { + int family; + int table; + int flag; + const char *format; +}; + struct fw3_option { @@ -497,11 +601,17 @@ bool fw3_parse_time(void *ptr, const char *val, bool is_list); bool fw3_parse_weekdays(void *ptr, const char *val, bool is_list); bool fw3_parse_monthdays(void *ptr, const char *val, bool is_list); bool fw3_parse_mark(void *ptr, const char *val, bool is_list); +bool fw3_parse_setmatch(void *ptr, const char *val, bool is_list); +bool fw3_parse_direction(void *ptr, const char *val, bool is_list); +bool fw3_parse_cthelper(void *ptr, const char *val, bool is_list); +bool fw3_parse_setentry(void *ptr, const char *val, bool is_list); -void fw3_parse_options(void *s, const struct fw3_option *opts, +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, - bool allow_invert); + bool allow_invert, bool as_cidr); #endif