You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2023/07/08 18:29:27 UTC
[nuttx] branch master updated: net: add netfilter compatible definitions for iptables
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 6efeec77e1 net: add netfilter compatible definitions for iptables
6efeec77e1 is described below
commit 6efeec77e1e0bc5720b6c01ff81856940e13b846
Author: zhanghongyu <zh...@xiaomi.com>
AuthorDate: Wed Jul 5 11:40:36 2023 +0800
net: add netfilter compatible definitions for iptables
In order to support the compilation of third-party library, we encounter
some situations where the macro is not defined, refer to the common
implementation of other systems and add relevant definitions.
Signed-off-by: zhanghongyu <zh...@xiaomi.com>
---
include/nuttx/net/netfilter/ip6_tables.h | 248 +++++++++++++++++++++++++++++++
include/nuttx/net/netfilter/ip_tables.h | 42 ++++++
include/nuttx/net/netfilter/netfilter.h | 22 +++
include/nuttx/net/netfilter/x_tables.h | 77 +++++++++-
4 files changed, 386 insertions(+), 3 deletions(-)
diff --git a/include/nuttx/net/netfilter/ip6_tables.h b/include/nuttx/net/netfilter/ip6_tables.h
new file mode 100644
index 0000000000..2bc9ece045
--- /dev/null
+++ b/include/nuttx/net/netfilter/ip6_tables.h
@@ -0,0 +1,248 @@
+/****************************************************************************
+ * include/nuttx/net/netfilter/ip6_tables.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_NUTTX_NET_NETFILTER_IP6_TABLES_H
+#define __INCLUDE_NUTTX_NET_NETFILTER_IP6_TABLES_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <net/if.h>
+#include <netinet/in.h>
+
+#include <nuttx/net/netfilter/netfilter.h>
+#include <nuttx/net/netfilter/x_tables.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define IP6T_BASE_CTL 64
+
+#define IP6T_SO_SET_REPLACE (IP6T_BASE_CTL)
+#define IP6T_SO_SET_ADD_COUNTERS (IP6T_BASE_CTL + 1)
+#define IP6T_SO_SET_MAX IP6T_SO_SET_ADD_COUNTERS
+
+#define IP6T_SO_GET_INFO (IP6T_BASE_CTL)
+#define IP6T_SO_GET_ENTRIES (IP6T_BASE_CTL + 1)
+#define IP6T_SO_GET_REVISION_MATCH (IP6T_BASE_CTL + 4)
+#define IP6T_SO_GET_REVISION_TARGET (IP6T_BASE_CTL + 5)
+#define IP6T_SO_GET_MAX IP6T_SO_GET_REVISION_TARGET
+
+/* Values for "inv" field in struct ip6t_ip6. */
+
+#define IP6T_INV_VIA_IN 0x01 /* Invert the sense of IN IFACE. */
+#define IP6T_INV_VIA_OUT 0x02 /* Invert the sense of OUT IFACE */
+#define IP6T_INV_TOS 0x04 /* Invert the sense of TOS. */
+#define IP6T_INV_SRCIP 0x08 /* Invert the sense of SRC IP. */
+#define IP6T_INV_DSTIP 0x10 /* Invert the sense of DST OP. */
+#define IP6T_INV_FRAG 0x20 /* Invert the sense of FRAG. */
+#define IP6T_INV_PROTO XT_INV_PROTO
+#define IP6T_INV_MASK 0x7F /* All possible flag bits mask. */
+
+#define IP6T_STANDARD_TARGET XT_STANDARD_TARGET
+#define IP6T_ERROR_TARGET XT_ERROR_TARGET
+
+#define ip6t_entry_target xt_entry_target
+#define ip6t_entry_match xt_entry_match
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct ip6t_ip6
+{
+ /* Source and destination IP6 addr */
+
+ struct in6_addr src;
+ struct in6_addr dst;
+
+ /* Mask for src and dest IP6 addr */
+
+ struct in6_addr smsk;
+ struct in6_addr dmsk;
+ char iniface[IFNAMSIZ];
+ char outiface[IFNAMSIZ];
+ unsigned char iniface_mask[IFNAMSIZ];
+ unsigned char outiface_mask[IFNAMSIZ];
+
+ /* Upper protocol number
+ * - The allowed value is 0 (any) or protocol number of last parsable
+ * header, which is 50 (ESP), 59 (No Next Header), 135 (MH), or
+ * the non IPv6 extension headers.
+ * - The protocol numbers of IPv6 extension headers except of ESP and
+ * MH do not match any packets.
+ * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
+ */
+
+ uint16_t proto;
+
+ /* TOS to match if flags & IP6T_F_TOS */
+
+ uint8_t tos;
+
+ /* Flags word */
+
+ uint8_t flags;
+
+ /* Inverse flags */
+
+ uint8_t invflags;
+};
+
+/* This structure defines each of the firewall rules. Consists of 3
+ * parts which are 1) general IP header stuff 2) match specific
+ * stuff 3) the target to perform if the rule matches
+ */
+
+struct ip6t_entry
+{
+ struct ip6t_ip6 ipv6;
+
+ /* Mark with fields that we care about. */
+
+ unsigned int nfcache;
+
+ /* Size of ipt_entry + matches */
+
+ uint16_t target_offset;
+
+ /* Size of ipt_entry + matches + target */
+
+ uint16_t next_offset;
+
+ /* Back pointer */
+
+ unsigned int comefrom;
+
+ /* Packet and byte counters. */
+
+ struct xt_counters counters;
+
+ /* The matches (if any), then the target. */
+
+ unsigned char elems[1];
+};
+
+/* The argument to IP6T_SO_GET_INFO */
+
+struct ip6t_getinfo
+{
+ /* Which table: caller fills this in. */
+
+ char name[XT_TABLE_MAXNAMELEN];
+
+ /* Kernel fills these in. */
+
+ /* Which hook entry points are valid: bitmask */
+
+ unsigned int valid_hooks;
+
+ /* Hook entry points: one per netfilter hook. */
+
+ unsigned int hook_entry[NF_INET_NUMHOOKS];
+
+ /* Underflow points. */
+
+ unsigned int underflow[NF_INET_NUMHOOKS];
+
+ /* Number of entries */
+
+ unsigned int num_entries;
+
+ /* Size of entries. */
+
+ unsigned int size;
+};
+
+/* The argument to IP6T_SO_GET_ENTRIES. */
+
+struct ip6t_get_entries
+{
+ /* Which table: user fills this in. */
+
+ char name[XT_TABLE_MAXNAMELEN];
+
+ /* User fills this in: total entry size. */
+
+ unsigned int size;
+
+ /* The entries. */
+
+ struct ip6t_entry entrytable[1];
+};
+
+/* The argument to IP6T_SO_SET_REPLACE. */
+
+struct ip6t_replace
+{
+ /* Which table. */
+
+ char name[XT_TABLE_MAXNAMELEN];
+
+ /* Which hook entry points are valid: bitmask. You can't change this. */
+
+ unsigned int valid_hooks;
+
+ /* Number of entries */
+
+ unsigned int num_entries;
+
+ /* Total size of new entries */
+
+ unsigned int size;
+
+ /* Hook entry points. */
+
+ unsigned int hook_entry[NF_INET_NUMHOOKS];
+
+ /* Underflow points. */
+
+ unsigned int underflow[NF_INET_NUMHOOKS];
+
+ /* Information about old entries: */
+
+ /* Number of counters (must be equal to current number of entries). */
+
+ unsigned int num_counters;
+
+ /* The old entries' counters. */
+
+ FAR struct xt_counters *counters;
+
+ /* The entries (hang off end: not really an array). */
+
+ struct ip6t_entry entries[1];
+};
+
+/****************************************************************************
+ * Inline functions
+ ****************************************************************************/
+
+/* Helper functions */
+
+static inline FAR struct xt_entry_target *
+ip6t_get_target(FAR struct ip6t_entry *e)
+{
+ return (FAR void *)e + e->target_offset;
+}
+
+#endif /* __INCLUDE_NUTTX_NET_NETFILTER_IP6_TABLES_H */
diff --git a/include/nuttx/net/netfilter/ip_tables.h b/include/nuttx/net/netfilter/ip_tables.h
index f363b691a8..e3750a6310 100644
--- a/include/nuttx/net/netfilter/ip_tables.h
+++ b/include/nuttx/net/netfilter/ip_tables.h
@@ -47,6 +47,36 @@
#define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3)
#define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET
+/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
+
+#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper protocols */
+#define IP6T_F_TOS 0x02 /* Match the TOS. */
+#define IP6T_F_GOTO 0x04 /* Set if jump is a goto */
+#define IP6T_F_MASK 0x07 /* All possible flag bits mask. */
+
+/* Values for "inv" field in struct ipt_ip. */
+
+#define IPT_INV_VIA_IN 0x01 /* Invert the sense of IN IFACE. */
+#define IPT_INV_VIA_OUT 0x02 /* Invert the sense of OUT IFACE */
+#define IPT_INV_TOS 0x04 /* Invert the sense of TOS. */
+#define IPT_INV_SRCIP 0x08 /* Invert the sense of SRC IP. */
+#define IPT_INV_DSTIP 0x10 /* Invert the sense of DST OP. */
+#define IPT_INV_FRAG 0x20 /* Invert the sense of FRAG. */
+#define IPT_INV_PROTO XT_INV_PROTO
+#define IPT_INV_MASK 0x7F /* All possible flag bits mask. */
+
+/* Standard return verdict, or do jump. */
+
+#define IPT_STANDARD_TARGET XT_STANDARD_TARGET
+
+/* Error verdict. */
+
+#define IPT_ERROR_TARGET XT_ERROR_TARGET
+
+#define ipt_standard_target xt_standard_target
+#define ipt_entry_target xt_entry_target
+#define ipt_entry_match xt_entry_match
+
/* Foreach macro for entries. */
#define ipt_entry_for_every(entry, head, size) \
@@ -246,4 +276,16 @@ struct ipt_get_entries
struct ipt_entry entrytable[0];
};
+/****************************************************************************
+ * Inline functions
+ ****************************************************************************/
+
+/* Helper functions */
+
+static inline FAR struct xt_entry_target *
+ipt_get_target(FAR struct ipt_entry *e)
+{
+ return (FAR void *)e + e->target_offset;
+}
+
#endif /* __INCLUDE_NUTTX_NET_NETFILTER_IP_TABLES_H */
diff --git a/include/nuttx/net/netfilter/netfilter.h b/include/nuttx/net/netfilter/netfilter.h
index a16711328c..322255c8c9 100644
--- a/include/nuttx/net/netfilter/netfilter.h
+++ b/include/nuttx/net/netfilter/netfilter.h
@@ -65,4 +65,26 @@ enum nf_inet_hooks
NF_INET_INGRESS = NF_INET_NUMHOOKS,
};
+enum
+{
+ NFPROTO_UNSPEC = 0,
+ NFPROTO_INET = 1,
+ NFPROTO_IPV4 = 2,
+ NFPROTO_ARP = 3,
+ NFPROTO_NETDEV = 5,
+ NFPROTO_BRIDGE = 7,
+ NFPROTO_IPV6 = 10,
+ NFPROTO_DECNET = 12,
+ NFPROTO_NUMPROTO,
+};
+
+union nf_inet_addr
+{
+ uint32_t all[4];
+ uint32_t ip;
+ uint32_t ip6[4];
+ struct in_addr in;
+ struct in6_addr in6;
+};
+
#endif /* __INCLUDE_NUTTX_NET_NETFILTER_NETFILTER_H */
diff --git a/include/nuttx/net/netfilter/x_tables.h b/include/nuttx/net/netfilter/x_tables.h
index d180c18ea8..77ba916f98 100644
--- a/include/nuttx/net/netfilter/x_tables.h
+++ b/include/nuttx/net/netfilter/x_tables.h
@@ -27,6 +27,8 @@
#include <sys/types.h>
+#include <nuttx/net/netfilter/netfilter.h>
+
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -35,14 +37,38 @@
#define XT_EXTENSION_MAXNAMELEN 29
#define XT_TABLE_MAXNAMELEN 32
-#define XT_STANDARD_TARGET "" /* Standard return verdict, or do jump. */
-#define XT_ERROR_TARGET "ERROR"
-#define XT_MASQUERADE_TARGET "MASQUERADE"
+#define XT_INV_PROTO 0x40 /* Invert the sense of PROTO. */
+
+#define XT_STANDARD_TARGET "" /* Standard return verdict, or do jump. */
+#define XT_ERROR_TARGET "ERROR"
+#define XT_MASQUERADE_TARGET "MASQUERADE"
+
+/* For standard target */
+
+#define XT_RETURN (-NF_REPEAT - 1)
+
+#define XT_ALIGN(s) \
+ (((s) + ((typeof(s))(__alignof__(struct _xt_align)) - 1)) & \
+ ~((typeof(s))(__alignof__(struct _xt_align)) - 1))
/****************************************************************************
* Public Types
****************************************************************************/
+/* this is a dummy structure to find out the alignment requirement for a
+ * struct containing all the fundamental data types that are used in
+ * ipt_entry, ip6t_entry and arpt_entry. This sucks, and it is a hack.
+ * It will be my personal pleasure to remove it -HW
+ */
+
+struct _xt_align
+{
+ uint8_t u8;
+ uint16_t u16;
+ uint32_t u32;
+ uint64_t u64;
+};
+
struct xt_entry_target
{
union
@@ -85,4 +111,49 @@ struct xt_counters
uint64_t bcnt;
};
+/* The argument to IPT_SO_ADD_COUNTERS. */
+
+struct xt_counters_info
+{
+ /* Which table. */
+
+ char name[XT_TABLE_MAXNAMELEN];
+ unsigned int num_counters;
+
+ /* The counters (actually `number' of these). */
+
+ struct xt_counters counters[1];
+};
+
+struct xt_match; /* reserved */
+
+struct xt_entry_match
+{
+ union
+ {
+ struct
+ {
+ uint16_t match_size;
+
+ /* Used by userspace */
+
+ char name[XT_EXTENSION_MAXNAMELEN];
+ uint8_t revision;
+ } user;
+ struct
+ {
+ uint16_t match_size;
+
+ /* Used inside the kernel */
+
+ FAR struct xt_match *match;
+ } kernel;
+
+ /* Total length */
+
+ uint16_t match_size;
+ } u;
+ unsigned char data[1];
+};
+
#endif /* __INCLUDE_NUTTX_NET_NETFILTER_X_TABLES_H */