From patchwork Wed Nov 9 11:07:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2841 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id OZ0KFk+Ka2PCWgAAIUCqbw (envelope-from ) for ; Wed, 09 Nov 2022 06:09:03 -0500 Received: from proxy8.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net with LMTP id 8EbDFE+Ka2NwbwAAfY0hYg (envelope-from ) for ; Wed, 09 Nov 2022 06:09:03 -0500 Received: from smtp26.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1d.rsapps.net with LMTPS id oDRnFE+Ka2PjIQAAGdz6CA (envelope-from ) for ; Wed, 09 Nov 2022 06:09:03 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp26.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: ea7eb604-601e-11ed-89ca-525400c5b129-1-1 Received: from [216.105.38.7] ([216.105.38.7:49276] helo=lists.sourceforge.net) by smtp26.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 70/72-32588-E4A8B636; Wed, 09 Nov 2022 06:09:02 -0500 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1osiwD-00089U-7y; Wed, 09 Nov 2022 11:08:09 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1osiw6-00089I-A4 for openvpn-devel@lists.sourceforge.net; Wed, 09 Nov 2022 11:08:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EOReynfZMmkbt40LZ3y5+iGINz/gOOANyM6qv6ghyRY=; b=bY/WWPXfsBzJtiy3e2BwxC4ovO ZnkKdwf7A9bonrnRI4Wu/D9eoGh2gOamut1CH+EXIJwitqdPErXtmBavq2q5qd48RjUec5H4aEZWf 5/oraAPflAPxs9i7iF3ONk721tSKBG7tkKYsEwQibLVWYjnm3C3ptN+BmUB3oKB9HMbU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=EOReynfZMmkbt40LZ3y5+iGINz/gOOANyM6qv6ghyRY=; b=H ABw6K1zAli930q/qpXzGd1uEd84sbYT/CX+KeTqann/a47MYSw5s/Qk3H5NALapoH2XT6L9ExqY9N 6RKVJQK3u75WaAvkDYeBqvwWRfv8+V3QcIU4/lW0ziTen470D6pAnO5IX4ZxY7zNS4QR34z91xTgM C8Q9X+beIMWkCbOo=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1osiw4-0001Kn-Jr for openvpn-devel@lists.sourceforge.net; Wed, 09 Nov 2022 11:08:02 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1osivt-000CmD-HO for openvpn-devel@lists.sourceforge.net; Wed, 09 Nov 2022 12:07:49 +0100 Received: (nullmailer pid 1245221 invoked by uid 10006); Wed, 09 Nov 2022 11:07:49 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 9 Nov 2022 12:07:49 +0100 Message-Id: <20221109110749.1245175-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: addr_copy_sa is just a single line and putting that simple assignment into an extra function does not really improve clarity. Signed-off-by: Arne Schwabe --- src/openvpn/socket.h | 18 ++ 1 file changed, 2 insertions(+), 16 deletions(-) Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1osiw4-0001Kn-Jr Subject: [Openvpn-devel] [PATCH] Remove unused addr_inet4or6, addr_guess_family and inline addr_copy_sa X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox addr_copy_sa is just a single line and putting that simple assignment into an extra function does not really improve clarity. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/socket.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index 462afa31b..94c8b6dff 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -863,20 +863,6 @@ addr_zero_host(struct openvpn_sockaddr *addr) } } -static inline void -addr_copy_sa(struct openvpn_sockaddr *dst, const struct openvpn_sockaddr *src) -{ - dst->addr = src->addr; -} - -static inline bool -addr_inet4or6(struct sockaddr *addr) -{ - return addr->sa_family == AF_INET || addr->sa_family == AF_INET6; -} - -int addr_guess_family(sa_family_t af, const char *name); - static inline int af_addr_size(sa_family_t af) { @@ -1052,7 +1038,7 @@ link_socket_read_udp_win32(struct link_socket *sock, sockethandle_t sh = { .s = sock->sd }; if (sock->info.dco_installed) { - addr_copy_sa(&from->dest, &sock->info.lsa->actual.dest); + from->dest = sock->info.lsa->actual.dest; sh.is_handle = true; } return sockethandle_finalize(sh, &sock->reads, buf, from); @@ -1089,7 +1075,7 @@ link_socket_read(struct link_socket *sock, else if (proto_is_tcp(sock->info.proto)) /* unified TCPv4 and TCPv6 */ { /* from address was returned by accept */ - addr_copy_sa(&from->dest, &sock->info.lsa->actual.dest); + from->dest = sock->info.lsa->actual.dest; return link_socket_read_tcp(sock, buf); } else