From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 30 Jul 2014 07:48:08 +0000 (+0200)
Subject: dns-proxy: Don't use proxy socket if we fail to bypass it
X-Git-Tag: 5.2.1dr1~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffa9b6718983ee41ce1e2443f9d5f2fab073f0a0;p=thirdparty%2Fstrongswan.git

dns-proxy: Don't use proxy socket if we fail to bypass it

This will result in an infinite loop as packets sent over that socket
will again pass through the TUN device and the DNS proxy.

Apparently, bypassing fails when airplane mode is enabled.

Fixes #662.
---

diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_dns_proxy.c b/src/frontends/android/jni/libandroidbridge/backend/android_dns_proxy.c
index 045f2c1d1c..908e37238a 100644
--- a/src/frontends/android/jni/libandroidbridge/backend/android_dns_proxy.c
+++ b/src/frontends/android/jni/libandroidbridge/backend/android_dns_proxy.c
@@ -125,6 +125,8 @@ static int open_socket(int family)
 												skt, family))
 	{
 		DBG1(DBG_NET, "installing bypass policy for proxy socket failed");
+		close(skt);
+		return -1;
 	}
 	return skt;
 }