summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/netfilter
diff options
context:
space:
mode:
authorFernando Fernandez Mancera2018-07-25 01:32:45 +0200
committerPablo Neira Ayuso2018-07-30 14:07:11 +0200
commitf9324952088f1cd62ea4addf9ff532f1e6452a22 (patch)
tree62d64d27306e9e58b7ff84ae62dc2b6df90fbb43 /include/uapi/linux/netfilter
parentnetfilter: nf_osf: rename nf_osf.c to nfnetlink_osf.c (diff)
downloadkernel-qcow2-linux-f9324952088f1cd62ea4addf9ff532f1e6452a22.tar.gz
kernel-qcow2-linux-f9324952088f1cd62ea4addf9ff532f1e6452a22.tar.xz
kernel-qcow2-linux-f9324952088f1cd62ea4addf9ff532f1e6452a22.zip
netfilter: nfnetlink_osf: extract nfnetlink_subsystem code from xt_osf.c
Move nfnetlink osf subsystem from xt_osf.c to standalone module so we can reuse it from the new nft_ost extension. Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/uapi/linux/netfilter')
-rw-r--r--include/uapi/linux/netfilter/nf_osf.h11
-rw-r--r--include/uapi/linux/netfilter/xt_osf.h9
2 files changed, 12 insertions, 8 deletions
diff --git a/include/uapi/linux/netfilter/nf_osf.h b/include/uapi/linux/netfilter/nf_osf.h
index 3738116b2bbe..cc2487ff74f6 100644
--- a/include/uapi/linux/netfilter/nf_osf.h
+++ b/include/uapi/linux/netfilter/nf_osf.h
@@ -70,6 +70,8 @@ struct nf_osf_nlmsg {
struct tcphdr tcp;
};
+extern struct list_head nf_osf_fingers[2];
+
/* Defines for IANA option kinds */
enum iana_options {
OSFOPT_EOL = 0, /* End of options */
@@ -94,4 +96,13 @@ enum nf_osf_attr_type {
OSF_ATTR_MAX,
};
+/*
+ * Add/remove fingerprint from the kernel.
+ */
+enum nf_osf_msg_types {
+ OSF_MSG_ADD,
+ OSF_MSG_REMOVE,
+ OSF_MSG_MAX,
+};
+
#endif /* _NF_OSF_H */
diff --git a/include/uapi/linux/netfilter/xt_osf.h b/include/uapi/linux/netfilter/xt_osf.h
index b189007f4f28..a90e90c27cef 100644
--- a/include/uapi/linux/netfilter/xt_osf.h
+++ b/include/uapi/linux/netfilter/xt_osf.h
@@ -47,13 +47,6 @@
#define xt_osf_nlmsg nf_osf_nlmsg
#define xt_osf_attr_type nf_osf_attr_type
-/*
- * Add/remove fingerprint from the kernel.
- */
-enum xt_osf_msg_types {
- OSF_MSG_ADD,
- OSF_MSG_REMOVE,
- OSF_MSG_MAX,
-};
+#define xt_osf_msg_types nf_osf_msg_types
#endif /* _XT_OSF_H */