From patchwork Wed Aug 10 22:35:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2648 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id eNnxL8S/9GJ7RwAAIUCqbw (envelope-from ) for ; Thu, 11 Aug 2022 04:37:24 -0400 Received: from proxy19.mail.ord1d.rsapps.net ([172.30.191.6]) by director15.mail.ord1d.rsapps.net with LMTP id oCjBL8S/9GIIeQAAIcMcQg (envelope-from ) for ; Thu, 11 Aug 2022 04:37:24 -0400 Received: from smtp20.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.ord1d.rsapps.net with LMTPS id gIR7L8S/9GIEIgAAyH2SIw (envelope-from ) for ; Thu, 11 Aug 2022 04:37:24 -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: smtp20.gate.ord1d.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: d295b4d0-1950-11ed-ac64-525400b8bfda-1-1 Received: from [216.105.38.7] ([216.105.38.7:52526] helo=lists.sourceforge.net) by smtp20.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 43/A5-27696-4CFB4F26; Thu, 11 Aug 2022 04:37:24 -0400 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.94.2) (envelope-from ) id 1oM3fv-0003Df-JU; Thu, 11 Aug 2022 08:36:18 +0000 Received: from [172.30.20.202] (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.94.2) (envelope-from ) id 1oM3fp-0003DY-4v for openvpn-devel@lists.sourceforge.net; Thu, 11 Aug 2022 08:36:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=whmU6J2FcrXoylXKH86Z6ACbVl+jXlXUisjReNT7x5M=; b=da58Jv/LxcYlsfWcEIxg4zNCMM BeEZvQ3VWZFzmClVKZ6F4H1i5mhd0FGyiQpbTDUGekz4TYX+N6WrBGskuCyEAkyHwNWETUipqU8sE mBF30aqiEagatJ7gQ2SOzOw9vjQhuHgXUTWvFIdUhPB9YStsI0U32L8olP5ZRMjJPfUk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=whmU6J2FcrXoylXKH86Z6ACbVl+jXlXUisjReNT7x5M=; b=TbJrFVQ6VrW8TUzhTz4FRIuYmp xE2o8jjC73QLiU+MiXDWBj1DG5Iqte72tHf95FRBQnmHNOAoB8CvTz1jdGjOdEfpCOBI/3NnVDdF1 peJ9nIqO+cn4L2qFfrJOx8ir0MUOfOxQviida4dWsgAvmWzNZihghhpVUCJRBstK11hc=; Received: from mail-lj1-f174.google.com ([209.85.208.174]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1oM3fm-00BSMW-GR for openvpn-devel@lists.sourceforge.net; Thu, 11 Aug 2022 08:36:11 +0000 Received: by mail-lj1-f174.google.com with SMTP id l10so14008522lje.7 for ; Thu, 11 Aug 2022 01:36:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc; bh=whmU6J2FcrXoylXKH86Z6ACbVl+jXlXUisjReNT7x5M=; b=CvOtKgGD88v6lHZEKCRIlihs8KyxALC9jQAek73PqrTwoy897gxnZGgKbSkgFLPIpP G+N4NGq3UquYEf+nyENP9wngPxt90JIvzegKkJ6JYYI9gQIkQImVVP2SkIo9KCC+6JhV Po3eIW0Wrsmv5R0zfaKKt4CybJbwj91e5GNdNQmnMJgLhblP3z5bISJvEwUjJGVL1uvt QH4tEhSmZpy/C9OS7VqM0ZR4/nLT01+b9ri1yBgX2Yd5NjF383hqn/JX35ngcTQuLdSy nFUDTWJmNnRczuz/xuYp21O+DlelvPlX2huXXnPZcE6XcXli471B4AVJPEH/4j7uzPeb vt2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=whmU6J2FcrXoylXKH86Z6ACbVl+jXlXUisjReNT7x5M=; b=rLOK+9pG0J+Hpej++SakpCTbos2bpSnr/dlSooNSad4Nv2oAKlVWKMgSbfz0ylSSuU HKOWqX0W1//zKMwl58FCEaRKg3B6S3ENvB2nV+WMwcJWkHRRg9JuZAkDLE9OWQ6P72Mo K2iZwBcqoxxZe8WmpCQOlUvkqGxyqR6a2ARSaxiRMsyVC2i91pILT0EhAQ9Mi/MVdeV0 8GYy9b8O0qOAnSa4qgeYUvJUhausLN6wNUe45WwD7CDNTeLevtTi/oKkB2jOOlXSZl75 c8jwJHiXote3FEA1mQKA5+0p0VxeUfP3wjNilg4JoP0Xq0qz7/19po3kEDIQtpYrEWf0 XAaA== X-Gm-Message-State: ACgBeo1GNcoje8C5B6e+RbDe0xpmchZ4TbEAm/y2L5+O60xkI8axpNJr mLfhdcTe1RD+SQI9Eu64klgUE/o3hZ0= X-Google-Smtp-Source: AA6agR6NHSpH/FpHXjiFDYaSLTfbR8SisKB98ERNVi0xk5wcHJgQqcu9goSIAUiJRpyIKVzJNH6qaw== X-Received: by 2002:a2e:5054:0:b0:25e:7222:9159 with SMTP id v20-20020a2e5054000000b0025e72229159mr10441238ljd.318.1660206963503; Thu, 11 Aug 2022 01:36:03 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat4.panoulu.net. [185.38.2.4]) by smtp.gmail.com with ESMTPSA id k3-20020a2e8883000000b0025e4c49969fsm723110lji.98.2022.08.11.01.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 01:36:03 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 11 Aug 2022 11:35:49 +0300 Message-Id: <20220811083549.101-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 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 --- src/openvpn/tun.c | 37 +++++++++++++++++++++ src/openvpn/tun.h | 2 +- 2 files changed, 22 insertions(+), 17 deletions(-) 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.174 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.174 listed in wl.mailspike.net] -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: 1oM3fm-00BSMW-GR Subject: [Openvpn-devel] [PATCH] 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 --- src/openvpn/tun.c | 37 +++++++++++++++++++++---------------- src/openvpn/tun.h | 2 +- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 8a31bb04..76774e51 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -3788,21 +3788,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); @@ -6484,12 +6490,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; } } @@ -6500,7 +6505,7 @@ tun_try_open_device(struct tuntap *tt, const char *device_guid, const struct dev } else { - /* Open TAP-Windows or dco-win adapter */ + /* Open TAP-Windows adapter */ openvpn_snprintf(tuntap_device_path, sizeof(tuntap_device_path), "%s%s%s", USERMODEDEVICEDIR, device_guid, diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 10792eff..effcfca4 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -392,7 +392,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; };