From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 94FBD2BB7A for ; Wed, 17 Apr 2019 15:56:41 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nrG7ZHb4lQ37 for ; Wed, 17 Apr 2019 15:56:41 -0400 (EDT) Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 533692B958 for ; Wed, 17 Apr 2019 15:56:40 -0400 (EDT) From: Vladislav Shpilevoy Subject: [tarantool-patches] [PATCH 1/4] swim: move sockaddr_in checkers to swim_proto.h Date: Wed, 17 Apr 2019 22:56:34 +0300 Message-Id: <1e3490a96e2daec7906def26f31265d995966204.1555530516.git.v.shpilevoy@tarantool.org> In-Reply-To: References: In-Reply-To: References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: kostja@tarantool.org There are several places where it is necessary to check if a sockaddr_in is nullified, and to compare a couple of addresses. Some of them are in swim_proto.c, and more are coming in indirect SWIM messages patch. The patch moves the checkers into swim_proto.h so as to be usable from anywhere in SWIM. Also minor renames are made alongside. 'sockaddr_in' is too long to use in each related function's name, and is replaced with 'inaddr' by analogue with the standard library. Part of #3234 --- src/lib/swim/swim.c | 12 ++---------- src/lib/swim/swim_proto.c | 26 ++++++++++++++++---------- src/lib/swim/swim_proto.h | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/lib/swim/swim.c b/src/lib/swim/swim.c index 2dac6eedd..40fa3fb21 100644 --- a/src/lib/swim/swim.c +++ b/src/lib/swim/swim.c @@ -201,14 +201,6 @@ swim_uuid_str(const struct tt_uuid *uuid) return buf; } -/** Check if two AF_INET addresses are equal. */ -static bool -swim_sockaddr_in_eq(const struct sockaddr_in *a1, const struct sockaddr_in *a2) -{ - return a1->sin_port == a2->sin_port && - a1->sin_addr.s_addr == a2->sin_addr.s_addr; -} - /** * A cluster member description. This structure describes the * last known state of an instance. This state is updated @@ -950,7 +942,7 @@ swim_complete_step(struct swim_task *task, struct swim_member *m = rlist_first_entry(&swim->round_queue, struct swim_member, in_round_queue); - if (swim_sockaddr_in_eq(&m->addr, &task->dst)) { + if (swim_inaddr_eq(&m->addr, &task->dst)) { rlist_shift(&swim->round_queue); if (rc > 0) { /* @@ -1048,7 +1040,7 @@ static inline void swim_update_member_addr(struct swim *swim, struct swim_member *member, const struct sockaddr_in *addr, int incarnation_inc) { - if (! swim_sockaddr_in_eq(addr, &member->addr)) { + if (! swim_inaddr_eq(addr, &member->addr)) { member->incarnation += incarnation_inc; member->addr = *addr; swim_on_member_update(swim, member); diff --git a/src/lib/swim/swim_proto.c b/src/lib/swim/swim_proto.c index d84550663..cd9dd195b 100644 --- a/src/lib/swim/swim_proto.c +++ b/src/lib/swim/swim_proto.c @@ -154,6 +154,20 @@ swim_decode_uuid(struct tt_uuid *uuid, const char **pos, const char *end, return 0; } +/** + * Check if @a addr is not empty, i.e. not nullified. Set an error + * in the diagnostics area in case of emptiness. + */ +static inline int +swim_check_inaddr_not_empty(const struct sockaddr_in *addr, const char *prefix, + const char *addr_name) +{ + if (! swim_inaddr_is_empty(addr)) + return 0; + diag_set(SwimError, "%s %s address is mandatory", prefix, addr_name); + return -1; +} + void swim_member_def_create(struct swim_member_def *def) { @@ -236,15 +250,11 @@ swim_member_def_decode(struct swim_member_def *def, const char **pos, if (swim_decode_member_key(key, pos, end, prefix, def) != 0) return -1; } - if (def->addr.sin_port == 0 || def->addr.sin_addr.s_addr == 0) { - diag_set(SwimError, "%s member address is mandatory", prefix); - return -1; - } if (tt_uuid_is_nil(&def->uuid)) { diag_set(SwimError, "%s member uuid is mandatory", prefix); return -1; } - return 0; + return swim_check_inaddr_not_empty(&def->addr, prefix, "member"); } void @@ -429,11 +439,7 @@ swim_meta_def_decode(struct swim_meta_def *def, const char **pos, diag_set(SwimError, "%s version is mandatory", prefix); return -1; } - if (def->src.sin_port == 0 || def->src.sin_addr.s_addr == 0) { - diag_set(SwimError, "%s source address is mandatory", prefix); - return -1; - } - return 0; + return swim_check_inaddr_not_empty(&def->src, prefix, "source"); } void diff --git a/src/lib/swim/swim_proto.h b/src/lib/swim/swim_proto.h index ab4057185..c6ff4539d 100644 --- a/src/lib/swim/swim_proto.h +++ b/src/lib/swim/swim_proto.h @@ -472,4 +472,19 @@ int swim_decode_uuid(struct tt_uuid *uuid, const char **pos, const char *end, const char *prefix, const char *param_name); +/** Check if @a addr is not empty, i.e. not nullified. */ +static inline bool +swim_inaddr_is_empty(const struct sockaddr_in *addr) +{ + return addr->sin_port == 0 && addr->sin_addr.s_addr == 0; +} + +/** Check if two AF_INET addresses are equal. */ +static inline bool +swim_inaddr_eq(const struct sockaddr_in *a1, const struct sockaddr_in *a2) +{ + return a1->sin_port == a2->sin_port && + a1->sin_addr.s_addr == a2->sin_addr.s_addr; +} + #endif /* TARANTOOL_SWIM_PROTO_H_INCLUDED */ -- 2.17.2 (Apple Git-113)