chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08: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
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/internal/build_libbox/main.go
View File

@ -54,7 +54,7 @@ func init() {
sharedFlags = append(sharedFlags, "-X github.com/sagernet/sing-box/constant.Version="+currentTag+" -s -w -buildid=")
debugFlags = append(debugFlags, "-X github.com/sagernet/sing-box/constant.Version="+currentTag)
sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_utls", "with_clash_api")
sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_ech", "with_utls", "with_clash_api")
iosTags = append(iosTags, "with_dhcp", "with_low_memory", "with_conntrack")
debugTags = append(debugTags, "debug")
}

3
cmd/internal/update_apple_version/main.go
View File

@ -29,8 +29,7 @@ func main() {
newContent, updated0 := findAndReplace(objectsMap, projectContent, []string{"io.nekohasekai.sfa"}, newVersion.VersionString())
newContent, updated1 := findAndReplace(objectsMap, newContent, []string{"io.nekohasekai.sfa.independent", "io.nekohasekai.sfa.system"}, newVersion.String())
if updated0 || updated1 {
log.Info("updated version to ", newVersion.VersionString())
common.Must(os.WriteFile("sing-box.xcodeproj/project.pbxproj.bak", []byte(projectContent), 0o644))
log.Info("updated version to ", newVersion.VersionString(), " (", newVersion.String(), ")")
common.Must(os.WriteFile("sing-box.xcodeproj/project.pbxproj", []byte(newContent), 0o644))
} else {
log.Info("version not changed")

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 {