Batyka/v2rayNG
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

proxyOnly update

Browse Source 
* do not run Tun2socks under proxyOnly
This commit is contained in:
Rurirei
2020-10-21 15:19:55 +08:00
committed by GitHub
parent 4602afc67e
commit a57aee9424
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidLibV2rayLite/interact.go
View File

@@ -48,6 +48,7 @@ type V2RayPoint struct {
ConfigureFileContent string ConfigureFileContent string
EnableLocalDNS bool EnableLocalDNS bool
ForwardIpv6 bool ForwardIpv6 bool
ProxyOnly bool
} }
/*V2RayVPNServiceSupportsSet To support Android VPN mode*/ /*V2RayVPNServiceSupportsSet To support Android VPN mode*/
@@ -160,6 +161,7 @@ func (v *V2RayPoint) pointloop() error {
v.SupportSet.Setup(v.status.GetVPNSetupArg(v.EnableLocalDNS, v.ForwardIpv6)) v.SupportSet.Setup(v.status.GetVPNSetupArg(v.EnableLocalDNS, v.ForwardIpv6))
v.SupportSet.OnEmitStatus(0, "Running") v.SupportSet.OnEmitStatus(0, "Running")
if !v.ProxyOnly {
if err := v.runTun2socks(); err != nil { if err := v.runTun2socks(); err != nil {
log.Println(err) log.Println(err)
return err return err
@@ -169,6 +171,7 @@ func (v *V2RayPoint) pointloop() error {
v.EnableLocalDNS, v.EnableLocalDNS,
v.ForwardIpv6, v.ForwardIpv6,
v.DomainName) v.DomainName)
}
return nil return nil
} }

1
V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt
View File

@@ -131,6 +131,7 @@ object V2RayServiceManager {
v2rayPoint.enableLocalDNS = service.defaultDPreference.getPrefBoolean(SettingsActivity.PREF_LOCAL_DNS_ENABLED, false) v2rayPoint.enableLocalDNS = service.defaultDPreference.getPrefBoolean(SettingsActivity.PREF_LOCAL_DNS_ENABLED, false)
v2rayPoint.forwardIpv6 = service.defaultDPreference.getPrefBoolean(SettingsActivity.PREF_FORWARD_IPV6, false) v2rayPoint.forwardIpv6 = service.defaultDPreference.getPrefBoolean(SettingsActivity.PREF_FORWARD_IPV6, false)
v2rayPoint.domainName = service.defaultDPreference.getPrefString(AppConfig.PREF_CURR_CONFIG_DOMAIN, "") v2rayPoint.domainName = service.defaultDPreference.getPrefString(AppConfig.PREF_CURR_CONFIG_DOMAIN, "")
v2rayPoint.proxyOnly = service.defaultDPreference.getPrefString(AppConfig.PREF_MODE, "VPN") != "VPN"
try { try {
v2rayPoint.runLoop() v2rayPoint.runLoop()