From patchwork Fri Oct 5 03:04:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 486 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id GF8+J7Nht1uVTwAAIUCqbw for ; Fri, 05 Oct 2018 09:05:55 -0400 Received: from proxy15.mail.iad3b.rsapps.net ([172.31.255.6]) by director10.mail.ord1d.rsapps.net with LMTP id OIq+JLNht1s/FQAApN4f7A ; Fri, 05 Oct 2018 09:05:55 -0400 Received: from smtp31.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.iad3b.rsapps.net with LMTP id oH7vHrNht1uFJQAAhyf7VQ ; Fri, 05 Oct 2018 09:05:55 -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: smtp31.gate.iad3b.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: 647aa9fc-c89f-11e8-8431-52540005277f-1-1 Received: from [216.105.38.7] ([216.105.38.7:62918] helo=lists.sourceforge.net) by smtp31.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 92/D4-18121-3B167BB5; Fri, 05 Oct 2018 09:05:55 -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.90_1) (envelope-from ) id 1g8Pmp-00037J-Cy; Fri, 05 Oct 2018 13:04:55 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1g8Pmn-00037D-Vx for openvpn-devel@lists.sourceforge.NET; Fri, 05 Oct 2018 13:04:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: 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=3RC01+oiMnnFEzv8Q2yMfZm/Xs/Bq0GbB8AmOq3fApo=; b=fbvAbDYPktaz8YuOz3UEN9RD1V GppqBnrfPJzlkqcKUP83Elqx8VKMgzMm/D42meNl1ClsX82d+lt75EzDeMWqZxjdZ17AMNkwMbMrL onL6+slBrSP4Y3h8qxHqU3d1hpuhGlGOzERSqkw+43CoXA+vcWSRMvPdyV4mX7eNtyxc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: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=3RC01+oiMnnFEzv8Q2yMfZm/Xs/Bq0GbB8AmOq3fApo=; b=N36x2Xl59CFcqkfau0uugWKly8 ioyCSHgHYOaJ6JV6nbJxGIMgFQi4LId/nEm5tPMip81qkrZ+l1O7iPz3mRt8ByA/gpK67J+IXb04F ihQPJ+ZvfdSHR+jTI1VPEMRXHB2PzhdSJuwWlcUrQyO2X+jv9Hjv8Q1AF35LgOGCjk5Q=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1g8Pmj-00Cl5N-8s for openvpn-devel@lists.sourceforge.NET; Fri, 05 Oct 2018 13:04:53 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.91 (FreeBSD)) (envelope-from ) id 1g8Pmc-000KNI-Gl for openvpn-devel@lists.sourceforge.net; Fri, 05 Oct 2018 15:04:42 +0200 Received: (nullmailer pid 32119 invoked by uid 10006); Fri, 05 Oct 2018 13:04:42 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 5 Oct 2018 15:04:42 +0200 Message-Id: <20181005130442.32075-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.4 NO_DNS_FOR_FROM DNS: Envelope sender has no MX or A DNS records 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1g8Pmj-00Cl5N-8s Subject: [Openvpn-devel] [PATCH] Always use a 0.0.0.0/0 default on Android instead of def1 and do not try to delete routes 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox --- src/openvpn/route.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index ff392308..cadd34e1 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1050,6 +1050,16 @@ redirect_default_route_to_vpn(struct route_list *rl, const struct tuntap *tt, un if (rl->flags & RG_REROUTE_GW) { +#ifdef TARGET_ANDROID + add_route3 (0, + 0, + rl->spec.remote_endpoint, + tt, + flags, + &rl->rgi, + es); + +#else if (rl->flags & RG_DEF1) { /* add new default route (1st component) */ @@ -1089,6 +1099,7 @@ redirect_default_route_to_vpn(struct route_list *rl, const struct tuntap *tt, un &rl->rgi, es); } +#endif } /* set a flag so we can undo later */