From 08944b735b9addb2a1f82d01f79804ac15702713 Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Sun, 8 Jun 2025 21:31:06 +0800 Subject: [PATCH] order --- infra/conf/transport_internet.go | 8 ++++---- transport/internet/reality/config.go | 4 ++-- transport/internet/reality/config.proto | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go index d2a41048..10372fa4 100644 --- a/infra/conf/transport_internet.go +++ b/infra/conf/transport_internet.go @@ -506,8 +506,8 @@ type REALITYConfig struct { MaxTimeDiff uint64 `json:"maxTimeDiff"` ShortIds []string `json:"shortIds"` - LimitFallbackUpload LimitFallback `json:"LimitFallbackUpload"` - LimitFallbackDownload LimitFallback `json:"LimitFallbackDownload"` + LimitFallbackUpload LimitFallback `json:"limitFallbackUpload"` + LimitFallbackDownload LimitFallback `json:"limitFallbackDownload"` Fingerprint string `json:"fingerprint"` ServerName string `json:"serverName"` @@ -611,13 +611,13 @@ func (c *REALITYConfig) Build() (proto.Message, error) { config.MaxTimeDiff = c.MaxTimeDiff config.LimitFallbackUpload = new(reality.LimitFallback) + config.LimitFallbackUpload.AfterBytes = c.LimitFallbackUpload.AfterBytes config.LimitFallbackUpload.BytesPerSec = c.LimitFallbackUpload.BytesPerSec config.LimitFallbackUpload.BurstBytesPerSec = c.LimitFallbackUpload.BurstBytesPerSec - config.LimitFallbackUpload.AfterBytes = c.LimitFallbackUpload.AfterBytes config.LimitFallbackDownload = new(reality.LimitFallback) + config.LimitFallbackDownload.AfterBytes = c.LimitFallbackDownload.AfterBytes config.LimitFallbackDownload.BytesPerSec = c.LimitFallbackDownload.BytesPerSec config.LimitFallbackDownload.BurstBytesPerSec = c.LimitFallbackDownload.BurstBytesPerSec - config.LimitFallbackDownload.AfterBytes = c.LimitFallbackDownload.AfterBytes } else { config.Fingerprint = strings.ToLower(c.Fingerprint) if config.Fingerprint == "unsafe" || config.Fingerprint == "hellogolang" { diff --git a/transport/internet/reality/config.go b/transport/internet/reality/config.go index 572b9814..61674bb8 100644 --- a/transport/internet/reality/config.go +++ b/transport/internet/reality/config.go @@ -33,14 +33,14 @@ func (c *Config) GetREALITYConfig() *reality.Config { KeyLogWriter: KeyLogWriterFromConfig(c), } if c.LimitFallbackUpload != nil { + config.LimitFallbackUpload.AfterBytes = c.LimitFallbackUpload.AfterBytes config.LimitFallbackUpload.BytesPerSec = c.LimitFallbackUpload.BytesPerSec config.LimitFallbackUpload.BurstBytesPerSec = c.LimitFallbackUpload.BurstBytesPerSec - config.LimitFallbackUpload.AfterBytes = c.LimitFallbackUpload.AfterBytes } if c.LimitFallbackDownload != nil { + config.LimitFallbackDownload.AfterBytes = c.LimitFallbackDownload.AfterBytes config.LimitFallbackDownload.BytesPerSec = c.LimitFallbackDownload.BytesPerSec config.LimitFallbackDownload.BurstBytesPerSec = c.LimitFallbackDownload.BurstBytesPerSec - config.LimitFallbackDownload.AfterBytes = c.LimitFallbackDownload.AfterBytes } config.ServerNames = make(map[string]bool) for _, serverName := range c.ServerNames { diff --git a/transport/internet/reality/config.proto b/transport/internet/reality/config.proto index 283839d9..83bff69f 100644 --- a/transport/internet/reality/config.proto +++ b/transport/internet/reality/config.proto @@ -31,7 +31,7 @@ message Config { } message LimitFallback { - uint64 bytes_per_sec = 1; - uint64 burst_bytes_per_sec = 2; - uint64 after_bytes = 3; + uint64 after_bytes = 1; + uint64 bytes_per_sec = 2; + uint64 burst_bytes_per_sec = 3; }