From patchwork Mon Dec 15 14:58:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4683 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7001:1490:b0:7b1:439f:bdf with SMTP id bf16csp1869394mac; Mon, 15 Dec 2025 06:58:53 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUzIq75trpHhNBXP3bIZ9NYhgfUWOSYE/EhEEW/R6foC4b2yRJn3kYqZE9b+Xk/76t6/PVLB+tAVyE=@openvpn.net X-Google-Smtp-Source: AGHT+IGse7feZHYN6k3aV1aSc1gLdMFjLCVfy5Xk7sYOW0ZBljJXv/O4c9msEcMr0fGTn7zw7DAn X-Received: by 2002:a05:6870:8124:b0:3ec:3055:7cb0 with SMTP id 586e51a60fabf-3f5f8cd69bamr5668750fac.49.1765810733122; Mon, 15 Dec 2025 06:58:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1765810733; cv=none; d=google.com; s=arc-20240605; b=Wo6MGtstYc5qmQ1xXeU5ufddY1GEHoK6mvuyzEZ918D1DuYcLySoYab8HT1EknJwKO Bu+9X7sc5eCTmG9x3rXfr7wtQmVVWJNuf1bKu5Xa4FUj87jL4sFaQO7ePdjUsiDqDV4F jG1QUQT12M8/zTgOdCLKoGtTaUxtdwkkZQ3V5eUEFLev8VyS5zWf+ryuhRjpDwf8+SyG 2mtGxGxMEIrU4f+zVucg2nc7yLiChTtaG0mSQcs8bHSVXxobSrZVbLRuBzzpTyOsQCsS EVarNdxNF8PoWL1zZc88B2eCTCEFNKoZTgM1UXTuteQldj05kX52XLvdRWkjC5Hq+V78 hLQw== 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=hiGmhYG1+iO9B9pDxNNW25sbTaXrtQU8VdOpahU7C/k=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=DuaHP/UHVJUYsMx0A+CQwEeygeFEblW/v55rue1bFz5xMlDmu3+NvY3yYvB835Umg6 5IvFmNsCvCXdREa4FklKt1a5pYKMEKw7PM1COVIl+7kCh+IwEn72qb72wIP4Ig4ajpnA KVIWA+279v2zjhr/CXPUUmIaO4MpC1Dye63pzx+WygosOQVMHcvkeVeG0ZOw+4Mf1SoX uKkXfUfvEevuFFHilQOmWB8DPLaFA14mJCwnNfPq+UygwISqCX1+hBd8jgDWRi8YIeBN ye24HL3v6f5LprpmWVqWmFMJAfpYE9UKE+wXvSyAmSmZrrJWrg/jEVxPVVHsKZeworPM K4Ew==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=DGt7lzuA; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=byezVJOt; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UX+vZJk8; 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-3f614b997b6si5413108fac.68.2025.12.15.06.58.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Dec 2025 06:58:53 -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=DGt7lzuA; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=byezVJOt; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UX+vZJk8; 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=hiGmhYG1+iO9B9pDxNNW25sbTaXrtQU8VdOpahU7C/k=; b=DGt7lzuAkLG2Cz/ezp2syFWq2+ TJBL6SkKsucnd5oUj2NToNxgL5yRsLORnb9WAD4dz/F+Q7+eyH7+iTNVfZWuENUlzJSjeDi8LMUpV HNxvb2NF0RLT00GbrMCVfNuGWydHGZwMDEfkEjkCYeqXLglU6C3l/1gf4+ERDzkhfRWg=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vVA2D-00008E-Rk; Mon, 15 Dec 2025 14:58:49 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vVA2C-000088-FM for openvpn-devel@lists.sourceforge.net; Mon, 15 Dec 2025 14:58:48 +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=MfwtkBNqDbnfFxbfdB5eXkqM9T8RLo+p+FUvtoFguwE=; b=byezVJOts6KEKPOhGPK65mogtq DnzExFw86Fz0vl3RODb3yfS9jslHhEq1XubgzuYnnZRseliMgpsT+tsiNQb7djTw+cDpZE07ghdtt nkcszAuRkzKr8q7D5KnliYOkKMjdUdL7ByNYyeAUoqnq5bOmGwnwkyReK9yUJ+QOF7eE=; 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=MfwtkBNqDbnfFxbfdB5eXkqM9T8RLo+p+FUvtoFguwE=; b=UX+vZJk8c2Y7xaA/Mieqmb9LpE luEpjDgobOCHvnF480PZCW70Uw7RsK+cCwIzzkGvhiAuby38QblyMKmfdz/oVHzH8cTvvMzfF586X XX7YyFgTF5vibCPEFucO7YX6g8SuliQr6G2skAqcddoAMKLnaLxTMIiCRSW0v0NFp3II=; 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 1vVA2B-0001xD-Es for openvpn-devel@lists.sourceforge.net; Mon, 15 Dec 2025 14:58:48 +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 5BFEwfoc018326 for ; Mon, 15 Dec 2025 15:58:41 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 5BFEweBI018325 for openvpn-devel@lists.sourceforge.net; Mon, 15 Dec 2025 15:58:40 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 15 Dec 2025 15:58:35 +0100 Message-ID: <20251215145840.18310-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-2.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 Mostly make required casts explicit. Change-Id: I88cd7e1ebb49e97db33bad75c4fbbe23d196e964 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openvpn.net/c [...] 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: 1vVA2B-0001xD-Es Subject: [Openvpn-devel] [PATCH v9] multi: Fix various 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?1848509657269548541?= X-GMAIL-MSGID: =?utf-8?q?1851586755531246116?= From: Frank Lichtenheld Mostly make required casts explicit. Change-Id: I88cd7e1ebb49e97db33bad75c4fbbe23d196e964 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1313 --- 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/+/1313 This mail reflects revision 9 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 20d72c1..92eac6f 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -245,11 +245,6 @@ #endif -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - #ifdef ENABLE_ASYNC_PUSH static uint32_t /* @@ -2809,8 +2804,8 @@ multi_process_file_closed(struct multi_context *m, const unsigned int mpp_flags) { char buffer[INOTIFY_EVENT_BUFFER_SIZE]; - size_t buffer_i = 0; - int r = read(m->top.c2.inotify_fd, buffer, INOTIFY_EVENT_BUFFER_SIZE); + ssize_t buffer_i = 0; + ssize_t r = read(m->top.c2.inotify_fd, buffer, INOTIFY_EVENT_BUFFER_SIZE); while (buffer_i < r) { @@ -2942,21 +2937,23 @@ static inline unsigned int compute_wakeup_sigma(const struct timeval *delta) { + ASSERT(delta->tv_sec >= 0); + ASSERT(delta->tv_usec >= 0); if (delta->tv_sec < 1) { /* if < 1 sec, fuzz = # of microseconds / 8 */ - return delta->tv_usec >> 3; + return (unsigned int)(delta->tv_usec >> 3); } else { /* if < 10 minutes, fuzz = 13.1% of timeout */ if (delta->tv_sec < 600) { - return delta->tv_sec << 17; + return (unsigned int)(delta->tv_sec << 17); } else { - return 120000000; /* if >= 10 minutes, fuzz = 2 minutes */ + return 120 * 1000000; /* if >= 10 minutes, fuzz = 2 minutes */ } } } @@ -3743,7 +3740,7 @@ for (i = 0; i < parm.packet_size; ++i) { - ASSERT(buf_write_u8(&buf, get_random() & 0xFF)); + ASSERT(buf_write_u8(&buf, (uint8_t)(get_random() & 0xFF))); } for (i = 0; i < parm.n_packets; ++i) @@ -3959,10 +3956,6 @@ return count; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static void management_delete_event(void *arg, event_t event) {