From patchwork Tue Nov 26 10:26:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3961 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:92cd:b0:5db:5963:ef83 with SMTP id e13csp1928778mai; Tue, 26 Nov 2024 02:27:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUGe+4imVQN0qaXeflbZFIxXuuppB/pUqkr91xaUmbImJL2+EFdOFi8mnjoEWq6w0alKs6BtSqPqmQ=@openvpn.net X-Google-Smtp-Source: AGHT+IFYbl0zIn2FbLgU6FwkejzkXXG87w5pkRVjqYOZhoIhBxHz9ppBXSkcW0EOEWv78NYJ58Om X-Received: by 2002:a05:6808:16a1:b0:3e7:a15c:467b with SMTP id 5614622812f47-3e915a27b92mr15142436b6e.34.1732616841717; Tue, 26 Nov 2024 02:27:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732616841; cv=none; d=google.com; s=arc-20240605; b=MIx9RuzK+4HdM7DXY0BUt0AThMtqz9zoekweCkeeOfS+w1PoCiYVXaZgs7z4o4RkIb CS8HdPjGKtnAxhoy7xwU3HZJRCPyKhGl5VUsjprAJ5SXRtHdCv6/ee+pifI/WAOHkcIE 2dpfRXAM7/AaUXMklg7l0ik54jesYyszhzgBiQgR4UBwkoGuszN3CaRjIo9AYITezsld zPFOiS22f0Ptvf0xNDKiT6xCcV2xgZPOAT43P0Aq4k0fwHRT1RYBYik80N3+F5l/1F8K 6PP9TmE9l8Lt2hsIBrc3861dTEAX/psg2W3hXtQop+l+tAITrmlF9vVth1JvUZAWZqkg 2kYQ== 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=TE43d0XCL7C8xJb78C+/ZP0De/8Xg7Dnm7pZSoV/Tdk=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=GqR57B8M6azQ9huI2x1RQEg4OTIACe4Npb2c382c1rEMwBaMea7PxzurgP/IvnukTN cW3Pup2YoeS3Lw8lJYxJzqmApBCYbgYPOursdgVb8zzFbED1/X8x/IzlMOUg/0/DhYoM bMcnSwbt0Ck6Bf0dYLOuoC47kXgH2qBoqfI+kK1ZZJCZKDYjznWVqnq/f2GHBbhYuMsu OmC4RNGzL98NqAmfdgWyvWtzH2vi1l7Jw7qkFm3YVxnQF45SMN/TRCZ8PYqrS/A24KQK RxOeCt90vdwpiuxBOnEFhzt1V5pm8ddunpUdH10A0KfFOyzbe1KAstLh1/X+ojePiwWO O3BQ==; 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=BVaack1i; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GndKgr3P; 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 5614622812f47-3ea331ce684si2656689b6e.266.2024.11.26.02.27.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Nov 2024 02:27:21 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=BVaack1i; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GndKgr3P; 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 1tFsmk-0002e9-2M; Tue, 26 Nov 2024 10:27:10 +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 1tFsmg-0002e2-MY for openvpn-devel@lists.sourceforge.net; Tue, 26 Nov 2024 10:27:06 +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=ByKkRHkpZ8bNrgshqCAxl/Hu+3pN4kuPf7QO/K0YXA0=; b=BVaack1iXhFUbqDURViMr0mck7 nysSr4DCl8RdhYjxYIJxQa1TsgwFs7JTLyvtyziNs5fDMlMYqttrH+l/hRMf0B4VwNr2FDzRlQPPe m2ylp4Z40GXbqEpcQYW9FqC3l7kozlGydexhGI12ysQnoswLcdNQP9eJy2QgptwVdyvg=; 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=ByKkRHkpZ8bNrgshqCAxl/Hu+3pN4kuPf7QO/K0YXA0=; b=GndKgr3PkR+wWpCduMg0PstZWQ 1T0s1UXn6SnSkodhhwVCFFtuCqMaajvmOXLiipl4KuMJU2lrlfFlPl68MvLA4FSZXgRtfxKdckiho igKOGMnPqx4U024VOFtWaNgCu0pm/i3IYpFkKRT8r/3D+1dMII5mX1Pdt4V51hwMBtxw=; 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 1tFsme-0007Iu-EK for openvpn-devel@lists.sourceforge.net; Tue, 26 Nov 2024 10:27:06 +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 4AQAQqr8018916 for ; Tue, 26 Nov 2024 11:26:52 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 4AQAQquF018915 for openvpn-devel@lists.sourceforge.net; Tue, 26 Nov 2024 11:26:52 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 26 Nov 2024 11:26:51 +0100 Message-ID: <20241126102651.18905-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-1.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: Frank Lichtenheld Add some missing "<" to trailing comments to make sure they apply to the correct line. Change-Id: Ib88ce925b20c5912de489ef1b62615c4b87d365c Signed-off-by: Frank Lichtenheld Acked-by: Lev Stipakov --- Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in bl.score.senderscore.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Headers-End: 1tFsme-0007Iu-EK Subject: [Openvpn-devel] [PATCH v1] Fix wrong doxygen comments 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?1816780437384877263?= X-GMAIL-MSGID: =?utf-8?q?1816780437384877263?= From: Frank Lichtenheld Add some missing "<" to trailing comments to make sure they apply to the correct line. Change-Id: Ib88ce925b20c5912de489ef1b62615c4b87d365c Signed-off-by: Frank Lichtenheld Acked-by: Lev Stipakov --- 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/+/820 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Lev Stipakov diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 10ee9f6..043b240 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -929,10 +929,10 @@ struct pull_filter { -#define PUF_TYPE_UNDEF 0 /** undefined filter type */ -#define PUF_TYPE_ACCEPT 1 /** filter type to accept a matching option */ -#define PUF_TYPE_IGNORE 2 /** filter type to ignore a matching option */ -#define PUF_TYPE_REJECT 3 /** filter type to reject and trigger SIGUSR1 */ +#define PUF_TYPE_UNDEF 0 /**< undefined filter type */ +#define PUF_TYPE_ACCEPT 1 /**< filter type to accept a matching option */ +#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; char *pattern; @@ -3846,14 +3846,14 @@ * Check file/directory sanity * */ -#ifndef ENABLE_SMALL /** Expect people using the stripped down version to know what they do */ +#ifndef ENABLE_SMALL /* Expect people using the stripped down version to know what they do */ -#define CHKACC_FILE (1<<0) /** Check for a file/directory presence */ -#define CHKACC_DIRPATH (1<<1) /** Check for directory presence where a file should reside */ -#define CHKACC_FILEXSTWR (1<<2) /** If file exists, is it writable? */ -#define CHKACC_ACPTSTDIN (1<<3) /** If filename is stdin, it's allowed and "exists" */ -#define CHKACC_PRIVATE (1<<4) /** Warn if this (private) file is group/others accessible */ -#define CHKACC_ACCEPT_URI (1<<5) /** If filename is a URI, no check is done unless it starts with file: */ +#define CHKACC_FILE (1<<0) /**< Check for a file/directory presence */ +#define CHKACC_DIRPATH (1<<1) /**< Check for directory presence where a file should reside */ +#define CHKACC_FILEXSTWR (1<<2) /**< If file exists, is it writable? */ +#define CHKACC_ACPTSTDIN (1<<3) /**< If filename is stdin, it's allowed and "exists" */ +#define CHKACC_PRIVATE (1<<4) /**< Warn if this (private) file is group/others accessible */ +#define CHKACC_ACCEPT_URI (1<<5) /**< Do not check URIs, unless they start with file: */ static bool check_file_access(const int type, const char *file, const int mode, const char *opt) diff --git a/src/openvpnmsica/msica_arg.h b/src/openvpnmsica/msica_arg.h index 6cd272c..cec046f 100644 --- a/src/openvpnmsica/msica_arg.h +++ b/src/openvpnmsica/msica_arg.h @@ -37,8 +37,8 @@ */ struct msica_arg { - struct msica_arg *next; /** Pointer to the next argument in the sequence */ - TCHAR val[]; /** Zero terminated argument string */ + struct msica_arg *next; /**< Pointer to the next argument in the sequence */ + TCHAR val[]; /**< Zero terminated argument string */ }; @@ -47,8 +47,8 @@ */ struct msica_arg_seq { - struct msica_arg *head; /** Pointer to the first argument in the sequence */ - struct msica_arg *tail; /** Pointer to the last argument in the sequence */ + struct msica_arg *head; /**< Pointer to the first argument in the sequence */ + struct msica_arg *tail; /**< Pointer to the last argument in the sequence */ }; diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c index 5ffb5b3..154fff4 100644 --- a/src/openvpnmsica/openvpnmsica.c +++ b/src/openvpnmsica/openvpnmsica.c @@ -59,9 +59,10 @@ * Local constants */ -#define MSICA_ADAPTER_TICK_SIZE (16*1024) /** Amount of tick space to reserve for one TAP/TUN adapter creation/deletition. */ +/** Amount of tick space to reserve for one TAP/TUN adapter creation/deletition. */ +#define MSICA_ADAPTER_TICK_SIZE (16 * 1024) -#define FILE_NEED_REBOOT L".ovpn_need_reboot" +#define FILE_NEED_REBOOT L".ovpn_need_reboot" #define OPENVPN_CONNECT_ADAPTER_SUBSTR L"OpenVPN Connect" @@ -88,7 +89,9 @@ free(szSequence); if (uiResult != ERROR_SUCCESS) { - SetLastError(uiResult); /* MSDN does not mention MsiSetProperty() to set GetLastError(). But we do have an error code. Set last error manually. */ + /* MSDN does not mention MsiSetProperty() to set GetLastError(). But we do have an error + * code. Set last error manually. */ + SetLastError(uiResult); msg(M_NONFATAL | M_ERRNO, "%s: MsiSetProperty(\"%" PRIsLPTSTR "\") failed", __FUNCTION__, szProperty); return uiResult; } diff --git a/src/openvpnmsica/openvpnmsica.h b/src/openvpnmsica/openvpnmsica.h index 6640d7e..7aacdf3 100644 --- a/src/openvpnmsica/openvpnmsica.h +++ b/src/openvpnmsica/openvpnmsica.h @@ -38,7 +38,7 @@ */ struct openvpnmsica_thread_data { - MSIHANDLE hInstall; /** Handle to the installation session. */ + MSIHANDLE hInstall; /**< Handle to the installation session. */ }; diff --git a/src/tapctl/tap.h b/src/tapctl/tap.h index 9c403cc..680c13a 100644 --- a/src/tapctl/tap.h +++ b/src/tapctl/tap.h @@ -135,11 +135,11 @@ */ struct tap_adapter_node { - GUID guid; /** Adapter GUID */ - LPTSTR szzHardwareIDs; /** Device hardware ID(s) */ - LPTSTR szName; /** Adapter name */ + GUID guid; /**< Adapter GUID */ + LPTSTR szzHardwareIDs; /**< Device hardware ID(s) */ + LPTSTR szName; /**< Adapter name */ - struct tap_adapter_node *pNext; /** Pointer to next adapter */ + struct tap_adapter_node *pNext; /**< Pointer to next adapter */ };