From patchwork Fri Oct 18 06:37:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3902 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:29d4:b0:5b9:581e:f939 with SMTP id g20csp687596max; Thu, 17 Oct 2024 23:37:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW07wZ9pUj4pkB1hP/GYNNejOlKE7c8Me/Jaae13MYVwBrUxR0++8wvLZ+gTflt7Wf7VcOJmicMQDo=@openvpn.net X-Google-Smtp-Source: AGHT+IHXWZ3n5jIhTGOZnev8hJz/fDO9XulEAVl38HjlLcT4hPfqYg5aO9POcS1esvlYSkVH27Q3 X-Received: by 2002:a05:6871:580c:b0:270:27e6:6f1a with SMTP id 586e51a60fabf-2892c56d19cmr773088fac.41.1729233458115; Thu, 17 Oct 2024 23:37:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729233458; cv=none; d=google.com; s=arc-20240605; b=EH7oGJOSYPiL4DrCfnhyxRdcTDxhFSdK3rtuasoM/iFRMzlZabSPiww6QPJS09haQX ngzP00Q0UdBxBfHhspbI7gMSbsUzT6EJIiaG6bOB4KkYWWmsGaCqQLz+qiHzI+o47Jqg oIHCTCZpWhPB8SstNh6JTl2wYZ6NrpmqPujtWvguCu1N2d8YbJtWPcYsTw6Nbzr3BBMQ K99tuFP8aDgI8lwTAokm4AWxn9gx3yo8qqDOY9nzPByUe1UTjPzUeWbmiDV0V5EZfJEn IaZeIDO9xe1PlEKpFZVkf9YbHI5wf7KnAaBr+UbXIXQ1xVgyIkNvQhgcTrjWhoMe+cuO hedA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=Lvc6h9DHXgzrmwyrvfkzRlB1fP6Q8Z5boZLO2t0XOwI=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=V3reTR7t3dhLUv76LAeg3HZoL/KCoGHJAEeIWYeK9/bnLUqcgHptlQf9YSLh0Ykd+R 5mQQCeQcFBZHafVliRFz/0VXc6YJ6G5n39dqqUE+2pKmssoWYA9RlNdaSJOsnAfq0lYe agvx2WvsWdIpeWwzU+k3jnsM2/Y8LWK39psQH9hsiR2hTD4KWEBSPI1OZG4WMk/kWHfq WOBf+pxS5fF8++YYLJxmwmm0GvntMLKsZy2jgxrDBerAGJ8s37FO7EWZWmXyXlTWD25j nQxzauJROU48Qy1NMx2V8aLK0Aoo+5RUEJp5OD8vJfEi7qPhv2McPRI8D8nl2a0n0Hd4 n3gw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=BcAvLzYE; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=RAMx1TEv; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-2892acaa757si507761fac.35.2024.10.17.23.37.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Oct 2024 23:37:38 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=BcAvLzYE; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=RAMx1TEv; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de 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 1t1gc3-0006up-To; Fri, 18 Oct 2024 06:37:27 +0000 Received: from [172.30.29.66] (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 1t1gc2-0006uh-4o for openvpn-devel@lists.sourceforge.net; Fri, 18 Oct 2024 06:37:26 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=b5XYbPiUiNxQnGMyyVA5c96I5ydkErSlOVR41WV5JVw=; b=BcAvLzYEWCy+P1ep3qlpkF1Ddu FgxneAHbfp0xrYx0YEsva7ntbaQWsFgXpXI/QrZDzvQsVbTdqtdhszqia5oFaf09bd6/t3Lc6qjyd TtCoz+N2Txl8hkVbPmJ7ITkyrMRS9tenOhF+MgtLxOUamg+1+mzb1gMLy7YKmITeualY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=b5XYbPiUiNxQnGMyyVA5c96I5ydkErSlOVR41WV5JVw=; b=RAMx1TEvqrOr+wYZFfEKSmLKRI /DH7La58SDy+/HtVSgXCA6gJSmK4BYmyvWKtGMygm1TOay/b5K1JTVMI67ULy3Y0mOsqEfT6KZNxl wl9NCAQg0aYKgaY+SZkSG+KbHwbWTUroQi2Zw8AN3ItCQ/1ozWHUtwPSxEwR7UKLWlsA=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1t1gc0-0006AV-Le for openvpn-devel@lists.sourceforge.net; Fri, 18 Oct 2024 06:37:26 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 49I6bID4014677 for ; Fri, 18 Oct 2024 08:37:18 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 49I6bIoh014676 for openvpn-devel@lists.sourceforge.net; Fri, 18 Oct 2024 08:37:18 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 18 Oct 2024 08:37:17 +0200 Message-ID: <20241018063717.14629-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: From: Arne Schwabe These have been found by Clion's Inspect Code functionality and have been verified by hand. A few functions like buf_read_u32 have been kept since they still feel being useful while currently not bein [...] Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Headers-End: 1t1gc0-0006AV-Le Subject: [Openvpn-devel] [PATCH v1] Remove a large number of unused structs and functions 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 X-GMAIL-THRID: =?utf-8?q?1813232702536259000?= X-GMAIL-MSGID: =?utf-8?q?1813232702536259000?= From: Arne Schwabe These have been found by Clion's Inspect Code functionality and have been verified by hand. A few functions like buf_read_u32 have been kept since they still feel being useful while currently not being used. Change-Id: I0d96ee06c355c6a5ce082af23921e329d3efae33 Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/783 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index 9ee76aa..b2a5bf5 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -296,24 +296,6 @@ } } -/* - * convert a multi-line output to one line - */ -void -convert_to_one_line(struct buffer *buf) -{ - uint8_t *cp = BPTR(buf); - int len = BLEN(buf); - while (len--) - { - if (*cp == '\n') - { - *cp = '|'; - } - ++cp; - } -} - bool buffer_write_file(const char *filename, const struct buffer *buf) { diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h index 8a40010..2f804fb 100644 --- a/src/openvpn/buffer.h +++ b/src/openvpn/buffer.h @@ -487,11 +487,6 @@ void buf_catrunc(struct buffer *buf, const char *str); /* - * convert a multi-line output to one line - */ -void convert_to_one_line(struct buffer *buf); - -/* * Parse a string based on a given delimiter char */ bool buf_parse(struct buffer *buf, const int delim, char *line, const int size); diff --git a/src/openvpn/crypto_mbedtls.h b/src/openvpn/crypto_mbedtls.h index 48d1e20..a966a7a 100644 --- a/src/openvpn/crypto_mbedtls.h +++ b/src/openvpn/crypto_mbedtls.h @@ -75,7 +75,6 @@ #define MD5_DIGEST_LENGTH 16 #define SHA_DIGEST_LENGTH 20 #define SHA256_DIGEST_LENGTH 32 -#define DES_KEY_LENGTH 8 /** * Returns a singleton instance of the mbed TLS random number generator. diff --git a/src/openvpn/crypto_openssl.h b/src/openvpn/crypto_openssl.h index 4cd988a..288c2fa 100644 --- a/src/openvpn/crypto_openssl.h +++ b/src/openvpn/crypto_openssl.h @@ -93,7 +93,6 @@ /** Cipher should decrypt */ #define OPENVPN_OP_DECRYPT 0 -#define DES_KEY_LENGTH 8 #define MD4_DIGEST_LENGTH 16 /** diff --git a/src/openvpn/error.h b/src/openvpn/error.h index ab2872a..9a4577b 100644 --- a/src/openvpn/error.h +++ b/src/openvpn/error.h @@ -297,10 +297,6 @@ extern const char *x_msg_prefix; -void msg_thread_init(void); - -void msg_thread_uninit(void); - static inline void msg_set_prefix(const char *prefix) { diff --git a/src/openvpn/fragment.h b/src/openvpn/fragment.h index c3eb2ef..3cd0ee7 100644 --- a/src/openvpn/fragment.h +++ b/src/openvpn/fragment.h @@ -137,8 +137,6 @@ struct event_timeout wakeup; /**< Timeout structure used by the main * event loop to know when to do * fragmentation housekeeping. */ - bool received_os_mtu_hint; /**< Whether the operating system has - * explicitly recommended an MTU value. */ #define N_SEQ_ID 256 /**< One more than the maximum fragment * sequence ID, above which the IDs wrap diff --git a/src/openvpn/init.c b/src/openvpn/init.c index ae911a9..9371024 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -816,8 +816,6 @@ bool init_static(void) { - /* configure_path (); */ - #if defined(DMALLOC) crypto_init_dmalloc(); #endif diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 05b5a1a..f296788 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -3797,16 +3797,6 @@ } /* - * Return true if (from the management interface's perspective) OpenVPN should - * daemonize. - */ -bool -management_should_daemonize(struct management *man) -{ - return management_would_hold(man) || (man->settings.flags & MF_QUERY_PASSWORDS); -} - -/* * If the hold flag is enabled, hibernate until a management client releases the hold. * Return true if the caller should not sleep for an additional time interval. */ diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index 1896510..f501543 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -390,8 +390,6 @@ #endif -bool management_should_daemonize(struct management *man); - bool management_would_hold(struct management *man); bool management_hold(struct management *man, int holdtime); diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h index cdfb0de..3c46c02 100644 --- a/src/openvpn/misc.h +++ b/src/openvpn/misc.h @@ -186,9 +186,6 @@ */ const char *safe_print(const char *str, struct gc_arena *gc); - -void configure_path(void); - const char *sanitize_control_message(const char *str, struct gc_arena *gc); /* diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 96408d1..3ae8be7 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -63,14 +63,6 @@ #define MTCP_N ((void *)16) /* upper bound on MTCP_x */ -struct ta_iow_flags -{ - unsigned int flags; - unsigned int ret; - unsigned int tun; - unsigned int sock; -}; - #ifdef ENABLE_DEBUG static const char * pract(int action) diff --git a/src/openvpn/mtcp.h b/src/openvpn/mtcp.h index 886d2cc..ab968e9 100644 --- a/src/openvpn/mtcp.h +++ b/src/openvpn/mtcp.h @@ -58,9 +58,6 @@ void multi_tcp_instance_specific_free(struct multi_instance *mi); -void multi_tcp_link_out_deferred(struct multi_context *m, struct multi_instance *mi); - - /**************************************************************************/ /** * Main event loop for OpenVPN in TCP server mode. diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h index e98c93e..8dfcab4 100644 --- a/src/openvpn/openvpn.h +++ b/src/openvpn/openvpn.h @@ -200,10 +200,6 @@ /**< Hash of option strings received from the * remote OpenVPN server. Only used in * client-mode. */ - - struct user_pass *auth_user_pass; - /**< Username and password for - * authentication. */ }; diff --git a/src/openvpn/packet_id.h b/src/openvpn/packet_id.h index 558361a..3778d19 100644 --- a/src/openvpn/packet_id.h +++ b/src/openvpn/packet_id.h @@ -318,23 +318,6 @@ return p->id >= PACKET_ID_WRAP_TRIGGER; } -static inline bool -check_timestamp_delta(time_t remote, unsigned int max_delta) -{ - unsigned int abs; - const time_t local_now = now; - - if (local_now >= remote) - { - abs = local_now - remote; - } - else - { - abs = remote - local_now; - } - return abs <= max_delta; -} - static inline void packet_id_reap_test(struct packet_id_rec *p) { diff --git a/src/openvpn/platform.c b/src/openvpn/platform.c index 3d9d59e..d1cb7d1 100644 --- a/src/openvpn/platform.c +++ b/src/openvpn/platform.c @@ -483,19 +483,6 @@ #endif } -/* - * Go to sleep indefinitely. - */ -void -platform_sleep_until_signal(void) -{ -#ifdef _WIN32 - ASSERT(0); -#else - select(0, NULL, NULL, NULL, NULL); -#endif -} - /* delete a file, return true if succeeded */ bool platform_unlink(const char *filename) diff --git a/src/openvpn/platform.h b/src/openvpn/platform.h index 181cb71..81c222c 100644 --- a/src/openvpn/platform.h +++ b/src/openvpn/platform.h @@ -131,13 +131,9 @@ void platform_sleep_milliseconds(unsigned int n); -void platform_sleep_until_signal(void); - /* delete a file, return true if succeeded */ bool platform_unlink(const char *filename); -int platform_putenv(char *string); - FILE *platform_fopen(const char *path, const char *mode); int platform_open(const char *path, int flags, int mode); diff --git a/src/openvpn/proto.h b/src/openvpn/proto.h index a160fb6..7b94fbc 100644 --- a/src/openvpn/proto.h +++ b/src/openvpn/proto.h @@ -83,25 +83,6 @@ #define SIZE_ETH_TO_8021Q_HDR (sizeof(struct openvpn_8021qhdr) \ - sizeof(struct openvpn_ethhdr)) - -struct openvpn_arp { -#define ARP_MAC_ADDR_TYPE 0x0001 - uint16_t mac_addr_type; /* 0x0001 */ - - uint16_t proto_addr_type; /* 0x0800 */ - uint8_t mac_addr_size; /* 0x06 */ - uint8_t proto_addr_size; /* 0x04 */ - -#define ARP_REQUEST 0x0001 -#define ARP_REPLY 0x0002 - uint16_t arp_command; /* 0x0001 for ARP request, 0x0002 for ARP reply */ - - uint8_t mac_src[OPENVPN_ETH_ALEN]; - in_addr_t ip_src; - uint8_t mac_dest[OPENVPN_ETH_ALEN]; - in_addr_t ip_dest; -}; - struct openvpn_iphdr { #define OPENVPN_IPH_GET_VER(v) (((v) >> 4) & 0x0F) #define OPENVPN_IPH_GET_LEN(v) (((v) & 0x0F) << 2) diff --git a/src/openvpn/proxy.h b/src/openvpn/proxy.h index d9e598c..1475b87 100644 --- a/src/openvpn/proxy.h +++ b/src/openvpn/proxy.h @@ -61,12 +61,6 @@ bool nocache; }; -struct http_proxy_options_simple { - const char *server; - const char *port; - int auth_retry; -}; - struct http_proxy_info { bool defined; int auth_method; diff --git a/src/openvpn/ps.h b/src/openvpn/ps.h index f0d4d7d..1be29ae 100644 --- a/src/openvpn/ps.h +++ b/src/openvpn/ps.h @@ -30,8 +30,6 @@ #include "buffer.h" #include "ssl.h" -typedef void (*post_fork_cleanup_func_t)(void *arg); - struct port_share { /* Foreground's socket to background process */ socket_descriptor_t foreground_fd; diff --git a/src/openvpn/shaper.h b/src/openvpn/shaper.h index 8eb8db1..4783ebc 100644 --- a/src/openvpn/shaper.h +++ b/src/openvpn/shaper.h @@ -89,12 +89,6 @@ shaper_reset_wakeup(s); } -static inline int -shaper_current_bandwidth(struct shaper *s) -{ - return s->bytes_per_second; -} - /* * Returns traffic shaping delay in microseconds relative to current * time, or 0 if no delay. diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index 2e583af..04eb8a4 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -362,16 +362,6 @@ static inline const char * -print_openvpn_sockaddr_ex(const struct openvpn_sockaddr *addr, - const char *separator, - const unsigned int flags, - struct gc_arena *gc) -{ - return print_sockaddr_ex(&addr->addr.sa, separator, flags, gc); -} - -static inline -const char * print_openvpn_sockaddr(const struct openvpn_sockaddr *addr, struct gc_arena *gc) { @@ -771,22 +761,6 @@ return false; } -static inline in_addr_t -addr_host(const struct openvpn_sockaddr *addr) -{ - /* - * "public" addr returned is checked against ifconfig for - * possible clash: non sense for now given - * that we do ifconfig only IPv4 - */ - if (addr->addr.sa.sa_family != AF_INET) - { - return 0; - } - return ntohl(addr->addr.in4.sin_addr.s_addr); -} - - static inline bool addrlist_port_match(const struct openvpn_sockaddr *a1, const struct addrinfo *a2) { diff --git a/tests/unit_tests/openvpn/test_buffer.c b/tests/unit_tests/openvpn/test_buffer.c index 6b860b4..0fb4697 100644 --- a/tests/unit_tests/openvpn/test_buffer.c +++ b/tests/unit_tests/openvpn/test_buffer.c @@ -49,7 +49,6 @@ #define teststr1 "one" #define teststr2 "two" #define teststr3 "three" -#define teststr4 "four" #define assert_buf_equals_str(buf, str) \ assert_int_equal(BLEN(buf), strlen(str)); \ diff --git a/tests/unit_tests/openvpn/test_pkt.c b/tests/unit_tests/openvpn/test_pkt.c index 741c982..ebffabe 100644 --- a/tests/unit_tests/openvpn/test_pkt.c +++ b/tests/unit_tests/openvpn/test_pkt.c @@ -69,11 +69,6 @@ return "dummy print_link_socket_actual from unit test"; } -struct test_pkt_context { - struct tls_auth_standalone tas_tls_auth; - struct tls_auth_standalone tas_crypt; -}; - const char static_key[] = "\n" "-----BEGIN OpenVPN Static key V1-----\n" "37268ea8f95d7f71f9fb8fc03770c460\n"