From patchwork Sun Sep 14 13:47:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4413 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6ad9:b0:671:5a2c:6455 with SMTP id v25csp759342maw; Sun, 14 Sep 2025 06:47:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWiN+H308gJlmd8Jw6CoqSk782Z1V0jjDZNg1qJ7dtBkc95Bs4a0TOLHhrqLl6AB4NaEjCBVlH0ipg=@openvpn.net X-Google-Smtp-Source: AGHT+IHSPwIAAuVYEq3dZygQYxqD/f8GQMk4e8txE0WHgNIZK8MEU/ye+Ec7M+e/XwRTTcqclOxw X-Received: by 2002:a05:6870:524a:b0:30b:e02b:c7f5 with SMTP id 586e51a60fabf-32e566c7c69mr4287967fac.40.1757857650005; Sun, 14 Sep 2025 06:47:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1757857649; cv=none; d=google.com; s=arc-20240605; b=L7NK0br+Nfv6lCuHB4kVsjKeFkLyLLx8MbbrGTHHrpoEB6FuCZN9mOz8DOSEejjCE2 rE/ZsXBaH0BUsXgYoA+MiSwQXZVnQwbCDVagf4oK5AwzW6SarYhrF2qeCnvWWGhuAhuu nX7H5BEjAGPBwfTO8B2fnCnPGhdojcYv84gQLYzUSZEUSemZgrlQrFxsSx/V5U/hTY9S 7WyrI3FBB7Mt70Dz2W3djMGoTCmwH3Zwol3zN7k98cLsUSmjcnyXF7qyZ24gtzLgJWj1 1Xntt197o4Fn6aBvYtvtgq/YakKypaQaAIEq+qnScV2n1LRBnf/xykH3Y47gI+eoOZbn dvSA== 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=eymOHd0Q8qJJ7A3hzpQf4ZC0HtvEs6hwaNz7mLYIACM=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=YHtIKd//tw2qW12bLkW+hS1QmaaeEH8iw/4AqekdHvcVJQ3/yHnw9GI7Cin50GIYAs 9bGQBGHKggz21Lqda54+mS/2fksN9v1NAH5xK7QqQwy7BmTMEt9nSL5Yd4ZeWQZODJfe Z5GY+NDLXTUtHS/DjPGgDLP+GpbcBlPL38umy7fp+j0Zkynaj/Ljh2gXenD20c5DeHxR FmZjoNhdZillurT7bajAjYLbcrOKDwF9A16sfFW9pNTvulTHxpR9FtNMm7Z9V52fqfL2 EozeMjp1/UhQB2nrsTEJRJ6SmssWskvJ/Q8MafvcUfWaEtR9qTeh6f8OaXmrLj4tJKIm k0ZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=DPji4NvC; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=lP7mmgbo; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Z+AKwJer; 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-331501eecfesi478186fac.64.2025.09.14.06.47.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Sep 2025 06:47:29 -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=pass header.i=@lists.sourceforge.net header.s=beta header.b=DPji4NvC; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=lP7mmgbo; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Z+AKwJer; 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=eymOHd0Q8qJJ7A3hzpQf4ZC0HtvEs6hwaNz7mLYIACM=; b=DPji4NvC2h4BW5KrpI6ZY44g53 GEVt97asyp+3TRMOIzd6yVDQxbQEtfgvnSFYAPq6c99jq6R7s+J6ZWa+bgBAN4g/s+Gqt/tr5sBXa ZeFgNKO0PJxkc0TewVf5fy0SkjNkjOo/AoxOPx5SSn3+CIqVt7v9LnZn5sl+OxbsMjsA=; 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 1uxn4i-0001Yy-4E; Sun, 14 Sep 2025 13:47:28 +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 1uxn4g-0001Yo-Ui for openvpn-devel@lists.sourceforge.net; Sun, 14 Sep 2025 13:47: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=3uEXXsncokYe6gTEXgqO0ZdxDeE/FU4Iw9pFpIvgupo=; b=lP7mmgbohm4oc7BH9VARZOfgXU SwhLJQY3jhv+hlfqIRhLX+uSLak8WCbclIkQAj4xUnRUfH9moevGX29AhJuGZ+VqlxcHXgmWUWkP6 w2bsNuWAUDrBDdCd+erYMwRxqN0m8TFCn8WJFPy9laUuOomMVea81floExJHC7tJuX7M=; 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=3uEXXsncokYe6gTEXgqO0ZdxDeE/FU4Iw9pFpIvgupo=; b=Z+AKwJerfJFcNtOspKaIHZXLZ2 40n2MlbVPFn1YbsVoRC4F9FbEaAZcFcES3ZHdHLuZJG5ZGR40u2MSdI3bv1CIM6U0kiXxqXVRvzvG W68nDranOYkBoOw0OJT5OmEwHk3RA93xa7A//z3ngb1jBOTtgodh6VVUUPWX8OsM4o8w=; 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 1uxn4f-0004gh-WA for openvpn-devel@lists.sourceforge.net; Sun, 14 Sep 2025 13:47:26 +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 58EDlEHX019332 for ; Sun, 14 Sep 2025 15:47:14 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 58EDlEYI019331 for openvpn-devel@lists.sourceforge.net; Sun, 14 Sep 2025 15:47:14 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Sun, 14 Sep 2025 15:47:08 +0200 Message-ID: <20250914134713.19315-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-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 Since these are only local variables, these are trivial changes. Change-Id: I0f2fff8358d4645c4ace504c65ae8559a68794cc Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- 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: 1uxn4f-0004gh-WA Subject: [Openvpn-devel] [PATCH v1] ps: Clean up conversion warnings in journal_add function 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?1843247343177247635?= X-GMAIL-MSGID: =?utf-8?q?1843247343177247635?= From: Frank Lichtenheld Since these are only local variables, these are trivial changes. Change-Id: I0f2fff8358d4645c4ace504c65ae8559a68794cc Signed-off-by: Frank Lichtenheld 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/+/1163 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/ps.c b/src/openvpn/ps.c index eae03e3..e95a33b 100644 --- a/src/openvpn/ps.c +++ b/src/openvpn/ps.c @@ -334,26 +334,22 @@ static void journal_add(const char *journal_dir, struct proxy_connection *pc, struct proxy_connection *cp) { - struct gc_arena gc = gc_new(); struct openvpn_sockaddr from, to; - socklen_t slen, dlen; - int fnlen; - char *jfn; - int fd; - slen = sizeof(from.addr); - dlen = sizeof(to.addr); + socklen_t slen = sizeof(from.addr); + socklen_t dlen = sizeof(to.addr); if (!getpeername(pc->sd, (struct sockaddr *)&from.addr.sa, &slen) && !getsockname(cp->sd, (struct sockaddr *)&to.addr.sa, &dlen)) { + struct gc_arena gc = gc_new(); const char *f = print_openvpn_sockaddr(&from, &gc); const char *t = print_openvpn_sockaddr(&to, &gc); - fnlen = strlen(journal_dir) + strlen(t) + 2; - jfn = (char *)malloc(fnlen); + size_t fnlen = strlen(journal_dir) + strlen(t) + 2; + char *jfn = (char *)malloc(fnlen); check_malloc_return(jfn); snprintf(jfn, fnlen, "%s/%s", journal_dir, t); dmsg(D_PS_PROXY_DEBUG, "PORT SHARE PROXY: client origin %s -> %s", jfn, f); - fd = platform_open(jfn, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP); + int fd = platform_open(jfn, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP); if (fd != -1) { if (write(fd, f, strlen(f)) != strlen(f)) @@ -368,8 +364,8 @@ msg(M_WARN | M_ERRNO, "PORT SHARE: unable to write journal file in %s", jfn); free(jfn); } + gc_free(&gc); } - gc_free(&gc); } /*