Merge pull request #732 from rurirei/isTun2socksRunningi
isTun2socksRunning bool
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
|||||||
|
|
||||||
type Status struct {
|
type Status struct {
|
||||||
IsRunning bool
|
IsRunning bool
|
||||||
|
IsTRunning bool
|
||||||
PackageName string
|
PackageName string
|
||||||
PackageCodePath string
|
PackageCodePath string
|
||||||
|
|
||||||
|
|||||||
@@ -109,6 +109,10 @@ func (v *V2RayPoint) GetIsRunning() bool {
|
|||||||
return v.status.IsRunning
|
return v.status.IsRunning
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (v *V2RayPoint) GetIsTRunning() bool {
|
||||||
|
return v.status.IsTRunning
|
||||||
|
}
|
||||||
|
|
||||||
//Delegate Funcation
|
//Delegate Funcation
|
||||||
func (v V2RayPoint) QueryStats(tag string, direct string) int64 {
|
func (v V2RayPoint) QueryStats(tag string, direct string) int64 {
|
||||||
if v.statsManager == nil {
|
if v.statsManager == nil {
|
||||||
@@ -163,11 +167,13 @@ 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")
|
||||||
|
|
||||||
|
v.status.IsTRunning = false
|
||||||
if !v.ProxyOnly {
|
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
|
||||||
}
|
}
|
||||||
|
v.status.IsTRunning = true
|
||||||
|
|
||||||
log.Printf("EnableLocalDNS: %v\nForwardIpv6: %v\nDomainName: %s",
|
log.Printf("EnableLocalDNS: %v\nForwardIpv6: %v\nDomainName: %s",
|
||||||
v.EnableLocalDNS,
|
v.EnableLocalDNS,
|
||||||
|
|||||||
Reference in New Issue
Block a user