kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RedirAddr backward compatibility

This commit is contained in:
Andy Wang 2019-09-21 16:17:43 +01:00
parent 07dca1f448
commit 52720ca52f
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ck-server/ck-server.go
View File

@ -259,7 +259,7 @@ func main() {
https, _ := net.ResolveTCPAddr("tcp", ":443") https, _ := net.ResolveTCPAddr("tcp", ":443")
http, _ := net.ResolveTCPAddr("tcp", ":80") http, _ := net.ResolveTCPAddr("tcp", ":80")
sta.BindAddr = []net.Addr{https, http} sta.BindAddr = []net.Addr{https, http}
log.Fatalf("bind address cannot be empty") log.Fatalf("BindAddr cannot be empty")
} }
// when cloak is started as a shadowsocks plugin // when cloak is started as a shadowsocks plugin

18
internal/server/state.go
View File

@ -92,9 +92,23 @@ func (sta *State) ParseConfig(conf string) (err error) {
sta.Timeout = time.Duration(preParse.StreamTimeout) * time.Second sta.Timeout = time.Duration(preParse.StreamTimeout) * time.Second
sta.RedirAddr, err = net.ResolveIPAddr("ip", preParse.RedirAddr) redirAddr := preParse.RedirAddr
colonSep := strings.Split(redirAddr, ":")
if len(colonSep) != 0 {
if len(colonSep) == 2 {
logrus.Error("If RedirAddr contains a port number, please remove it.")
redirAddr = colonSep[0]
} else {
if strings.Contains(redirAddr, "[") {
logrus.Error("If RedirAddr contains a port number, please remove it.")
redirAddr = strings.TrimRight(redirAddr, "]:"+colonSep[len(colonSep)-1])
redirAddr = strings.TrimPrefix(redirAddr, "[")
}
}
}
sta.RedirAddr, err = net.ResolveIPAddr("ip", redirAddr)
if err != nil { if err != nil {
logrus.Error("If RedirAddr contains a port number, please remove it.")
return fmt.Errorf("unable to resolve RedirAddr: %v. ", err) return fmt.Errorf("unable to resolve RedirAddr: %v. ", err)
} }