summaryrefslogtreecommitdiff
path: root/openvpn
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-03 22:51:47 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-03 22:51:47 +0200
commit2b3ea917b0a830e3ff4817c7240e0f1808ae58bc (patch)
tree2359f4fca5e51d2b7eb253728f62b74db7da0e69 /openvpn
parent9cd2069d5d57fc605a8eae3e6f8a0b09b56d4c16 (diff)
parentd3c50d3637462d4e3e3a3c09d43d37ce5656f67a (diff)
Merge Merge try number 2
Diffstat (limited to 'openvpn')
-rw-r--r--openvpn/src/compat/compat-stdbool.h12
-rw-r--r--openvpn/src/openvpn/tun.c4
2 files changed, 15 insertions, 1 deletions
diff --git a/openvpn/src/compat/compat-stdbool.h b/openvpn/src/compat/compat-stdbool.h
new file mode 100644
index 00000000..99412188
--- /dev/null
+++ b/openvpn/src/compat/compat-stdbool.h
@@ -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
diff --git a/openvpn/src/openvpn/tun.c b/openvpn/src/openvpn/tun.c
index 7aa8627d..14ec2b85 100644
--- a/openvpn/src/openvpn/tun.c
+++ b/openvpn/src/openvpn/tun.c
@@ -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