46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
|
From 7fa3df19e2b907e09b2de902a122daaff114ee0c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <psutter@redhat.com>
|
||
|
|
Date: Thu, 31 Jan 2019 16:48:25 +0100
|
||
|
|
Subject: [PATCH] l2tp: Fix printing of cookie and peer_cookie values
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1643805
|
||
|
|
Upstream Status: iproute2.git commit b876b7e2b492f
|
||
|
|
|
||
|
|
commit b876b7e2b492fa14ce1f3db6c18bf22b2df10132
|
||
|
|
Author: Andrea Claudi <aclaudi@redhat.com>
|
||
|
|
Date: Fri Nov 30 15:34:24 2018 +0100
|
||
|
|
|
||
|
|
l2tp: Fix printing of cookie and peer_cookie values
|
||
|
|
|
||
|
|
print_cookie() invocations miss %s format specifier.
|
||
|
|
While at it, align printout to the previous lines.
|
||
|
|
|
||
|
|
Fixes: 98453b65800f7 ("ip/l2tp: add JSON support")
|
||
|
|
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
|
||
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||
|
|
---
|
||
|
|
ip/ipl2tp.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
|
||
|
|
index 414a9eb..87c13db 100644
|
||
|
|
--- a/ip/ipl2tp.c
|
||
|
|
+++ b/ip/ipl2tp.c
|
||
|
|
@@ -311,10 +311,11 @@ static void print_session(struct l2tp_data *data)
|
||
|
|
print_uint(PRINT_FP, "peer_offset", " peer offset %u\n", 0);
|
||
|
|
|
||
|
|
if (p->cookie_len > 0)
|
||
|
|
- print_cookie("cookie", "cookie",
|
||
|
|
+ print_cookie("cookie", " cookie %s",
|
||
|
|
p->cookie, p->cookie_len);
|
||
|
|
+
|
||
|
|
if (p->peer_cookie_len > 0)
|
||
|
|
- print_cookie("peer_cookie", "peer cookie",
|
||
|
|
+ print_cookie("peer_cookie", " peer cookie %s",
|
||
|
|
p->peer_cookie, p->peer_cookie_len);
|
||
|
|
|
||
|
|
if (p->reorder_timeout != 0)
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|