@@ -10,6 +10,7 @@
enum {
O_TRANSPARENT = 0,
O_NOWILDCARD = 1,
+ O_MATCHSOCKMARK = 2,
};
static const struct xt_option_entry socket_mt_opts[] = {
@@ -23,6 +24,14 @@ static const struct xt_option_entry socket_mt_opts_v2[] = {
XTOPT_TABLEEND,
};
+static const struct xt_option_entry socket_mt_opts_v3[] = {
+ {.name = "transparent", .id = O_TRANSPARENT, .type = XTTYPE_NONE},
+ {.name = "nowildcard", .id = O_NOWILDCARD, .type = XTTYPE_NONE},
+ {.name = "mark", .id = O_MATCHSOCKMARK, .type = XTTYPE_MARKMASK32,
+ .flags = XTOPT_INVERT},
+ XTOPT_TABLEEND,
+};
+
static void socket_mt_help(void)
{
printf(
@@ -38,6 +47,15 @@ static void socket_mt_help_v2(void)
" --transparent Ignore non-transparent sockets\n\n");
}
+static void socket_mt_help_v3(void)
+{
+ printf(
+ "socket match options:\n"
+ " --nowildcard Do not ignore LISTEN sockets bound on INADDR_ANY\n"
+ " --transparent Ignore non-transparent sockets\n"
+ "[!] --mark value[/mask] Match sockets on mark\n\n");
+}
+
static void socket_mt_parse(struct xt_option_call *cb)
{
struct xt_socket_mtinfo1 *info = cb->data;
@@ -65,6 +83,28 @@ static void socket_mt_parse_v2(struct xt_option_call *cb)
}
}
+static void socket_mt_parse_v3(struct xt_option_call *cb)
+{
+ struct xt_socket_mtinfo3 *info = cb->data;
+
+ xtables_option_parse(cb);
+ switch (cb->entry->id) {
+ case O_TRANSPARENT:
+ info->flags |= XT_SOCKET_TRANSPARENT;
+ break;
+ case O_NOWILDCARD:
+ info->flags |= XT_SOCKET_NOWILDCARD;
+ break;
+ case O_MATCHSOCKMARK:
+ info->flags |= XT_SOCKET_MATCHSOCKMARK;
+ if (cb->invert)
+ info->invert_mark = 1;
+ info->mark = cb->val.mark;
+ info->mask = cb->val.mask;
+ break;
+ }
+}
+
static void
socket_mt_save(const void *ip, const struct xt_entry_match *match)
{
@@ -101,6 +141,32 @@ socket_mt_print_v2(const void *ip, const struct xt_entry_match *match,
socket_mt_save_v2(ip, match);
}
+static void
+socket_mt_save_v3(const void *ip, const struct xt_entry_match *match)
+{
+ const struct xt_socket_mtinfo3 *info = (const void *)match->data;
+
+ if (info->flags & XT_SOCKET_TRANSPARENT)
+ printf(" --transparent");
+ if (info->flags & XT_SOCKET_NOWILDCARD)
+ printf(" --nowildcard");
+ if (info->flags & XT_SOCKET_MATCHSOCKMARK) {
+ if (info->invert_mark)
+ printf(" !");
+ printf(" --mark 0x%x", info->mark);
+ if (info->mask != 0xffffffffU)
+ printf("/0x%x", info->mask);
+ }
+}
+
+static void
+socket_mt_print_v3(const void *ip, const struct xt_entry_match *match,
+ int numeric)
+{
+ printf(" socket");
+ socket_mt_save_v3(ip, match);
+}
+
static struct xtables_match socket_mt_reg[] = {
{
.name = "socket",
@@ -136,6 +202,19 @@ static struct xtables_match socket_mt_reg[] = {
.x6_parse = socket_mt_parse_v2,
.x6_options = socket_mt_opts_v2,
},
+ {
+ .name = "socket",
+ .revision = 3,
+ .family = NFPROTO_UNSPEC,
+ .version = XTABLES_VERSION,
+ .size = XT_ALIGN(sizeof(struct xt_socket_mtinfo3)),
+ .userspacesize = XT_ALIGN(sizeof(struct xt_socket_mtinfo3)),
+ .help = socket_mt_help_v3,
+ .print = socket_mt_print_v3,
+ .save = socket_mt_save_v3,
+ .x6_parse = socket_mt_parse_v3,
+ .x6_options = socket_mt_opts_v3,
+ },
};
void _init(void)
@@ -6,6 +6,7 @@
enum {
XT_SOCKET_TRANSPARENT = 1 << 0,
XT_SOCKET_NOWILDCARD = 1 << 1,
+ XT_SOCKET_MATCHSOCKMARK = 1 << 2,
};
struct xt_socket_mtinfo1 {
@@ -18,4 +19,13 @@ struct xt_socket_mtinfo2 {
};
#define XT_SOCKET_FLAGS_V2 (XT_SOCKET_TRANSPARENT | XT_SOCKET_NOWILDCARD)
+struct xt_socket_mtinfo3 {
+ __u8 flags;
+ __u32 mark, mask;
+ __u8 invert_mark;
+};
+#define XT_SOCKET_FLAGS_V3 (XT_SOCKET_TRANSPARENT \
+ | XT_SOCKET_NOWILDCARD \
+ | XT_SOCKET_MATCHSOCKMARK)
+
#endif /* _XT_SOCKET_H */
xt_socket is useful for matching sockets with IP_TRANSPARENT and taking some action on the matching packets. However, it lacks the ability to match only a small subset of transparent sockets. Suppose there are 2 applications, each with its own set of transparent sockets. The first application wants all matching packets dropped, while the second application wants them forwarded somewhere else. Add the ability to match sockets based on the socket mark. Now the 2 hypothetical applications can differentiate their sockets based on a mark value set with SO_MARK. iptables -t mangle -I PREROUTING -m socket --transparent --mark 10 -J act1 iptables -t mangle -I PREROUTING -m socket --transparent --mark 11 -J act2 The mark field also takes an optional mask and is invertable. Signed-off-by: Harout Hedeshian <harouth@codeaurora.org> --- extensions/libxt_socket.c | 79 +++++++++++++++++++++++++++++++++++++ include/linux/netfilter/xt_socket.h | 10 +++++ 2 files changed, 89 insertions(+)