mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-20 06:58:38 +03:00
Code Issues Releases Activity

Revert: move common.go to common

Browse Source
This commit is contained in:
JimhHan
2021-03-27 15:33:20 +08:00
parent 4eb3acb4dd
commit 58bca70dfb
16 changed files with 121 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
infra/conf/socks.go
View File

@ -6,7 +6,6 @@ import (
"github.com/golang/protobuf/proto"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf/common"
"github.com/xtls/xray-core/proxy/socks"
)
@ -31,7 +30,7 @@ type SocksServerConfig struct {
AuthMethod string `json:"auth"`
Accounts []*SocksAccount `json:"accounts"`
UDP bool `json:"udp"`
Host *common.Address `json:"ip"`
Host *Address `json:"ip"`
Timeout uint32 `json:"timeout"`
UserLevel uint32 `json:"userLevel"`
}
@ -66,7 +65,7 @@ func (v *SocksServerConfig) Build() (proto.Message, error) {
}
type SocksRemoteConfig struct {
Address *common.Address `json:"address"`
Address *Address `json:"address"`
Port uint16 `json:"port"`
Users []json.RawMessage `json:"users"`
}