summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-21 19:49:16 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-21 19:49:16 +0200
commit41e3407d0de1b61b684a973b9009042f1deabddf (patch)
treea5ed60cc637b343d489ad223b88e6e2ba483c004
parent967087994a8e1d68653d875af26a843a2498268a (diff)
Ignore routing delay, as it causes routes not to be added.
-rw-r--r--AndroidManifest.xml4
-rw-r--r--openvpn/src/openvpn/init.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0255e8f2..c6f8a755 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.blinkt.openvpn"
- android:versionCode="27"
- android:versionName="0.5.5a" >
+ android:versionCode="28"
+ android:versionName="0.5.6" >
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/openvpn/src/openvpn/init.c b/openvpn/src/openvpn/init.c
index 17e4f4af..93ea2f99 100644
--- a/openvpn/src/openvpn/init.c
+++ b/openvpn/src/openvpn/init.c
@@ -1480,8 +1480,8 @@ do_open_tun (struct context *c)
/* possibly add routes */
if(ifconfig_order() == ROUTE_BEFORE_TUN) {
- if (!c->options.route_delay_defined)
- do_route (&c->options, c->c1.route_list, c->c1.route_ipv6_list,
+ // Ignore route_delay
+ do_route (&c->options, c->c1.route_list, c->c1.route_ipv6_list,
c->c1.tuntap, c->plugins, c->c2.es);
}
@@ -1724,6 +1724,7 @@ do_up (struct context *c, bool pulled_options, unsigned int option_types_found)
save_pulled_options_digest (c, &c->c2.pulled_options_digest);
#endif
+#ifndef ROUTE_BEFORE_TUN
/* if --route-delay was specified, start timer */
if (c->options.route_delay_defined)
{
@@ -1733,6 +1734,7 @@ do_up (struct context *c, bool pulled_options, unsigned int option_types_found)
tun_standby_init (c->c1.tuntap);
}
else
+#endif
{
initialization_sequence_completed (c, 0); /* client/p2p --route-delay undefined */
}