[Openvpn-devel] Skip error about ioctl(SIOCGIFCONF) failed on Android

Message ID 20181005131632.32515-1-arne@rfc2549.org
State Accepted
Headers show
Series [Openvpn-devel] Skip error about ioctl(SIOCGIFCONF) failed on Android | expand

Commit Message

Arne Schwabe Oct. 5, 2018, 3:16 a.m. UTC
Patch: V2 Do not use C99 style comments
---
 src/openvpn/route.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Gert Doering Oct. 5, 2018, 4:46 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Passes the style guide filter, fixes an annoying and misleading warning,
and affects only Android.  Fixed two typos in the comment.

Your patch has been applied to the master branch.

commit 5e80600a45c22dd96eb1dcce6a4af7a6c361396b
Author: Arne Schwabe
Date:   Fri Oct 5 15:16:32 2018 +0200

     Skip error about ioctl(SIOCGIFCONF) failed on Android

     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20181005131632.32515-1-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17565.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index cadd34e1..cb337c42 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -3258,6 +3258,12 @@  get_default_gateway(struct route_gateway_info *rgi)
     rgi->gateway.addr = 127 << 24 | 'd' << 16 | 'g' << 8 | 'w';
     rgi->flags |= RGI_ADDR_DEFINED;
     strcpy(best_name, "android-gw");
+
+    /*
+     * Skip scanning/fetching interface from loopback inteface
+     * It always fails and ioctl(SIOCGIFCONF) failed" confuses users
+     */
+    goto done;
 #endif /* ifndef TARGET_ANDROID */
 
     /* scan adapter list */