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

Rename SplitConfigs to ProcessRawConfig to better reflect its behaviour

This commit is contained in:
Andy Wang 2020-10-15 22:51:59 +01:00
parent 3e133090f0
commit f96925982f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ func main() {
} }
} }
localConfig, remoteConfig, authInfo, err := rawConfig.SplitConfigs(common.RealWorldState) localConfig, remoteConfig, authInfo, err := rawConfig.ProcessRawConfig(common.RealWorldState)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

8
internal/client/state.go
View File

@ -16,9 +16,9 @@ import (
) )
// RawConfig represents the fields in the config json file // RawConfig represents the fields in the config json file
// nullable means if it's empty, a default value will be chosen in SplitConfigs // nullable means if it's empty, a default value will be chosen in ProcessRawConfig
// jsonOptional means if the json's empty, its value will be set from environment variables or commandline args // jsonOptional means if the json's empty, its value will be set from environment variables or commandline args
// but it mustn't be empty when SplitConfigs is called // but it mustn't be empty when ProcessRawConfig is called
type RawConfig struct { type RawConfig struct {
ServerName string ServerName string
ProxyMethod string ProxyMethod string
@ -31,7 +31,7 @@ type RawConfig struct {
RemoteHost string // jsonOptional RemoteHost string // jsonOptional
RemotePort string // jsonOptional RemotePort string // jsonOptional
// defaults set in SplitConfigs // defaults set in ProcessRawConfig
UDP bool // nullable UDP bool // nullable
BrowserSig string // nullable BrowserSig string // nullable
Transport string // nullable Transport string // nullable
@ -126,7 +126,7 @@ func ParseConfig(conf string) (raw *RawConfig, err error) {
return return
} }
func (raw *RawConfig) SplitConfigs(worldState common.WorldState) (local LocalConnConfig, remote RemoteConnConfig, auth AuthInfo, err error) { func (raw *RawConfig) ProcessRawConfig(worldState common.WorldState) (local LocalConnConfig, remote RemoteConnConfig, auth AuthInfo, err error) {
nullErr := func(field string) (local LocalConnConfig, remote RemoteConnConfig, auth AuthInfo, err error) { nullErr := func(field string) (local LocalConnConfig, remote RemoteConnConfig, auth AuthInfo, err error) {
err = fmt.Errorf("%v cannot be empty", field) err = fmt.Errorf("%v cannot be empty", field)
return return

2
internal/test/integration_test.go
View File

@ -127,7 +127,7 @@ var tcpClientConfigs = map[string]client.RawConfig{
} }
func generateClientConfigs(rawConfig client.RawConfig, state common.WorldState) (client.LocalConnConfig, client.RemoteConnConfig, client.AuthInfo) { func generateClientConfigs(rawConfig client.RawConfig, state common.WorldState) (client.LocalConnConfig, client.RemoteConnConfig, client.AuthInfo) {
lcl, rmt, auth, err := rawConfig.SplitConfigs(state) lcl, rmt, auth, err := rawConfig.ProcessRawConfig(state)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }