From patchwork Wed May 4 01:18:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2431 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.27.255.59]) by backend41.mail.ord1d.rsapps.net with LMTP id 2O/IGT5hcmJlGwAAqwncew (envelope-from ) for ; Wed, 04 May 2022 07:19:26 -0400 Received: from proxy15.mail.iad3a.rsapps.net ([172.27.255.59]) by director7.mail.ord1d.rsapps.net with LMTP id qGGrIj5hcmIwMQAAovjBpQ (envelope-from ) for ; Wed, 04 May 2022 07:19:26 -0400 Received: from smtp5.gate.iad3a ([172.27.255.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.iad3a.rsapps.net with LMTPS id cEZZHT5hcmI8TgAAHi9b9g (envelope-from ) for ; Wed, 04 May 2022 07:19:26 -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: smtp5.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; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 0dcab10c-cb9c-11ec-9329-525400de824c-1-1 Received: from [216.105.38.7] ([216.105.38.7:45370] helo=lists.sourceforge.net) by smtp5.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 72/BA-02473-D3162726; Wed, 04 May 2022 07:19:25 -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 1nmD1O-00027x-He; Wed, 04 May 2022 11:18:17 +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 1nmD1N-00027r-Hg for openvpn-devel@lists.sourceforge.net; Wed, 04 May 2022 11:18:16 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8ydvmg5dy9eyZmv8+SATkdI6TAg9HQtQVkD2W79mjqU=; b=VD0BbEw5G+6+Je8CAx80IARL0H vkEcR5fKlgqb9nNZx5BY9sGiaVwBGeGV99nLAZMS74cJ4A5UqU2s0lVFdZyhzgZuwGGirGSEyLI1l FFQse+4IHYz+36fQRf77PvPvfJzP8dufDFY1HxSRCO2TCXH4RzZ//B+1xmIs7sHnQn70=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=8ydvmg5dy9eyZmv8+SATkdI6TAg9HQtQVkD2W79mjqU=; b=P APBJ21insyPZGZc6MFekpXATa/KCrqT/Ym+6xFM3iryo1abM2jtTCYY2fNiMzGOT7L6nNgl6hqMZL QYh/DddGnNXb5HQAN3oXhi+EOOpV3n2SOE95Uodr0BwuhNZpGJ2MsPeA2xEnJNejz71PGXiitsEJz QaeQfllG+b1KDdX4=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nmD1I-0010dZ-T9 for openvpn-devel@lists.sourceforge.net; Wed, 04 May 2022 11:18:16 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1nmD18-00053f-J0 for openvpn-devel@lists.sourceforge.net; Wed, 04 May 2022 13:18:02 +0200 Received: (nullmailer pid 1050696 invoked by uid 10006); Wed, 04 May 2022 11:18:02 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 4 May 2022 13:18:02 +0200 Message-Id: <20220504111802.1050648-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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: Android 4.4 is now 9 years old and the main user of this API (OpenVPN for Android) does not support this OS anymore. This workaround is now safe to remove. Signed-off-by: Arne Schwabe --- src/openvpn/manage.c | 6 +----- src/openvpn/manage.h | 3 +-- src/openvpn/tun.c | 9 +-------- 3 files changed, 3 insertions(+), 15 deletions(-) Content analysis details: (0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1nmD1I-0010dZ-T9 Subject: [Openvpn-devel] [PATCH] Remove workaround for Android 4.4 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 Android 4.4 is now 9 years old and the main user of this API (OpenVPN for Android) does not support this OS anymore. This workaround is now safe to remove. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/manage.c | 6 +----- src/openvpn/manage.h | 3 +-- src/openvpn/tun.c | 9 +-------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 1f408f0b..6e27d14e 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -2140,10 +2140,6 @@ managment_android_persisttun_action(struct management *man) { return ANDROID_KEEP_OLD_TUN; } - else if (!strcmp("OPEN_AFTER_CLOSE", up.password)) - { - return ANDROID_OPEN_AFTER_CLOSE; - } else if (!strcmp("OPEN_BEFORE_CLOSE", up.password)) { return ANDROID_OPEN_BEFORE_CLOSE; @@ -2154,7 +2150,7 @@ managment_android_persisttun_action(struct management *man) } ASSERT(0); - return ANDROID_OPEN_AFTER_CLOSE; + return ANDROID_OPEN_BEFORE_CLOSE; } diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index 9621f479..2e497d67 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -383,8 +383,7 @@ bool management_query_user_pass(struct management *man, bool management_android_control(struct management *man, const char *command, const char *msg); #define ANDROID_KEEP_OLD_TUN 1 -#define ANDROID_OPEN_AFTER_CLOSE 2 -#define ANDROID_OPEN_BEFORE_CLOSE 3 +#define ANDROID_OPEN_BEFORE_CLOSE 2 int managment_android_persisttun_action(struct management *man); #endif diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 12bdd200..93259ec5 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1879,13 +1879,6 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun int android_method = managment_android_persisttun_action(management); - /* Android 4.4 workaround */ - if (oldtunfd >=0 && android_method == ANDROID_OPEN_AFTER_CLOSE) - { - close(oldtunfd); - management_sleep(2); - } - if (oldtunfd >=0 && android_method == ANDROID_KEEP_OLD_TUN) { /* keep the old fd */ @@ -1900,7 +1893,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun management->connection.lastfdreceived = -1; } - if (oldtunfd>=0 && android_method == ANDROID_OPEN_BEFORE_CLOSE) + if (oldtunfd >= 0 && android_method == ANDROID_OPEN_BEFORE_CLOSE) { close(oldtunfd); }