go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add more config options for kcp

Browse Source
This commit is contained in:
ginuerzh 2023-11-16 21:42:11 +08:00
parent a465210bd6
commit 2c82233b4f
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dialer/kcp/metadata.go
View File

@ -21,14 +21,14 @@ func (d *kcpDialer) parseMetadata(md mdata.Metadata) (err error) {
handshakeTimeout = "handshakeTimeout" handshakeTimeout = "handshakeTimeout"
) )
if file := mdutil.GetString(md, configFile); file != "" { if file := mdutil.GetString(md, "kcp.configFile", "configFile", "c"); file != "" {
d.md.config, err = kcp_util.ParseFromFile(file) d.md.config, err = kcp_util.ParseFromFile(file)
if err != nil { if err != nil {
return return
} }
} }
if m := mdutil.GetStringMap(md, config); len(m) > 0 { if m := mdutil.GetStringMap(md, "kcp.config", "config"); len(m) > 0 {
b, err := json.Marshal(m) b, err := json.Marshal(m)
if err != nil { if err != nil {
return err return err
@ -42,6 +42,14 @@ func (d *kcpDialer) parseMetadata(md mdata.Metadata) (err error) {
if d.md.config == nil { if d.md.config == nil {
d.md.config = kcp_util.DefaultConfig d.md.config = kcp_util.DefaultConfig
} }
d.md.config.TCP = mdutil.GetBool(md, "kcp.tcp", "tcp")
d.md.config.Key = mdutil.GetString(md, "kcp.key")
d.md.config.Crypt = mdutil.GetString(md, "kcp.crypt")
d.md.config.Mode = mdutil.GetString(md, "kcp.mode")
d.md.config.KeepAlive = mdutil.GetInt(md, "kcp.keepalive")
d.md.config.Interval = mdutil.GetInt(md, "kcp.interval")
d.md.config.MTU = mdutil.GetInt(md, "kcp.mtu")
d.md.config.SmuxVer = mdutil.GetInt(md, "kcp.smuxver")
d.md.handshakeTimeout = mdutil.GetDuration(md, handshakeTimeout) d.md.handshakeTimeout = mdutil.GetDuration(md, handshakeTimeout)
return return

13
listener/kcp/metadata.go
View File

@ -20,18 +20,17 @@ type metadata struct {
func (l *kcpListener) parseMetadata(md mdata.Metadata) (err error) { func (l *kcpListener) parseMetadata(md mdata.Metadata) (err error) {
const ( const (
backlog = "backlog" backlog = "backlog"
config = "config"
configFile = "c" configFile = "c"
) )
if file := mdutil.GetString(md, configFile); file != "" { if file := mdutil.GetString(md, "kcp.configFile", "configFile", "c"); file != "" {
l.md.config, err = kcp_util.ParseFromFile(file) l.md.config, err = kcp_util.ParseFromFile(file)
if err != nil { if err != nil {
return return
} }
} }
if m := mdutil.GetStringMap(md, config); len(m) > 0 { if m := mdutil.GetStringMap(md, "kcp.config", "config"); len(m) > 0 {
b, err := json.Marshal(m) b, err := json.Marshal(m)
if err != nil { if err != nil {
return err return err
@ -46,6 +45,14 @@ func (l *kcpListener) parseMetadata(md mdata.Metadata) (err error) {
if l.md.config == nil { if l.md.config == nil {
l.md.config = kcp_util.DefaultConfig l.md.config = kcp_util.DefaultConfig
} }
l.md.config.TCP = mdutil.GetBool(md, "kcp.tcp", "tcp")
l.md.config.Key = mdutil.GetString(md, "kcp.key")
l.md.config.Crypt = mdutil.GetString(md, "kcp.crypt")
l.md.config.Mode = mdutil.GetString(md, "kcp.mode")
l.md.config.KeepAlive = mdutil.GetInt(md, "kcp.keepalive")
l.md.config.Interval = mdutil.GetInt(md, "kcp.interval")
l.md.config.MTU = mdutil.GetInt(md, "kcp.mtu")
l.md.config.SmuxVer = mdutil.GetInt(md, "kcp.smuxVer")
l.md.backlog = mdutil.GetInt(md, backlog) l.md.backlog = mdutil.GetInt(md, backlog)
if l.md.backlog <= 0 { if l.md.backlog <= 0 {