From patchwork Tue Nov 11 15:49: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: 4578 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:33c4:b0:7b1:439f:bdf with SMTP id u4csp1972547maf; Tue, 11 Nov 2025 07:49:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWMndpUuCDYj1NVNcQBdOtFwlope4Gxd+Fg2c8muaJMoNk5bn7H+0GFjtukK1IVtaCg9pH06WbD/4M=@openvpn.net X-Google-Smtp-Source: AGHT+IG4XQh1Ik0I1m0SHmcae/uZ2Su4TTsbiv9zV1h07mB9Af7FMO7tScIfctz8mLO9mEvTiCEq X-Received: by 2002:a05:6830:910:b0:7c7:1c87:4f95 with SMTP id 46e09a7af769-7c71c875427mr2688430a34.4.1762876183839; Tue, 11 Nov 2025 07:49:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762876183; cv=none; d=google.com; s=arc-20240605; b=iGhQgghKDrsoVijIMj/jEIYJVFiRmuj8vXq4k+IWkiOAGVNcfOXD1yFqEpQic0rBvU ZkK2bXdCul0zW6qYglnQOF7/4GH6z94pfAq8PzxNqQWl2QjxllQ76V80HhpzuNMqB+mQ PAoodw4O6FcUtc1RHo6LjwakCbtTMAN+tssJDP8GZubC8OWO0QfqQXikgH7466AU6H9a h9S7U2SnHxPJeSQ4NotHjNl7rKbt0L8/O30uQ/LY+qXuhgZYOYmWm+ltYEzwsXMIOFj3 eOLjRNQzdGABRpW61Q606oBpwuoU10QPyokEDwMoNWsXFWIJaYSOsinCllwohWxEmQzL +dvw== 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=UUVmW+XiEosElZWiUl1ZHctWq1ddQPjS9MTqMibVGts=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=EQCN+I/6rg1VNp4XdDKoiIXcXgiw8afVaMle8mmPQ3wQrUaFHI3tpYWMQoor6yQCAp lr/4+E7ycz8qF9gMbnSppo2MFwyPQwLEnZ367wt9in7SwkSs6MOYDYPhnnGDvgO4dwky SWeNSOrHgOciNX1P79BbgTbXcxyBnhiT4QVqxOz4kymk13NiYCZPXqghfllmDPegcGDB 0xBhP0gFsubwAPhIH1kcYz5eHeUAQ9ktZmit6pq8gnt9OFxbIyle4NdufdDsS+h95Hwo HLfnN+PZ3tYM9r3blSlF69Qnj7of9bXBQJJqPIp75eiWd1/vgVXt+aCXsg8kJkKYoq3P CL5w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b="X1gaV/K0"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=T84s58kT; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=DZg36q5A; 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 46e09a7af769-7c6f0f2090fsi4520199a34.106.2025.11.11.07.49.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Nov 2025 07:49:43 -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="X1gaV/K0"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=T84s58kT; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=DZg36q5A; 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=UUVmW+XiEosElZWiUl1ZHctWq1ddQPjS9MTqMibVGts=; b=X1gaV/K06MsGL5nOhFMNQt59sR fiNITHpy/7+qmxW0d+8E2nkWumNIuMe5ld0tDwhkrwCF978a2SZg1mGZNsemduXs3wbK0v9T5e2ef 43YWofdeJIgGE4anflI6ueYVvnu9CBIWybxwU4I48rsQLq5aach2cUHyMRkCSNVdq59A=; Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vIqcl-0002mj-Gk; Tue, 11 Nov 2025 15:49:39 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vIqcj-0002md-IN for openvpn-devel@lists.sourceforge.net; Tue, 11 Nov 2025 15:49:37 +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=FmEvnm71sgizf3XWCL2Ux3J3dzZZvBlm/05dWiTykKA=; b=T84s58kTM6oCvyGh/6oJpf//BP 77l2vjc42K8GF8kbc6pqWdxaS3PHt1PfJzLB9jprbkrbxt1Q4zPiBjVK+ds9IJJcOp3lOoMcJKHqD teYjUfQE+yRkb8T7X6rIQM55hnstOtmf1ZHNWSbWr8a1ax9P8gNeHmuRt/AzgkoS6Vkk=; 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=FmEvnm71sgizf3XWCL2Ux3J3dzZZvBlm/05dWiTykKA=; b=DZg36q5AwFqf2obdfFvvNL6VTS +I/om23dONzH6mXqR8pAwaX41dcAxMgQDCBGurUgYn7tAZ2xE3MeWbyqJtj2qkWtx0ZTXkh/mNB0E zWT9JiO6PY35ROEfbOoBNRNjqJPD60aidpHtwsqOP6o4GQkQepnqaymuYACoKEgJeizw=; 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 1vIqci-00066b-N7 for openvpn-devel@lists.sourceforge.net; Tue, 11 Nov 2025 15:49:37 +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 5ABFnPe9031472 for ; Tue, 11 Nov 2025 16:49:25 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 5ABFnP8t031471 for openvpn-devel@lists.sourceforge.net; Tue, 11 Nov 2025 16:49:25 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 11 Nov 2025 16:49:18 +0100 Message-ID: <20251111154924.31446-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.1 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 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: 1vIqci-00066b-N7 Subject: [Openvpn-devel] [PATCH v4] 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?1848509657269548541?= 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 4 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 2a12398..9e28932 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 */ } } } @@ -3751,7 +3748,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) @@ -3967,10 +3964,6 @@ return count; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static void management_delete_event(void *arg, event_t event) {