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