netfilter: nf_osf: add missing definitions to header file

Add missing definitions from nf_osf.h in order to extract Passive OS
fingerprint infrastructure from xt_osf.

Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/uapi/linux/netfilter/nf_osf.h b/include/uapi/linux/netfilter/nf_osf.h
index 8f2f2f4031836420e88f600b15308fea28f054b6..3738116b2bbecba98a10d348c4f926000c25ac91 100644 (file)
--- a/include/uapi/linux/netfilter/nf_osf.h
+++ b/include/uapi/linux/netfilter/nf_osf.h
@@ -16,9 +16,14 @@
 
 #define NF_OSF_TTL_TRUE                        0       /* True ip and fingerprint TTL comparison */
 
+/* Check if ip TTL is less than fingerprint one */
+#define NF_OSF_TTL_LESS                        1
+
 /* Do not compare ip and fingerprint TTL at all */
 #define NF_OSF_TTL_NOCHECK             2
 
+#define NF_OSF_FLAGMASK                (NF_OSF_GENRE | NF_OSF_TTL | \
+                                NF_OSF_LOG | NF_OSF_INVERT)
 /* Wildcard MSS (kind of).
  * It is used to implement a state machine for the different wildcard values
  * of the MSS and window sizes.
@@ -83,4 +88,10 @@ enum iana_options {
        OSFOPT_EMPTY = 255,
 };
 
+enum nf_osf_attr_type {
+       OSF_ATTR_UNSPEC,
+       OSF_ATTR_FINGER,
+       OSF_ATTR_MAX,
+};
+
 #endif /* _NF_OSF_H */

diff --git a/include/uapi/linux/netfilter/xt_osf.h b/include/uapi/linux/netfilter/xt_osf.h
index 72956eceeb09689d3c76edec321dbc81d86b803c..b189007f4f28464c6ddd77db746eaaf0114067f4 100644 (file)
--- a/include/uapi/linux/netfilter/xt_osf.h
+++ b/include/uapi/linux/netfilter/xt_osf.h
@@ -37,8 +37,7 @@
 
 #define XT_OSF_TTL_TRUE                NF_OSF_TTL_TRUE
 #define XT_OSF_TTL_NOCHECK     NF_OSF_TTL_NOCHECK
-
-#define XT_OSF_TTL_LESS        1       /* Check if ip TTL is less than fingerprint one */
+#define XT_OSF_TTL_LESS                NF_OSF_TTL_LESS
 
 #define xt_osf_wc              nf_osf_wc
 #define xt_osf_opt             nf_osf_opt
@@ -47,6 +46,7 @@
 #define xt_osf_finger          nf_osf_finger
 #define xt_osf_nlmsg           nf_osf_nlmsg
 
+#define xt_osf_attr_type       nf_osf_attr_type
 /*
  * Add/remove fingerprint from the kernel.
  */
@@ -56,10 +56,4 @@ enum xt_osf_msg_types {
        OSF_MSG_MAX,
 };
 
-enum xt_osf_attr_type {
-       OSF_ATTR_UNSPEC,
-       OSF_ATTR_FINGER,
-       OSF_ATTR_MAX,
-};
-
 #endif                         /* _XT_OSF_H */