path: root/include/
diff options
authorJamal Hadi Salim <>2009-02-13 08:36:44 -0500
committerJan Engelhardt <>2009-02-13 14:57:01 +0100
commit70581922f873a88306dd5b1cb83c5081ee239eb8 (patch)
tree9f0168386cbc2b77ac49abde8509c999e940370a /include/
parentae19604fe1c4ab02dfbcd450e73826111f0f2b27 (diff)
libxtables: consolidate merge_options into xtables_merge_options
Introduce xtables_merge_options() for re-use reasons. Apps can use it instead of each defining their own merge_options(). Made iptables and ip6tables use the new shared interface. Signed-off-by: Jamal Hadi Salim <>
Diffstat (limited to 'include/')
1 files changed, 4 insertions, 0 deletions
diff --git a/include/ b/include/
index a884343b..aaadbbd6 100644
--- a/include/
+++ b/include/
@@ -207,6 +207,8 @@ extern int xtables_load_ko(const char *, bool);
extern int xtables_set_params(struct xtables_globals *xtp);
extern void xtables_set_revision(char *name, u_int8_t revision);
extern void xtables_free_opts(int reset_offset);
+extern struct option *xtables_merge_options(struct option *oldopts,
+ const struct option *newopts, unsigned int *option_offset);
extern struct xtables_match *xtables_find_match(const char *name,
enum xtables_tryload, struct xtables_rule_match **match);
@@ -233,6 +235,8 @@ int xtables_check_inverse(const char option[], int *invert,
int *my_optind, int argc);
extern struct xtables_globals *xt_params;
#define exit_error xt_params->exit_err
+#define OPTION_OFFSET 256
extern void xtables_param_act(unsigned int, const char *, ...);
extern const char *xtables_ipaddr_to_numeric(const struct in_addr *);