mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-20 03:52:27 +02:00
Code

Error message if tun cannot be opened

Browse Source
This commit is contained in:
Arne Schwabe 2012-05-03 22:20:26 +02:00
parent 4c991f2fc9
commit d3c50d3637
5 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.hgignore
View File

@ -2,5 +2,12 @@ obj
bin
libs
gen
openvpn/.git
openvpn/autom4te.cache
openvpn/aclocal.m4
openvpn/config.log
openvpn/config.h.in
openvpn/configure
open
syntax: regexp
^openvpn/xcopenvpn$

12
openvpn/src/compat/compat-stdbool.h Normal file
View File

@ -0,0 +1,12 @@
#ifndef __COMPAT_STDBOOL_H
#define __COMPAT_STDBOOL_H
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
#else
typedef int bool;
#define false 0
#define true 1
#endif
#endif

4
openvpn/src/openvpn/tun.c
View File

@ -1386,7 +1386,9 @@ open_tun (const char *dev, const char *dev_type, const char *dev_node, struct tu
if(tt->options.domain)
android_set_domain(tt->options.domain);
tt->fd = android_open_tun();
if((tt->fd = android_open_tun()< 0){
msg (M_ERR, "ERROR: Cannot open TUN");
}
}
#else

20
res/menu/vpn_context.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/edit_vpn"
android:icon="@android:drawable/ic_menu_edit"
android:showAsAction="withText|ifRoom"
android:title="@string/edit_vpn"/>
<item
android:id="@+id/remove_vpn"
android:icon="@android:drawable/ic_menu_delete"
android:showAsAction="withText|ifRoom"
android:title="@string/remove_vpn"/>
<item
android:id="@+id/connect_vpn"
android:icon="@android:drawable/ic_media_play"
android:showAsAction="withText|ifRoom"
android:title="@string/connect"/>
</menu>

9
res/values/strings.xml
View File

@ -21,7 +21,7 @@
<string name="address">Server Address:</string>
<string name="port">Server Port:</string>
<string name="secret">Shared Secret:</string>
<string name="connect">Connect!</string>
<string name="connect">Connect</string>
<string name="connecting">OpenVPN is connecting…</string>
<string name="connected">OpenVPN is connected!</string>
@ -113,9 +113,14 @@
<string name="custom_config_summary">Specify custom options. Use with care!</string>
<string name="route_rejected">Route rejected by Android</string>
<string formatted="false" name="ip_not_cidr">Cannot make sense of %s and %s as IP and CIDR netmask, assuming P2P for local address (/32)</string>
<string name="cancel_connection">cancel</string>
<string name="cancel_connection">Disconnect</string>
<string name="clear_log">clear log</string>
<string name="title_cancel">Cancel Confirmation</string>
<string name="cancel_connection_query">Disconnect the connected VPN/cancel the connection attempt?</string>
<string name="remove_vpn">Remove VPN</string>
<string name="edit_vpn">Edit VPN Settings</string>
<string name="remove_vpn_query">Remove the VPN Profile %s?</string>
<string name="tun_error_helpful">" On some custom ICS images the permission on /dev/tun might be wrong, or the tun module might be missing completly"</string>
<string name="tun_open_error">Opening tun interface failed badly.</string>
<string name="error">"Error: "</string>
</resources>