iptables: fix regression with unintended free in need_protomatch

[project/firewall3.git] / options.h

diff --git a/options.h b/options.h
index 307c5afb198c80f7d5ae1f5ebde3580f620e9a31..e20c89b064b5f2c5092dde73bf4fcfcb9a42fe41 100644 (file)
--- a/options.h
+++ b/options.h
@@ -71,22 +71,33 @@ 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_MASQUERADE    = 13,
-       FW3_FLAG_SRC_ACCEPT    = 14,
-       FW3_FLAG_SRC_REJECT    = 15,
-       FW3_FLAG_SRC_DROP      = 16,
-       FW3_FLAG_CUSTOM_CHAINS = 17,
-       FW3_FLAG_SYN_FLOOD     = 18,
-       FW3_FLAG_MTU_FIX       = 19,
-       FW3_FLAG_DROP_INVALID  = 20,
-       FW3_FLAG_HOTPLUG       = 21,
+       FW3_FLAG_HELPER        = 10,
+       FW3_FLAG_MARK          = 11,
+       FW3_FLAG_DSCP          = 12,
+       FW3_FLAG_DNAT          = 13,
+       FW3_FLAG_SNAT          = 14,
+       FW3_FLAG_MASQUERADE    = 15,
+       FW3_FLAG_SRC_ACCEPT    = 16,
+       FW3_FLAG_SRC_REJECT    = 17,
+       FW3_FLAG_SRC_DROP      = 18,
+       FW3_FLAG_CUSTOM_CHAINS = 19,
+       FW3_FLAG_SYN_FLOOD     = 20,
+       FW3_FLAG_MTU_FIX       = 21,
+       FW3_FLAG_DROP_INVALID  = 22,
+       FW3_FLAG_HOTPLUG       = 23,
 
        __FW3_FLAG_MAX
 };
 
+enum fw3_reject_code
+{
+       FW3_REJECT_CODE_TCP_RESET      = 0,
+       FW3_REJECT_CODE_PORT_UNREACH   = 1,
+       FW3_REJECT_CODE_ADM_PROHIBITED = 2,
+
+       __FW3_REJECT_CODE_MAX
+};
+
 extern const char *fw3_flag_names[__FW3_FLAG_MAX];
 
 
@@ -258,6 +269,23 @@ struct fw3_mark
        uint32_t mask;
 };
 
+struct fw3_dscp
+{
+       bool set;
+       bool invert;
+       uint8_t dscp;
+};
+
+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;
@@ -265,6 +293,8 @@ struct fw3_defaults
        enum fw3_flag policy_forward;
 
        bool drop_invalid;
+       enum fw3_reject_code tcp_reject_code;
+       enum fw3_reject_code any_reject_code;
 
        bool syn_flood;
        struct fw3_limit syn_flood_rate;
@@ -277,6 +307,9 @@ struct fw3_defaults
        bool accept_source_route;
 
        bool custom_chains;
+       bool auto_helper;
+       bool flow_offloading;
+       bool flow_offloading_hw;
 
        bool disable_ipv6;
 
@@ -304,16 +337,19 @@ 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];
 
@@ -338,6 +374,7 @@ struct fw3_rule
        struct fw3_device src;
        struct fw3_device dest;
        struct fw3_setmatch ipset;
+       struct fw3_cthelpermatch helper;
 
        struct list_head proto;
 
@@ -353,10 +390,13 @@ struct fw3_rule
        struct fw3_limit limit;
        struct fw3_time time;
        struct fw3_mark mark;
+       struct fw3_dscp dscp;
 
        enum fw3_flag target;
        struct fw3_mark set_mark;
        struct fw3_mark set_xmark;
+       struct fw3_dscp set_dscp;
+       struct fw3_cthelpermatch set_helper;
 
        const char *extra;
 };
@@ -376,6 +416,7 @@ struct fw3_redirect
        struct fw3_device src;
        struct fw3_device dest;
        struct fw3_setmatch ipset;
+       struct fw3_cthelpermatch helper;
 
        struct list_head proto;
 
@@ -400,6 +441,7 @@ struct fw3_redirect
        bool local;
        bool reflection;
        enum fw3_reflection_source reflection_src;
+       struct list_head reflection_zones;
 };
 
 struct fw3_snat
@@ -415,6 +457,7 @@ struct fw3_snat
 
        struct fw3_device src;
        struct fw3_setmatch ipset;
+       struct fw3_cthelpermatch helper;
        const char *device;
 
        struct list_head proto;
@@ -459,6 +502,10 @@ struct fw3_ipset
        struct list_head list;
 
        bool enabled;
+       bool reload_set;
+       bool counters;
+       bool comment;
+
        const char *name;
        enum fw3_family family;
 
@@ -476,6 +523,9 @@ struct fw3_ipset
 
        const char *external;
 
+       struct list_head entries;
+       const char *loadfile;
+
        uint32_t flags[2];
 };
 
@@ -493,6 +543,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 list_head proto;
+       struct fw3_port port;
+};
+
+struct fw3_setentry
+{
+       struct list_head list;
+       const char *value;
+};
+
 struct fw3_state
 {
        struct uci_context *uci;
@@ -504,6 +573,7 @@ struct fw3_state
        struct list_head forwards;
        struct list_head ipsets;
        struct list_head includes;
+       struct list_head cthelpers;
 
        bool disable_ipsets;
        bool statefile;
@@ -536,6 +606,7 @@ bool fw3_parse_bool(void *ptr, const char *val, bool is_list);
 bool fw3_parse_int(void *ptr, const char *val, bool is_list);
 bool fw3_parse_string(void *ptr, const char *val, bool is_list);
 bool fw3_parse_target(void *ptr, const char *val, bool is_list);
+bool fw3_parse_reject_code(void *ptr, const char *val, bool is_list);
 bool fw3_parse_limit(void *ptr, const char *val, bool is_list);
 bool fw3_parse_device(void *ptr, const char *val, bool is_list);
 bool fw3_parse_address(void *ptr, const char *val, bool is_list);
@@ -557,8 +628,11 @@ 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_dscp(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);
 
 bool fw3_parse_options(void *s, const struct fw3_option *opts,
                        struct uci_section *section);