1c8d6d0d32
- Rebase to version 1.8.5 plus upstream-indicated fixes - Fix for duplicate files in RPM due to imprecise globbing - Drop bootstrap code again Resolves: rhbz#2211063
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 40096cbbdd59f0bd431395f69bd30ade35ec1427 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= <anton@sijanec.eu>
|
|
Date: Wed, 22 Jun 2022 21:56:47 +0200
|
|
Subject: [PATCH] xtables-monitor: add missing spaces in printed str
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
when printing the ID and OPTs in iptables/xtables-monitor.c, a space is
|
|
missing after the string, thereby concatenating the number with the next
|
|
item in the printed PACKET line.
|
|
|
|
Fixes: d26c538b9a549 ("xtables: add xtables-monitor")
|
|
Signed-off-by: Anton Luka Šijanec <anton@sijanec.eu>
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
(cherry picked from commit 6c12201b5ff08d9e1524477ff63bb8810198d638)
|
|
---
|
|
iptables/xtables-monitor.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c
|
|
index 4b9809805fb5b..89c739d5aacd1 100644
|
|
--- a/iptables/xtables-monitor.c
|
|
+++ b/iptables/xtables-monitor.c
|
|
@@ -340,7 +340,7 @@ static void trace_print_packet(const struct nftnl_trace *nlt, struct cb_arg *arg
|
|
inet_ntop(AF_INET, &iph->daddr, addrbuf, sizeof(addrbuf));
|
|
printf("DST=%s ", addrbuf);
|
|
|
|
- printf("LEN=%d TOS=0x%x TTL=%d ID=%d", ntohs(iph->tot_len), iph->tos, iph->ttl, ntohs(iph->id));
|
|
+ printf("LEN=%d TOS=0x%x TTL=%d ID=%d ", ntohs(iph->tot_len), iph->tos, iph->ttl, ntohs(iph->id));
|
|
if (iph->frag_off & htons(0x8000))
|
|
printf("CE ");
|
|
if (iph->frag_off & htons(IP_DF))
|
|
@@ -363,7 +363,7 @@ static void trace_print_packet(const struct nftnl_trace *nlt, struct cb_arg *arg
|
|
printf("OPT (");
|
|
for (i = 0; i < optsize; i++)
|
|
printf("%02X", op[i]);
|
|
- printf(")");
|
|
+ printf(") ");
|
|
}
|
|
break;
|
|
}
|
|
--
|
|
2.40.0
|
|
|