You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
2.0 KiB
62 lines
2.0 KiB
11 months ago
|
From f41e10de4d82377b01e0db057bde3e68159f7531 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Westphal <fw@strlen.de>
|
||
|
|
Date: Sat, 23 Jul 2022 20:25:49 +0200
|
||
|
|
Subject: [PATCH] extensions: libxt_conntrack: remove always-false conditionals
|
||
|
|
|
||
|
|
libxt_conntrack.c:1292: warning: the comparison will always evaluate as
|
||
|
|
false for the address of origsrc_addr will never be NULL [-Waddress]
|
||
|
|
|
||
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
||
|
|
(cherry picked from commit e88085ac41b4c962e1d85dcc8dc6fa0d1f80dc12)
|
||
|
|
---
|
||
|
|
extensions/libxt_conntrack.c | 12 ------------
|
||
|
|
1 file changed, 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
|
||
|
|
index 91f9e4aa994f8..6ab5c99133d3c 100644
|
||
|
|
--- a/extensions/libxt_conntrack.c
|
||
|
|
+++ b/extensions/libxt_conntrack.c
|
||
|
|
@@ -1297,9 +1297,6 @@ static int _conntrack3_mt_xlate(struct xt_xlate *xl,
|
||
|
|
}
|
||
|
|
|
||
|
|
if (sinfo->match_flags & XT_CONNTRACK_ORIGSRC) {
|
||
|
|
- if (&sinfo->origsrc_addr == 0L)
|
||
|
|
- return 0;
|
||
|
|
-
|
||
|
|
xt_xlate_add(xl, "%sct original saddr %s", space,
|
||
|
|
sinfo->invert_flags & XT_CONNTRACK_ORIGSRC ?
|
||
|
|
"!= " : "");
|
||
|
|
@@ -1309,9 +1306,6 @@ static int _conntrack3_mt_xlate(struct xt_xlate *xl,
|
||
|
|
}
|
||
|
|
|
||
|
|
if (sinfo->match_flags & XT_CONNTRACK_ORIGDST) {
|
||
|
|
- if (&sinfo->origdst_addr == 0L)
|
||
|
|
- return 0;
|
||
|
|
-
|
||
|
|
xt_xlate_add(xl, "%sct original daddr %s", space,
|
||
|
|
sinfo->invert_flags & XT_CONNTRACK_ORIGDST ?
|
||
|
|
"!= " : "");
|
||
|
|
@@ -1321,9 +1315,6 @@ static int _conntrack3_mt_xlate(struct xt_xlate *xl,
|
||
|
|
}
|
||
|
|
|
||
|
|
if (sinfo->match_flags & XT_CONNTRACK_REPLSRC) {
|
||
|
|
- if (&sinfo->replsrc_addr == 0L)
|
||
|
|
- return 0;
|
||
|
|
-
|
||
|
|
xt_xlate_add(xl, "%sct reply saddr %s", space,
|
||
|
|
sinfo->invert_flags & XT_CONNTRACK_REPLSRC ?
|
||
|
|
"!= " : "");
|
||
|
|
@@ -1333,9 +1324,6 @@ static int _conntrack3_mt_xlate(struct xt_xlate *xl,
|
||
|
|
}
|
||
|
|
|
||
|
|
if (sinfo->match_flags & XT_CONNTRACK_REPLDST) {
|
||
|
|
- if (&sinfo->repldst_addr == 0L)
|
||
|
|
- return 0;
|
||
|
|
-
|
||
|
|
xt_xlate_add(xl, "%sct reply daddr %s", space,
|
||
|
|
sinfo->invert_flags & XT_CONNTRACK_REPLDST ?
|
||
|
|
"!= " : "");
|
||
|
|
--
|
||
|
|
2.40.0
|
||
|
|
|