|
 |
d979c6 |
From 9d72def87ecc384d0a46525c766e755068fefe54 Mon Sep 17 00:00:00 2001
|
|
|
d979c6 |
From: =?UTF-8?q?V=C3=A1clav=20Dole=C5=BEal?= <vdolezal@redhat.com>
|
|
|
d979c6 |
Date: Thu, 28 May 2020 13:32:31 +0200
|
|
|
d979c6 |
Subject: [PATCH] lanplus: don't retry pre-session Get cipher suites
|
|
|
d979c6 |
MIME-Version: 1.0
|
|
|
d979c6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d979c6 |
Content-Transfer-Encoding: 8bit
|
|
|
d979c6 |
|
|
|
d979c6 |
Some BMCs are ignoring it, causing needless delay.
|
|
|
d979c6 |
|
|
|
d979c6 |
Signed-off-by: Václav Doležal <vdolezal@redhat.com>
|
|
|
d979c6 |
---
|
|
|
d979c6 |
src/plugins/lanplus/lanplus.c | 8 ++++++--
|
|
|
d979c6 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
d979c6 |
|
|
|
d979c6 |
diff --git a/src/plugins/lanplus/lanplus.c b/src/plugins/lanplus/lanplus.c
|
|
|
d979c6 |
index 3087348..c442c0e 100644
|
|
|
d979c6 |
--- a/src/plugins/lanplus/lanplus.c
|
|
|
d979c6 |
+++ b/src/plugins/lanplus/lanplus.c
|
|
|
d979c6 |
@@ -3459,9 +3459,13 @@ ipmi_find_best_cipher_suite(struct ipmi_intf *intf)
|
|
|
d979c6 |
};
|
|
|
d979c6 |
const size_t nr_preferred = ARRAY_SIZE(cipher_order_preferred);
|
|
|
d979c6 |
size_t ipref, i;
|
|
|
d979c6 |
+ int rc;
|
|
|
d979c6 |
+ int retry_old = intf->ssn_params.retry;
|
|
|
d979c6 |
|
|
|
d979c6 |
- if (ipmi_get_channel_cipher_suites(intf, "ipmi", IPMI_LAN_CHANNEL_E,
|
|
|
d979c6 |
- suites, &nr_suites) < 0)
|
|
|
d979c6 |
+ ipmi_intf_session_set_retry(intf, 1);
|
|
|
d979c6 |
+ rc = ipmi_get_channel_cipher_suites(intf, "ipmi", IPMI_LAN_CHANNEL_E, suites, &nr_suites);
|
|
|
d979c6 |
+ ipmi_intf_session_set_retry(intf, retry_old);
|
|
|
d979c6 |
+ if (rc < 0)
|
|
|
d979c6 |
{
|
|
|
d979c6 |
/* default legacy behavior - cipher suite 3 if none is requested */
|
|
|
d979c6 |
return IPMI_LANPLUS_CIPHER_SUITE_3;
|
|
|
d979c6 |
--
|
|
|
d979c6 |
2.25.4
|
|
|
d979c6 |
|