From patchwork Sat Dec 13 08:42:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4680 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7001:1490:b0:7b1:439f:bdf with SMTP id bf16csp672212mac; Sat, 13 Dec 2025 00:42:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXan5CnnW8Pu+zOraos+9KP5BH4DyaT7HnwqyoRnK6ZziMh6qTvcN6Btk+0BXIurXeucQluMzBnyiM=@openvpn.net X-Google-Smtp-Source: AGHT+IE8ZrEATSKCXDa7aCQlmZZaFJr04y/Zbb+uKenweu33CzQ+Mkt0suW6ZOwsb0f7NcLnEfmf X-Received: by 2002:a05:6870:a796:b0:3f5:532c:e2af with SMTP id 586e51a60fabf-3f5f9838450mr2724812fac.29.1765615365973; Sat, 13 Dec 2025 00:42:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1765615365; cv=none; d=google.com; s=arc-20240605; b=IhiFj6tLtkr2fZnJvNucG+JkQeddJljqNp7QQQl0SOltRHKZUhtRiZMdm8oiGLhS7J uMty8PWDzccL7KU6JGSANynUa4j/XIr5zWMR7/0pqCo7arwNaWA1VaPuxEYbPWJVlzUF QwIwq8D0gXbfBDZfd/TvTtyTcgklUWxBVSXwDsk1KkNb9CMUZpFgkrev3mXffInuZpUg d/u10gQNIXKxI6YKMhgwcS/DNOz8wW0QIB9ZkxqYdsSAG/rASBvVmfevm1M8/x0UByRh a6XsCmyl5fcrEtJl0+hu0JbjSBHS8HJFglkcmzDBCyicgT6OLnULl13TKz3gqUvca/e6 mFEA== 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:dkim-signature; bh=qAhnEF7gEMrQzK4tCHCQvOrp7FncCGWBv4qf6cLOT8M=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=JtC4bcl3kDBZci53zrksZj7mh/P85HfEo531DJF4wcDX9s3wKa2QsMwOgy0cKiGcdL CC89drpTt/Lcp2Jnm5yBM9YJdEs3R5uvFR/oviFCKqBLMTnwstEKwiFIF5kKH89UNAVK ot55Tm+vDOcChGCHknmO8mEcX8FsbpAVMA2s1VRW0GU3hBawLBFMHQi266k2r50qu2DG 5vAQnB656cuQOTwPmmCliWNsnudP/CztmTmP8E3nIqPyzFwGD6kA41GSauPCWliGXcvD cOdc3cTJ6+3dUfYk5bCxP31WPPGYSdtQT11zYrQCvqww1kF2RMyZStjxXxktw44q62i3 WwKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=C3d4u8Fs; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=IrXs2Y61; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mvHgRyYu; 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-3f614dfdc70si1149092fac.128.2025.12.13.00.42.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Dec 2025 00:42:45 -0800 (PST) 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=pass header.i=@lists.sourceforge.net header.s=beta header.b=C3d4u8Fs; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=IrXs2Y61; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mvHgRyYu; 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 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qAhnEF7gEMrQzK4tCHCQvOrp7FncCGWBv4qf6cLOT8M=; b=C3d4u8FsBkQ8OPZKZ3/fiFgffB dgBpKnKv2tumtcD80a0HwSmGgUHYzsdPRAAfkKjSezO934K9ASzC2XiTFESOeYEgEmgnYF9/KOmfB AofjBmejiwVrHe9vd/DMv05nvv+TQaJIVg3j1qy1ZsykSMnVqDZvzmlmQdAI2eeYhMVM=; 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 1vULD7-0002PJ-4o; Sat, 13 Dec 2025 08:42:41 +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 1vULD5-0002PB-2s for openvpn-devel@lists.sourceforge.net; Sat, 13 Dec 2025 08:42:39 +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=5fi+R8OrWrkwhqak3cU7dzzEhvzAXvTCdYGbm251XQE=; b=IrXs2Y616nA2dI676Yk0AeSuKx 9ng0Ao6X7GTwviBvSF9QXeZ8OpyIUMXWcqHCb81hjcBLQtdE4K+IQ3gcQmLCV6x7PTIRbRIQ38vAq tKY6ium8HMmQIynUzhlhhtUQ2i62+jTo3LCU/SSJEua/FV+fQY6YYXJGgM9vC5OoIBIY=; 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=5fi+R8OrWrkwhqak3cU7dzzEhvzAXvTCdYGbm251XQE=; b=mvHgRyYuw+NQvgXJFiJSar3nGN bOBCoE7POX4WJx8GIM4wet76X/LTFkchjZiUp8XMbIhvktoZYCzP6EUhNcWvoB+GfQkIZeJ3rY3mH +wRHCMGA6hR8crYzeZNMxNLZjC8B7EGFuo7Qbw7+QrEHVwEC5pV2Cfc5RwPR0/g6cCE8=; Received: from [193.149.48.134] (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 1vULD3-0001Ly-O5 for openvpn-devel@lists.sourceforge.net; Sat, 13 Dec 2025 08:42:38 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 5BD8gPtc031016 for ; Sat, 13 Dec 2025 09:42:25 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 5BD8gPm5031015 for openvpn-devel@lists.sourceforge.net; Sat, 13 Dec 2025 09:42:25 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Sat, 13 Dec 2025 09:42:18 +0100 Message-ID: <20251213084225.30988-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.51.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", 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: Frank Lichtenheld Just use the correct types. Change-Id: I02db40d7335df7ab037ae1deb3e20f25a9b199bd Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/open [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1vULD3-0001Ly-O5 Subject: [Openvpn-devel] [PATCH v1] options: Avoid some conversion warnings 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?1851381897848355760?= X-GMAIL-MSGID: =?utf-8?q?1851381897848355760?= From: Frank Lichtenheld Just use the correct types. Change-Id: I02db40d7335df7ab037ae1deb3e20f25a9b199bd Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1440 --- 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/+/1440 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 24c3e92..34af0d3 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1154,13 +1154,8 @@ return get_ipv6_addr(ipv6_prefix_spec, &t_addr, &t_bits, M_WARN); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - static char * -string_substitute(const char *src, int from, int to, struct gc_arena *gc) +string_substitute(const char *src, char from, char to, struct gc_arena *gc) { char *ret = (char *)gc_malloc(strlen(src) + 1, true, gc); char *dest = ret; @@ -9306,10 +9301,6 @@ gc_free(&gc); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - bool has_udp_in_local_list(const struct options *options) { diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 555d9dd..0561c25 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -801,7 +801,7 @@ #define PUF_TYPE_IGNORE 2 /**< filter type to ignore a matching option */ #define PUF_TYPE_REJECT 3 /**< filter type to reject and trigger SIGUSR1 */ int type; - int size; + size_t size; char *pattern; struct pull_filter *next; };