summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-02-04 10:03:13 +0100
committerArne Schwabe <arne@rfc2549.org>2014-02-04 10:03:13 +0100
commit1705a3d66d5c2bc8b0c59b2e53c56ed7f6003f56 (patch)
tree2af9a91382e16ee10f021646272fd07af5f9e9de /res
parentde196596a6f93c797e4332c8dc463ccb90ece3f5 (diff)
Add UI/config parsing for excluded routes
Diffstat (limited to 'res')
-rwxr-xr-xres/values/strings.xml2
-rw-r--r--res/xml/vpn_routing.xml12
2 files changed, 14 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2998a9a4..faa41385 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,7 +83,9 @@
<string name="default_route_summary">Redirects all Traffic over the VPN</string>
<string name="use_default_title">Use default Route</string>
<string name="custom_route_message">Enter custom routes. Only enter destination in CIDR format. \"10.0.0.0/8 2002::/16\" would direct the networks 10.0.0.0/8 and 2002::/16 over the VPN.</string>
+ <string name="custom_route_message_excluded">Routes that should NOT be routed over the VPN. Use the same syntax as for included routes.</string>
<string name="custom_routes_title">Custom Routes</string>
+ <string name="custom_routes_title_excluded">Excluded Networks</string>
<string name="log_verbosity_level">Log verbosity level</string>
<string name="float_summary">Allows authenticated packets from any IP</string>
<string name="float_title">Allow floating server</string>
diff --git a/res/xml/vpn_routing.xml b/res/xml/vpn_routing.xml
index 298f488f..c547518b 100644
--- a/res/xml/vpn_routing.xml
+++ b/res/xml/vpn_routing.xml
@@ -24,6 +24,12 @@
android:dialogMessage="@string/custom_route_message"
android:key="customRoutes"
android:title="@string/custom_routes_title" />
+
+ <EditTextPreference
+ android:dependency="useDefaultRoute"
+ android:dialogMessage="@string/custom_route_message_excluded"
+ android:key="excludedRoutes"
+ android:title="@string/custom_routes_title_excluded" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/ipv6" >
<CheckBoxPreference
@@ -37,6 +43,12 @@
android:dialogMessage="@string/custom_route_message"
android:key="customRoutesv6"
android:title="@string/custom_routes_title" />
+
+ <EditTextPreference
+ android:dependency="useDefaultRoute"
+ android:dialogMessage="@string/custom_route_message_excluded"
+ android:key="excludedRoutesv6"
+ android:title="@string/custom_routes_title_excluded" />
</PreferenceCategory>
</PreferenceScreen> \ No newline at end of file