From d7249b3cbd204a839c279e753d59c118b9b8dc8b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 12 Dec 2023 13:26:46 +0100 Subject: [PATCH] ctdb: add ctdb_canonicalize_ip_inplace() helper Signed-off-by: Stefan Metzmacher Reviewed-by: Martin Schwenke (cherry picked from commit f2d9c012fc803b48564c3203ed640c02f99bcbaa) --- ctdb/common/common.h | 1 + ctdb/common/ctdb_util.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ctdb/common/common.h b/ctdb/common/common.h index c50b52a5eb5..9a73bec1ac6 100644 --- a/ctdb/common/common.h +++ b/ctdb/common/common.h @@ -132,6 +132,7 @@ struct ctdb_rec_data_old *ctdb_marshall_loop_next( TDB_DATA *key, TDB_DATA *data); void ctdb_canonicalize_ip(const ctdb_sock_addr *ip, ctdb_sock_addr *cip); +void ctdb_canonicalize_ip_inplace(ctdb_sock_addr *ip); bool ctdb_same_ip(const ctdb_sock_addr *tip1, const ctdb_sock_addr *tip2); diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c index 3f8fff925f0..5c7731c5d2a 100644 --- a/ctdb/common/ctdb_util.c +++ b/ctdb/common/ctdb_util.c @@ -388,6 +388,13 @@ void ctdb_canonicalize_ip(const ctdb_sock_addr *ip, ctdb_sock_addr *cip) } } +void ctdb_canonicalize_ip_inplace(ctdb_sock_addr *ip) +{ + ctdb_sock_addr tmp; + ctdb_canonicalize_ip(ip, &tmp); + memcpy(ip, &tmp, sizeof(tmp)); +} + bool ctdb_same_ip(const ctdb_sock_addr *tip1, const ctdb_sock_addr *tip2) { ctdb_sock_addr ip1, ip2; -- 2.47.2