cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 69f8b08ac0 into a384bf5580

Browse Source
This commit is contained in:
logonovo 2017-12-21 00:30:20 +00:00 committed by GitHub
commit 3cecef4e95
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
models/config/proxy.go
View File

@ -632,10 +632,13 @@ func (cfg *StcpProxyConf) LoadFromFile(name string, section ini.Section) (err er
} }
tmpStr := section["role"] tmpStr := section["role"]
if tmpStr == "" {
tmpStr = "server"
}
if tmpStr == "server" || tmpStr == "visitor" { if tmpStr == "server" || tmpStr == "visitor" {
cfg.Role = tmpStr cfg.Role = tmpStr
} else { } else {
return fmt.Errorf("Parse conf error: incorrect role [%s]", tmpStr) return fmt.Errorf("Parse conf error: proxy [%s] incorrect role [%s]", name, tmpStr)
} }
cfg.Sk = section["sk"] cfg.Sk = section["sk"]
@ -721,10 +724,13 @@ func (cfg *XtcpProxyConf) LoadFromFile(name string, section ini.Section) (err er
} }
tmpStr := section["role"] tmpStr := section["role"]
if tmpStr == "" {
tmpStr = "server"
}
if tmpStr == "server" || tmpStr == "visitor" { if tmpStr == "server" || tmpStr == "visitor" {
cfg.Role = tmpStr cfg.Role = tmpStr
} else { } else {
return fmt.Errorf("Parse conf error: incorrect role [%s]", tmpStr) return fmt.Errorf("Parse conf error: proxy [%s] incorrect role [%s]", name, tmpStr)
} }
cfg.Sk = section["sk"] cfg.Sk = section["sk"]