From: Andre Noll Date: Sat, 31 May 2025 17:30:31 +0000 (+0200) Subject: net.c: Convert SS_IS_ADDR_V4MAPPED() to lower case. X-Git-Url: https://git.tuebingen.mpg.de/?a=commitdiff_plain;h=5fd4a56660e000afbd2a193b869242d2e02de83e;p=paraslash.git net.c: Convert SS_IS_ADDR_V4MAPPED() to lower case. It's not a macro, after all. Remove the superfluous braces and fix a whitespace issue while at it. --- diff --git a/net.c b/net.c index a0650a23..875ffa6d 100644 --- a/net.c +++ b/net.c @@ -592,7 +592,7 @@ static socklen_t salen(const struct sockaddr *sa) } /* True if ss holds a v6-mapped-v4 address (RFC 4291, 2.5.5.2) */ -static bool SS_IS_ADDR_V4MAPPED(const struct sockaddr_storage *ss) +static bool ss_is_addr_v4mapped(const struct sockaddr_storage *ss) { const struct sockaddr_in6 *ia6 = (const struct sockaddr_in6 *)ss; @@ -611,7 +611,7 @@ normalize_ip_address(const struct sockaddr_storage *ss) { assert(ss->ss_family == AF_INET || ss->ss_family == AF_INET6); - if (SS_IS_ADDR_V4MAPPED(ss)) { + if (ss_is_addr_v4mapped(ss)) { const struct sockaddr_in6 *ia6 = (const struct sockaddr_in6 *)ss; static struct sockaddr_in ia; @@ -660,12 +660,11 @@ int generic_max_transport_msg_size(int sockfd) socklen_t sslen = sizeof(ss); int af_type = AF_INET; - if (getpeername(sockfd, (struct sockaddr *)&ss, &sslen) < 0) { + if (getpeername(sockfd, (struct sockaddr *)&ss, &sslen) < 0) PARA_ERROR_LOG("can not determine remote address type: %s\n", - strerror(errno)); - } else if (!SS_IS_ADDR_V4MAPPED(&ss)) { + strerror(errno)); + else if (!ss_is_addr_v4mapped(&ss)) af_type = ss.ss_family; - } return generic_mtu(af_type) - estimated_header_overhead(af_type); }