Support non-strict mode for repeater

This commit makes possible:

* Starting repeater without VPN;
* Repeater will work better with stub VPN apps;
* LAN addresses will be reachable.
This commit is contained in:
Mygod
2018-02-17 18:56:20 -08:00
parent 73b2b513f1
commit 2d30b5154b
9 changed files with 109 additions and 96 deletions

View File

@@ -21,7 +21,6 @@
<string name="repeater_reset_credentials_failure">重置凭据失败(原因:%s</string>
<string name="repeater_inactive">未打开</string>
<string name="repeater_vpn_unavailable">无法找到 VPN请启用任意 VPN</string>
<string name="repeater_p2p_unavailable">Wi-Fi 直连不可用</string>
<string name="repeater_create_group_failure">创建 P2P 群组失败(原因:%s</string>
<string name="repeater_remove_group_failure">关闭已有 P2P 群组失败(原因:%s</string>
@@ -42,6 +41,8 @@
<string name="settings_service">服务</string>
<string name="settings_service_dns">下游 DNS 服务器[:端口]</string>
<string name="settings_service_repeater_strict">严格模式 (仅用于中继)</string>
<string name="settings_service_repeater_strict_summary">只允许通过 VPN 隧道的包通过</string>
<string name="settings_service_clean">清理/重新应用路由规则</string>
<string name="settings_misc">杂项</string>
<string name="settings_misc_logcat">导出日志</string>

View File

@@ -23,7 +23,6 @@
<string name="repeater_reset_credentials_failure">Failed to reset credentials (reason: %s)</string>
<string name="repeater_inactive">Service inactive</string>
<string name="repeater_vpn_unavailable">VPN unavailable, please enable any VPN</string>
<string name="repeater_p2p_unavailable">Wi-Fi direct unavailable</string>
<string name="repeater_create_group_failure">Failed to create P2P group (reason: %s)</string>
<string name="repeater_remove_group_failure">Failed to remove P2P group (reason: %s)</string>
@@ -44,6 +43,8 @@
<string name="settings_service">Service</string>
<string name="settings_service_dns">Downstream DNS server[:port]</string>
<string name="settings_service_repeater_strict">Strict mode (repeater only)</string>
<string name="settings_service_repeater_strict_summary">Only allow packets that goes through VPN tunnel</string>
<string name="settings_service_clean">Clean/reapply routing rules</string>
<string name="settings_misc">Misc</string>
<string name="settings_misc_logcat">Export logcat</string>

View File

@@ -8,6 +8,10 @@
android:summary="%s"
android:singleLine="true"
android:defaultValue="8.8.8.8"/>
<SwitchPreference
android:key="service.repeater.strict"
android:title="@string/settings_service_repeater_strict"
android:summary="@string/settings_service_repeater_strict_summary"/>
<Preference
android:key="service.clean"
android:title="@string/settings_service_clean"/>