* [PATCH 1/2] netfilter: export xt_rpfilter.h to userland
@ 2013-08-13 13:05 Nicolas Dichtel
2013-08-13 13:05 ` [PATCH 2/2] netfilter: export xt_HMARK.h " Nicolas Dichtel
2013-08-14 8:50 ` [PATCH 1/2] netfilter: export xt_rpfilter.h " Pablo Neira Ayuso
0 siblings, 2 replies; 4+ messages in thread
From: Nicolas Dichtel @ 2013-08-13 13:05 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo, netdev, Nicolas Dichtel
This file contains the API for the match "rpfilter", hence it should be exported
to userland.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
include/linux/netfilter/xt_rpfilter.h | 23 -----------------------
include/uapi/linux/netfilter/Kbuild | 1 +
include/uapi/linux/netfilter/xt_rpfilter.h | 23 +++++++++++++++++++++++
3 files changed, 24 insertions(+), 23 deletions(-)
delete mode 100644 include/linux/netfilter/xt_rpfilter.h
create mode 100644 include/uapi/linux/netfilter/xt_rpfilter.h
diff --git a/include/linux/netfilter/xt_rpfilter.h b/include/linux/netfilter/xt_rpfilter.h
deleted file mode 100644
index 8358d4f71952..000000000000
--- a/include/linux/netfilter/xt_rpfilter.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _XT_RPATH_H
-#define _XT_RPATH_H
-
-#include <linux/types.h>
-
-enum {
- XT_RPFILTER_LOOSE = 1 << 0,
- XT_RPFILTER_VALID_MARK = 1 << 1,
- XT_RPFILTER_ACCEPT_LOCAL = 1 << 2,
- XT_RPFILTER_INVERT = 1 << 3,
-#ifdef __KERNEL__
- XT_RPFILTER_OPTION_MASK = XT_RPFILTER_LOOSE |
- XT_RPFILTER_VALID_MARK |
- XT_RPFILTER_ACCEPT_LOCAL |
- XT_RPFILTER_INVERT,
-#endif
-};
-
-struct xt_rpfilter_info {
- __u8 flags;
-};
-
-#endif
diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild
index 41115776d76f..dc00927ffd62 100644
--- a/include/uapi/linux/netfilter/Kbuild
+++ b/include/uapi/linux/netfilter/Kbuild
@@ -68,6 +68,7 @@ header-y += xt_quota.h
header-y += xt_rateest.h
header-y += xt_realm.h
header-y += xt_recent.h
+header-y += xt_rpfilter.h
header-y += xt_sctp.h
header-y += xt_set.h
header-y += xt_socket.h
diff --git a/include/uapi/linux/netfilter/xt_rpfilter.h b/include/uapi/linux/netfilter/xt_rpfilter.h
new file mode 100644
index 000000000000..8358d4f71952
--- /dev/null
+++ b/include/uapi/linux/netfilter/xt_rpfilter.h
@@ -0,0 +1,23 @@
+#ifndef _XT_RPATH_H
+#define _XT_RPATH_H
+
+#include <linux/types.h>
+
+enum {
+ XT_RPFILTER_LOOSE = 1 << 0,
+ XT_RPFILTER_VALID_MARK = 1 << 1,
+ XT_RPFILTER_ACCEPT_LOCAL = 1 << 2,
+ XT_RPFILTER_INVERT = 1 << 3,
+#ifdef __KERNEL__
+ XT_RPFILTER_OPTION_MASK = XT_RPFILTER_LOOSE |
+ XT_RPFILTER_VALID_MARK |
+ XT_RPFILTER_ACCEPT_LOCAL |
+ XT_RPFILTER_INVERT,
+#endif
+};
+
+struct xt_rpfilter_info {
+ __u8 flags;
+};
+
+#endif
--
1.8.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] netfilter: export xt_HMARK.h to userland
2013-08-13 13:05 [PATCH 1/2] netfilter: export xt_rpfilter.h to userland Nicolas Dichtel
@ 2013-08-13 13:05 ` Nicolas Dichtel
2013-08-14 8:50 ` Pablo Neira Ayuso
2013-08-14 8:50 ` [PATCH 1/2] netfilter: export xt_rpfilter.h " Pablo Neira Ayuso
1 sibling, 1 reply; 4+ messages in thread
From: Nicolas Dichtel @ 2013-08-13 13:05 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo, netdev, Nicolas Dichtel
This file contains the API for the target "HMARK", hence it should be exported
to userland.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
include/linux/netfilter/xt_HMARK.h | 50 ---------------------------------
include/uapi/linux/netfilter/Kbuild | 1 +
include/uapi/linux/netfilter/xt_HMARK.h | 50 +++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 50 deletions(-)
delete mode 100644 include/linux/netfilter/xt_HMARK.h
create mode 100644 include/uapi/linux/netfilter/xt_HMARK.h
diff --git a/include/linux/netfilter/xt_HMARK.h b/include/linux/netfilter/xt_HMARK.h
deleted file mode 100644
index 826fc5807577..000000000000
--- a/include/linux/netfilter/xt_HMARK.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef XT_HMARK_H_
-#define XT_HMARK_H_
-
-#include <linux/types.h>
-
-enum {
- XT_HMARK_SADDR_MASK,
- XT_HMARK_DADDR_MASK,
- XT_HMARK_SPI,
- XT_HMARK_SPI_MASK,
- XT_HMARK_SPORT,
- XT_HMARK_DPORT,
- XT_HMARK_SPORT_MASK,
- XT_HMARK_DPORT_MASK,
- XT_HMARK_PROTO_MASK,
- XT_HMARK_RND,
- XT_HMARK_MODULUS,
- XT_HMARK_OFFSET,
- XT_HMARK_CT,
- XT_HMARK_METHOD_L3,
- XT_HMARK_METHOD_L3_4,
-};
-#define XT_HMARK_FLAG(flag) (1 << flag)
-
-union hmark_ports {
- struct {
- __u16 src;
- __u16 dst;
- } p16;
- struct {
- __be16 src;
- __be16 dst;
- } b16;
- __u32 v32;
- __be32 b32;
-};
-
-struct xt_hmark_info {
- union nf_inet_addr src_mask;
- union nf_inet_addr dst_mask;
- union hmark_ports port_mask;
- union hmark_ports port_set;
- __u32 flags;
- __u16 proto_mask;
- __u32 hashrnd;
- __u32 hmodulus;
- __u32 hoffset; /* Mark offset to start from */
-};
-
-#endif /* XT_HMARK_H_ */
diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild
index dc00927ffd62..174915420d3f 100644
--- a/include/uapi/linux/netfilter/Kbuild
+++ b/include/uapi/linux/netfilter/Kbuild
@@ -22,6 +22,7 @@ header-y += xt_CONNMARK.h
header-y += xt_CONNSECMARK.h
header-y += xt_CT.h
header-y += xt_DSCP.h
+header-y += xt_HMARK.h
header-y += xt_IDLETIMER.h
header-y += xt_LED.h
header-y += xt_LOG.h
diff --git a/include/uapi/linux/netfilter/xt_HMARK.h b/include/uapi/linux/netfilter/xt_HMARK.h
new file mode 100644
index 000000000000..826fc5807577
--- /dev/null
+++ b/include/uapi/linux/netfilter/xt_HMARK.h
@@ -0,0 +1,50 @@
+#ifndef XT_HMARK_H_
+#define XT_HMARK_H_
+
+#include <linux/types.h>
+
+enum {
+ XT_HMARK_SADDR_MASK,
+ XT_HMARK_DADDR_MASK,
+ XT_HMARK_SPI,
+ XT_HMARK_SPI_MASK,
+ XT_HMARK_SPORT,
+ XT_HMARK_DPORT,
+ XT_HMARK_SPORT_MASK,
+ XT_HMARK_DPORT_MASK,
+ XT_HMARK_PROTO_MASK,
+ XT_HMARK_RND,
+ XT_HMARK_MODULUS,
+ XT_HMARK_OFFSET,
+ XT_HMARK_CT,
+ XT_HMARK_METHOD_L3,
+ XT_HMARK_METHOD_L3_4,
+};
+#define XT_HMARK_FLAG(flag) (1 << flag)
+
+union hmark_ports {
+ struct {
+ __u16 src;
+ __u16 dst;
+ } p16;
+ struct {
+ __be16 src;
+ __be16 dst;
+ } b16;
+ __u32 v32;
+ __be32 b32;
+};
+
+struct xt_hmark_info {
+ union nf_inet_addr src_mask;
+ union nf_inet_addr dst_mask;
+ union hmark_ports port_mask;
+ union hmark_ports port_set;
+ __u32 flags;
+ __u16 proto_mask;
+ __u32 hashrnd;
+ __u32 hmodulus;
+ __u32 hoffset; /* Mark offset to start from */
+};
+
+#endif /* XT_HMARK_H_ */
--
1.8.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] netfilter: export xt_rpfilter.h to userland
2013-08-13 13:05 [PATCH 1/2] netfilter: export xt_rpfilter.h to userland Nicolas Dichtel
2013-08-13 13:05 ` [PATCH 2/2] netfilter: export xt_HMARK.h " Nicolas Dichtel
@ 2013-08-14 8:50 ` Pablo Neira Ayuso
1 sibling, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2013-08-14 8:50 UTC (permalink / raw)
To: Nicolas Dichtel; +Cc: netfilter-devel, netdev
On Tue, Aug 13, 2013 at 03:05:38PM +0200, Nicolas Dichtel wrote:
> This file contains the API for the match "rpfilter", hence it should be exported
> to userland.
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] netfilter: export xt_HMARK.h to userland
2013-08-13 13:05 ` [PATCH 2/2] netfilter: export xt_HMARK.h " Nicolas Dichtel
@ 2013-08-14 8:50 ` Pablo Neira Ayuso
0 siblings, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2013-08-14 8:50 UTC (permalink / raw)
To: Nicolas Dichtel; +Cc: netfilter-devel, netdev
On Tue, Aug 13, 2013 at 03:05:39PM +0200, Nicolas Dichtel wrote:
> This file contains the API for the target "HMARK", hence it should be exported
> to userland.
Also applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-14 8:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-13 13:05 [PATCH 1/2] netfilter: export xt_rpfilter.h to userland Nicolas Dichtel
2013-08-13 13:05 ` [PATCH 2/2] netfilter: export xt_HMARK.h " Nicolas Dichtel
2013-08-14 8:50 ` Pablo Neira Ayuso
2013-08-14 8:50 ` [PATCH 1/2] netfilter: export xt_rpfilter.h " Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).