diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-07 09:57:24 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-07 09:57:24 +0200 |
| commit | 5e3b81ad228af2b6057e4f6ba376bdecc7fdb066 (patch) | |
| tree | 72af17bd21c4c8d1526b3d1e300d5d72140ba81f | |
| parent | ab9933e33e5e7b5066659b4c8911480a70f360f5 (diff) | |
Clarify route error message, remove a few "jniglue.h" inclusions
| -rw-r--r-- | openvpn/src/openvpn/route.c | 4 | ||||
| -rw-r--r-- | openvpn/src/openvpn/socket.c | 5 | ||||
| -rw-r--r-- | openvpn/src/openvpn/tun.c | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/openvpn/src/openvpn/route.c b/openvpn/src/openvpn/route.c index a73bbc4c..99674e29 100644 --- a/openvpn/src/openvpn/route.c +++ b/openvpn/src/openvpn/route.c @@ -1345,7 +1345,6 @@ add_route (struct route *r, status = openvpn_execve_check (&argv, es, 0, "ERROR: Linux route add command failed"); #elif defined (TARGET_ANDROID) -#include "jniglue.h" struct user_pass up; struct buffer out = alloc_buf_gc (64, &gc); @@ -1859,7 +1858,8 @@ delete_route (struct route *r, argv_msg (D_ROUTE, &argv); openvpn_execve_check (&argv, es, 0, "ERROR: OpenBSD/NetBSD route delete command failed"); - +#elif defined(TARGET_ANDROID) + msg (M_NONFATAL, "Sorry, deleting routes on Android is not possible. The VpnService API allows routes to be set on connect only."); #else msg (M_FATAL, "Sorry, but I don't know how to do 'route' commands on this operating system. Try putting your routes in a --route-up script"); #endif diff --git a/openvpn/src/openvpn/socket.c b/openvpn/src/openvpn/socket.c index 756627fe..71010979 100644 --- a/openvpn/src/openvpn/socket.c +++ b/openvpn/src/openvpn/socket.c @@ -43,11 +43,6 @@ #include "memdbg.h" -#ifdef TARGET_ANDROID -#include "jniglue.h" -#endif - - const int proto_overhead[] = { /* indexed by PROTO_x */ 0, IPv4_UDP_HEADER_SIZE, /* IPv4 */ diff --git a/openvpn/src/openvpn/tun.c b/openvpn/src/openvpn/tun.c index d2123766..158cd61b 100644 --- a/openvpn/src/openvpn/tun.c +++ b/openvpn/src/openvpn/tun.c @@ -49,10 +49,6 @@ #include "memdbg.h" #include <string.h> -#ifdef TARGET_ANDROID -#include "jniglue.h" -#endif - #ifdef WIN32 |