From patchwork Wed Aug 10 22:43:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2649 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director14.mail.ord1d.rsapps.net ([172.27.255.58]) by backend30.mail.ord1d.rsapps.net with LMTP id YAdFIYDB9GKJTgAAIUCqbw (envelope-from ) for ; Thu, 11 Aug 2022 04:44:48 -0400 Received: from proxy14.mail.iad3a.rsapps.net ([172.27.255.58]) by director14.mail.ord1d.rsapps.net with LMTP id sM0GIYDB9GJwUgAAeJ7fFg (envelope-from ) for ; Thu, 11 Aug 2022 04:44:48 -0400 Received: from smtp33.gate.iad3a ([172.27.255.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy14.mail.iad3a.rsapps.net with LMTPS id oKgwE4vB9GJ5dQAA1+b4IQ (envelope-from ) for ; Thu, 11 Aug 2022 04:44:59 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp33.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: daefe4f6-1951-11ed-aa7b-525400201c3f-1-1 Received: from [216.105.38.7] ([216.105.38.7:58624] helo=lists.sourceforge.net) by smtp33.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 32/CE-07053-081C4F26; Thu, 11 Aug 2022 04:44:48 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1oM3nC-0006OW-9h; Thu, 11 Aug 2022 08:43:51 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oM3nB-0006OQ-NG for openvpn-devel@lists.sourceforge.net; Thu, 11 Aug 2022 08:43:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=Ec1AG0NI5hShJ18k1gep99vJ7axAiw+nunVW+vB56eM=; b=V//Grkb0N74K3ygWOqoMe1S/i8 6485JnLQLkT+YxvC6rNYJD9KPxlAPhl+fPY3GYADeF/Kv8EMedxVoimsSibEN0R6hhKA9SLolQxjS D/ectK2Nc4g/nrpkseoAJ+j9IwDHPWzsC8VmmNI2c1rMxGzQjScAW64obKc3DwWa02vg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding: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=Ec1AG0NI5hShJ18k1gep99vJ7axAiw+nunVW+vB56eM=; b=AeWTiG7MNsPTjosYfKmkJIgqnF CICe3wMVQjh1jMptSGrnNzE/yaRt4GlEg2UHf1riqT31kwyGgiG8Jmas4Y6Bs55pU1oaQr6zNqqCB cglqFTw0n4ug11sWnWTIX66szsKwhOlp7BW9PuofrtEC4OJQLkguw4fWEdASeJw3CFCg=; Received: from mail-lf1-f53.google.com ([209.85.167.53]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1oM3nA-0004ol-Nh for openvpn-devel@lists.sourceforge.net; Thu, 11 Aug 2022 08:43:50 +0000 Received: by mail-lf1-f53.google.com with SMTP id d14so24593774lfl.13 for ; Thu, 11 Aug 2022 01:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc; bh=Ec1AG0NI5hShJ18k1gep99vJ7axAiw+nunVW+vB56eM=; b=oona5n9Hk/uxEMlQfEA/+e+LwUZDXYlqoLTlleKDpYKxwKxmJvFJY4yzeP951jySCH DJoPVlfeBqx343MvQPp55VJTVw9vVo5I7lWe4KkziruowLU6FUUhZXpZTd+3KfyPsUgq UaLkGMZVhf1+FgWsfaz9yBvgYscjI+BuKpJ2ORqeR4yeNtMIEX70R/TLIJR5aqX5QNoc fkNMtiF+jAo8bUCOeVW8jos0jTTl9c2Vb6cV4TWAOeq86x8TIRiKZonnXInoDe/4b4rs F2BBPKooAwOk6MkRgGedXhT2rTsat4E3OqRrGydbSHr0mMUx6ZeC0ISJvSkUVCkIJFQv Gfkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc; bh=Ec1AG0NI5hShJ18k1gep99vJ7axAiw+nunVW+vB56eM=; b=VL/GOT1+tIYmYBURP3ROOSovjzedWafs6gmA5CJ63OwNM3tETdazsW34HkY49xfNjc DMQnG4yxIlUZ+JiKs55U9bZIR62KV/Zzz/33SZmpMauod23X1GTP/demTYJL3uObQft9 /Nm13O2i4i6ZIM4QnyTs2G+AxvAp63kNJGKD2+p7/F8PpsAlES9978ku3pxiB+uCOhHp 3YL4tQ1zEnmJmGFnm/25BBy+g+NxdoTbj33MtyOIZbkO+6o7utTib1ssNdxUP7oKg4Qi gQEQiL33LiCT13Pf9VXMOyTMUx0ZStqZNrvamF+oKQNEGdvzqo5D3nKAPrv1oOXK52XI kFRQ== X-Gm-Message-State: ACgBeo2SdrO6blsH1yD0wkJGwQabhw0LXBncMBxHhmmD4EmnTORK8uVD 8tWafvWTCLcdKwEbxdLsVOLGC1KKMcs= X-Google-Smtp-Source: AA6agR5jPA6uXm4jJw63RsoG730a2bM0GcM8E0IDzr42XF6E4m2I7wj/x+Nn8d7Yo8zxXzDpZGuyrw== X-Received: by 2002:ac2:43c8:0:b0:48a:f0e9:fc06 with SMTP id u8-20020ac243c8000000b0048af0e9fc06mr11252130lfl.458.1660207421699; Thu, 11 Aug 2022 01:43:41 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat4.panoulu.net. [185.38.2.4]) by smtp.gmail.com with ESMTPSA id s16-20020a05651c049000b0025e6a598019sm722561ljc.131.2022.08.11.01.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 01:43:41 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 11 Aug 2022 11:43:30 +0300 Message-Id: <20220811084330.187-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220811083549.101-1-lstipakov@gmail.com> References: <20220811083549.101-1-lstipakov@gmail.com> X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: Lev Stipakov Some adapters create multiple device interfaces and we need to enumerate all of them. Signed-off-by: Lev Stipakov --- v2: uncrustify Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.53 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.53 listed in list.dnswl.org] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1oM3nA-0004ol-Nh Subject: [Openvpn-devel] [PATCH v2] tun: properly handle device interface list 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: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Some adapters create multiple device interfaces and we need to enumerate all of them. Signed-off-by: Lev Stipakov --- v2: uncrustify src/openvpn/tun.c | 35 ++++++++++++++++++++--------------- src/openvpn/tun.h | 2 +- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index d9a01704..d48681a2 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -3776,21 +3776,27 @@ get_device_instance_id_interface(struct gc_arena *gc) goto next; } - struct device_instance_id_interface *dev_if; - ALLOC_OBJ_CLEAR_GC(dev_if, struct device_instance_id_interface, gc); - dev_if->net_cfg_instance_id = (unsigned char *)string_alloc((char *)net_cfg_instance_id, gc); - dev_if->device_interface_list = string_alloc(BSTR(&dev_interface_list), gc); - - /* link into return list */ - if (!first) - { - first = dev_if; - } - if (last) + char *dev_if = BSTR(&dev_interface_list); + while (strlen(dev_if) > 0) { - last->next = dev_if; + struct device_instance_id_interface *dev_iif; + ALLOC_OBJ_CLEAR_GC(dev_iif, struct device_instance_id_interface, gc); + dev_iif->net_cfg_instance_id = (unsigned char *)string_alloc((char *)net_cfg_instance_id, gc); + dev_iif->device_interface = string_alloc(dev_if, gc); + + /* link into return list */ + if (!first) + { + first = dev_iif; + } + if (last) + { + last->next = dev_iif; + } + last = dev_iif; + + dev_if += strlen(dev_if) + 1; } - last = dev_if; next: RegCloseKey(dev_key); @@ -6466,12 +6472,11 @@ tun_try_open_device(struct tuntap *tt, const char *device_guid, const struct dev { const struct device_instance_id_interface *dev_if; - /* Open Wintun adapter */ for (dev_if = device_instance_id_interface; dev_if != NULL; dev_if = dev_if->next) { if (strcmp((const char *)dev_if->net_cfg_instance_id, device_guid) == 0) { - path = dev_if->device_interface_list; + path = dev_if->device_interface; break; } } diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 8ec8f51f..f55315ee 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -382,7 +382,7 @@ struct panel_reg struct device_instance_id_interface { LPBYTE net_cfg_instance_id; - const char *device_interface_list; + const char *device_interface; struct device_instance_id_interface *next; };