From: Arne Schwabe Date: Wed, 9 Nov 2022 11:07:49 +0000 (+0100) Subject: Remove unused addr_inet4or6, addr_guess_family and inline addr_copy_sa X-Git-Tag: v2.6_beta1~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=470d1d149aac162fac3390e7dcb29c2a9ea7dba4;p=thirdparty%2Fopenvpn.git Remove unused addr_inet4or6, addr_guess_family and inline addr_copy_sa 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 Message-Id: <20221109110749.1245175-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25493.html Signed-off-by: Gert Doering --- 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