|
 |
9a3fa7 |
From c923062439297cbf5b08429123ba214b4efc8798 Mon Sep 17 00:00:00 2001
|
|
|
9a3fa7 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
9a3fa7 |
Date: Fri, 15 Mar 2019 17:50:34 +0100
|
|
|
9a3fa7 |
Subject: [PATCH] libxt_conntrack: Version 0 does not support
|
|
|
9a3fa7 |
XT_CONNTRACK_DIRECTION
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1525980
|
|
|
9a3fa7 |
Upstream Status: iptables commit 74eb2395c8384
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
commit 74eb2395c838460384286c2b95f711ae275a46cb
|
|
|
9a3fa7 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
9a3fa7 |
Date: Wed Sep 19 15:16:49 2018 +0200
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
libxt_conntrack: Version 0 does not support XT_CONNTRACK_DIRECTION
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
Since sinfo->flags is only 8 bytes large, checking for
|
|
|
9a3fa7 |
XT_CONNTRACK_DIRECTION bit (which has value 1 << 12) will always return
|
|
|
9a3fa7 |
false, so drop this dead code.
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
Fixes: c7fc1dae1e8f8 ("libxt_conntrack: dump ctdir")
|
|
|
9a3fa7 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
9a3fa7 |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
9a3fa7 |
---
|
|
|
9a3fa7 |
extensions/libxt_conntrack.c | 8 --------
|
|
|
9a3fa7 |
1 file changed, 8 deletions(-)
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
|
|
|
9a3fa7 |
index 128bbd20a34c2..3e7075760d40f 100644
|
|
|
9a3fa7 |
--- a/extensions/libxt_conntrack.c
|
|
|
9a3fa7 |
+++ b/extensions/libxt_conntrack.c
|
|
|
9a3fa7 |
@@ -774,14 +774,6 @@ matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric,
|
|
|
9a3fa7 |
else
|
|
|
9a3fa7 |
printf("%lu:%lu", sinfo->expires_min, sinfo->expires_max);
|
|
|
9a3fa7 |
}
|
|
|
9a3fa7 |
-
|
|
|
9a3fa7 |
- if (sinfo->flags & XT_CONNTRACK_DIRECTION) {
|
|
|
9a3fa7 |
- if (sinfo->invflags & XT_CONNTRACK_DIRECTION)
|
|
|
9a3fa7 |
- printf(" %sctdir REPLY", optpfx);
|
|
|
9a3fa7 |
- else
|
|
|
9a3fa7 |
- printf(" %sctdir ORIGINAL", optpfx);
|
|
|
9a3fa7 |
- }
|
|
|
9a3fa7 |
-
|
|
|
9a3fa7 |
}
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
static void
|
|
|
9a3fa7 |
--
|
|
|
9a3fa7 |
2.21.0
|
|
|
9a3fa7 |
|