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

Minor error prompt and listen to :80 and :443 by default

This commit is contained in:
Andy Wang 2019-09-15 18:11:23 +01:00
parent 63f3b4a89f
commit 8a6f6b6088
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,6 +256,9 @@ func main() {
} }
if !pluginMode && len(sta.BindAddr) == 0 { if !pluginMode && len(sta.BindAddr) == 0 {
https, _ := net.ResolveTCPAddr("tcp", ":443")
http, _ := net.ResolveTCPAddr("tcp", ":80")
sta.BindAddr = []net.Addr{https, http}
log.Fatalf("bind address cannot be empty") log.Fatalf("bind address cannot be empty")
} }

2
example_config/ckserver.json
View File

@ -20,7 +20,7 @@
"BypassUID": [ "BypassUID": [
"1rmq6Ag1jZJCImLBIL5wzQ==" "1rmq6Ag1jZJCImLBIL5wzQ=="
], ],
"RedirAddr": "204.79.197.200:443", "RedirAddr": "204.79.197.200",
"PrivateKey": "EN5aPEpNBO+vw+BtFQY2OnK9bQU7rvEj5qmnmgwEtUc=", "PrivateKey": "EN5aPEpNBO+vw+BtFQY2OnK9bQU7rvEj5qmnmgwEtUc=",
"AdminUID": "5nneblJy6lniPJfr81LuYQ==", "AdminUID": "5nneblJy6lniPJfr81LuYQ==",
"DatabasePath": "userinfo.db", "DatabasePath": "userinfo.db",

4
internal/server/state.go
View File

@ -7,6 +7,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/cbeuw/Cloak/internal/server/usermanager" "github.com/cbeuw/Cloak/internal/server/usermanager"
"github.com/sirupsen/logrus"
"io/ioutil" "io/ioutil"
"net" "net"
"strings" "strings"
@ -93,7 +94,8 @@ func (sta *State) ParseConfig(conf string) (err error) {
sta.RedirAddr, err = net.ResolveIPAddr("ip", preParse.RedirAddr) sta.RedirAddr, err = net.ResolveIPAddr("ip", preParse.RedirAddr)
if err != nil { if err != nil {
return fmt.Errorf("unable to resolve RedirAddr: %v", err) logrus.Error("If RedirAddr contains a port number, please remove it.")
return fmt.Errorf("unable to resolve RedirAddr: %v. ", err)
} }
for _, addr := range preParse.BindAddr { for _, addr := range preParse.BindAddr {