yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-06-03 09:47:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ECH server

Browse Source
This commit is contained in:
世界
2023-09-02 16:54:56 +08:00
parent eb6629dc5c
commit c79b4509bd
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/tls/ech_client.go
View File

@@ -178,7 +178,7 @@ func NewECHClient(ctx context.Context, serverAddress string, options option.Outb
} else if options.ECH.ConfigPath != "" {
content, err := os.ReadFile(options.ECH.ConfigPath)
if err != nil {
return nil, E.Cause(err, "read key")
return nil, E.Cause(err, "read ECH config")
}
echConfig = content
}

6
common/tls/ech_server.go
View File

@@ -159,7 +159,7 @@ func (c *echServerConfig) startECHWatcher() error {
if err != nil {
return err
}
c.watcher = watcher
c.echWatcher = watcher
go c.loopECHUpdate()
return nil
}
@@ -178,7 +178,7 @@ func (c *echServerConfig) loopECHUpdate() {
if err != nil {
c.logger.Error(E.Cause(err, "reload ECH key"))
}
case err, ok := <-c.watcher.Errors:
case err, ok := <-c.echWatcher.Errors:
if !ok {
return
}
@@ -304,7 +304,7 @@ func NewECHServer(ctx context.Context, logger log.Logger, options option.Inbound
} else if options.KeyPath != "" {
content, err := os.ReadFile(options.ECH.KeyPath)
if err != nil {
return nil, E.Cause(err, "read key")
return nil, E.Cause(err, "read ECH key")
}
echKey = content
} else {