[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/13] migration: Create migrate_tls_hostname() function
From: |
Juan Quintela |
Subject: |
[PATCH v3 11/13] migration: Create migrate_tls_hostname() function |
Date: |
Mon, 24 Apr 2023 20:32:34 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/options.c | 7 +++++++
migration/options.h | 1 +
migration/tls.c | 6 ++++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/migration/options.c b/migration/options.c
index 9e19e4ade1..9fbba84b9a 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -593,6 +593,13 @@ char *migrate_tls_creds(void)
return s->parameters.tls_creds;
}
+char *migrate_tls_hostname(void)
+{
+ MigrationState *s = migrate_get_current();
+
+ return s->parameters.tls_hostname;
+}
+
uint64_t migrate_xbzrle_cache_size(void)
{
MigrationState *s = migrate_get_current();
diff --git a/migration/options.h b/migration/options.h
index 0438c6e36e..9123fdb5f4 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -82,6 +82,7 @@ int migrate_multifd_zstd_level(void);
uint8_t migrate_throttle_trigger_threshold(void);
char *migrate_tls_authz(void);
char *migrate_tls_creds(void);
+char *migrate_tls_hostname(void);
uint64_t migrate_xbzrle_cache_size(void);
/* parameters setters */
diff --git a/migration/tls.c b/migration/tls.c
index 4c229326fd..3cae1a06e7 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -123,6 +123,7 @@ QIOChannelTLS *migration_tls_client_create(MigrationState
*s,
Error **errp)
{
QCryptoTLSCreds *creds;
+ char *tls_hostname;
creds = migration_tls_get_creds(
s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp);
@@ -130,8 +131,9 @@ QIOChannelTLS *migration_tls_client_create(MigrationState
*s,
return NULL;
}
- if (s->parameters.tls_hostname && *s->parameters.tls_hostname) {
- hostname = s->parameters.tls_hostname;
+ tls_hostname = migrate_tls_hostname();
+ if (tls_hostname && *tls_hostname) {
+ hostname = tls_hostname;
}
return qio_channel_tls_new_client(ioc, creds, hostname, errp);
--
2.39.2
- Re: [PATCH v3 06/13] migration: Move migrate_set_block_incremental() to options.c, (continued)
- [PATCH v3 03/13] migration: Create migrate_params_init() function, Juan Quintela, 2023/04/24
- [PATCH v3 08/13] migration: Remove MigrationState from block_cleanup_parameters(), Juan Quintela, 2023/04/24
- [PATCH v3 05/13] migration: Create migrate_downtime_limit() function, Juan Quintela, 2023/04/24
- [PATCH v3 11/13] migration: Create migrate_tls_hostname() function,
Juan Quintela <=
- [PATCH v3 10/13] migration: Create migrate_tls_authz() function, Juan Quintela, 2023/04/24
- [PATCH v3 12/13] migration: Create migrate_block_bitmap_mapping() function, Juan Quintela, 2023/04/24
- [PATCH v3 09/13] migration: Create migrate_tls_creds() function, Juan Quintela, 2023/04/24
- [PATCH v3 07/13] migration: Move block_cleanup_parameters() to options.c, Juan Quintela, 2023/04/24