From 6269b5424f36922cf92a7e7f93079ecf76a040e2 Mon Sep 17 00:00:00 2001 From: hwware Date: Wed, 14 Sep 2022 15:18:46 +0000 Subject: [PATCH] rebase on 09-14 --- src/cluster.c | 20 -------------------- src/config.c | 1 - 2 files changed, 21 deletions(-) diff --git a/src/cluster.c b/src/cluster.c index d15bcbbba07..b1952d149f6 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -2136,26 +2136,6 @@ int writeNodenamePingExt(clusterMsgPingExt **cursor) { return extension_size; } -/* Write the nodename ping extension at the start of the cursor. This function - * will update the cursor to point to the end of the written extension and - * will return the amount of bytes written. */ -int writeNodenamePingExt(clusterMsgPingExt **cursor) { - /* If nodename is not set, we don't send this extension */ - if (sdslen(myself->nodename) == 0) return 0; - - /* Add the nodename information at the extension cursor */ - clusterMsgPingExtNodename *ext = &(*cursor)->ext[0].nodename; - memcpy(ext->nodename, myself->nodename, sdslen(myself->nodename)); - uint32_t extension_size = getNodenamePingExtSize(); - - /* Move the write cursor */ - (*cursor)->type = CLUSTERMSG_EXT_TYPE_NODENAME; - (*cursor)->length = htonl(extension_size); - /* Make sure the string is NULL terminated by adding 1 */ - *cursor = (clusterMsgPingExt *) (ext->nodename + EIGHT_BYTE_ALIGN(sdslen(myself->nodename) + 1)); - return extension_size; -} - /* We previously validated the extensions, so this function just needs to * handle the extensions. */ void clusterProcessPingExtensions(clusterMsg *hdr, clusterLink *link) { diff --git a/src/config.c b/src/config.c index 171029574f0..96b7785e9a0 100644 --- a/src/config.c +++ b/src/config.c @@ -2609,7 +2609,6 @@ int updateClusterNodename(const char **err) { return 1; } -#ifdef USE_OPENSSL static int applyTlsCfg(const char **err) { UNUSED(err);