iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nfnetlink_osf: add missing enum in nfnetlink_osf uapi header

Browse Source 
xt_osf_window_size_options was originally part of
include/uapi/linux/netfilter/xt_osf.h, restore it.

Fixes: bfb15f2a95 ("netfilter: 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>
This commit is contained in:
Fernando Fernandez Mancera
2018-08-07 22:06:52 +02:00
committed by Pablo Neira Ayuso
parent f699edb12a
commit 212dfd909e
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/netfilter/nfnetlink_osf.h
View File

@ -4,18 +4,6 @@
#include <uapi/linux/netfilter/nfnetlink_osf.h> #include <uapi/linux/netfilter/nfnetlink_osf.h>
/* Initial window size option state machine: multiple of mss, mtu or
* plain numeric value. Can also be made as plain numeric value which
* is not a multiple of specified value.
*/
enum nf_osf_window_size_options {
OSF_WSS_PLAIN = 0,
OSF_WSS_MSS,
OSF_WSS_MTU,
OSF_WSS_MODULO,
OSF_WSS_MAX,
};
enum osf_fmatch_states { enum osf_fmatch_states {
/* Packet does not match the fingerprint */ /* Packet does not match the fingerprint */
FMATCH_WRONG = 0, FMATCH_WRONG = 0,

12
include/uapi/linux/netfilter/nfnetlink_osf.h
View File

@ -88,6 +88,18 @@ enum iana_options {
OSFOPT_EMPTY = 255, OSFOPT_EMPTY = 255,
}; };
/* Initial window size option state machine: multiple of mss, mtu or
* plain numeric value. Can also be made as plain numeric value which
* is not a multiple of specified value.
*/
enum nf_osf_window_size_options {
OSF_WSS_PLAIN = 0,
OSF_WSS_MSS,
OSF_WSS_MTU,
OSF_WSS_MODULO,
OSF_WSS_MAX,
};
enum nf_osf_attr_type { enum nf_osf_attr_type {
OSF_ATTR_UNSPEC, OSF_ATTR_UNSPEC,
OSF_ATTR_FINGER, OSF_ATTR_FINGER,

1
include/uapi/linux/netfilter/xt_osf.h
View File

@ -46,6 +46,7 @@
#define xt_osf_finger nf_osf_finger #define xt_osf_finger nf_osf_finger
#define xt_osf_nlmsg nf_osf_nlmsg #define xt_osf_nlmsg nf_osf_nlmsg
#define xt_osf_window_size_options nf_osf_window_size_options
#define xt_osf_attr_type nf_osf_attr_type #define xt_osf_attr_type nf_osf_attr_type
#define xt_osf_msg_types nf_osf_msg_types #define xt_osf_msg_types nf_osf_msg_types