summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2009-04-11 16:42:20 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2009-04-11 16:42:20 +0200
commitd406e609f664a8151f9e372bbb8fd2ec2c724d35 (patch)
tree085f425cb8284cbba3fe3ea201491818051d1bb4 /include
parentf1ea9b9233406c479c91e36c250c21dd3ef76496 (diff)
downloadconntrack-tools-d406e609f664a8151f9e372bbb8fd2ec2c724d35.tar.gz
conntrack-tools-d406e609f664a8151f9e372bbb8fd2ec2c724d35.zip
conntrack: fix coupled-options sanity checkings
This patch extends the generic_opt_check() function to add extra information on the possible option combinations. Under some specific situations, like the creation and getting of a conntrack, you may specify the original or the reply tuple but at least one MUST be present. This handling has been always tricky, it still remains but we're more user friendly at least. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r--include/conntrack.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/conntrack.h b/include/conntrack.h
index e1f8d0a..17c0121 100644
--- a/include/conntrack.h
+++ b/include/conntrack.h
@@ -188,10 +188,10 @@ enum exittype {
VERSION_PROBLEM
};
-void generic_opt_check(int options,
- int nops,
- char *optset,
- const char *optflg[]);
+int generic_opt_check(int options, int nops,
+ char *optset, const char *optflg[],
+ unsigned int *coupled_flags, int coupled_flags_size,
+ int *partial);
void exit_error(enum exittype status, const char *msg, ...);
extern void register_proto(struct ctproto_handler *h);