remove changes to maxUploadSize

XTLS · Jul 27, 2024 · 2932fb9 · 2932fb9
1 parent f372e2d
commit 2932fb9
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 57 deletions.
diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
@@ -230,7 +230,7 @@ type SplitHTTPConfig struct {
 	Path                 string            `json:"path"`
 	Headers              map[string]string `json:"headers"`
 	MaxConcurrentUploads int32             `json:"maxConcurrentUploads"`
-	MaxUploadSize        Int32Range        `json:"maxUploadSize"`
+	MaxUploadSize        int32             `json:"maxUploadSize"`
 	MinUploadIntervalMs  Int32Range        `json:"minUploadIntervalMs"`
 }
 
@@ -249,10 +249,7 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
 		Host:                 c.Host,
 		Header:               c.Headers,
 		MaxConcurrentUploads: c.MaxConcurrentUploads,
-		MaxUploadSize: &splithttp.RandRangeConfig{
-			From: c.MaxUploadSize.From,
-			To:   c.MaxUploadSize.To,
-		},
+		MaxUploadSize:        c.MaxUploadSize,
 		MinUploadIntervalMs: &splithttp.RandRangeConfig{
 			From: c.MinUploadIntervalMs.From,
 			To:   c.MinUploadIntervalMs.To,

diff --git a/transport/internet/splithttp/config.go b/transport/internet/splithttp/config.go
@@ -39,17 +39,12 @@ func (c *Config) GetNormalizedMaxConcurrentUploads() int32 {
 	return c.MaxConcurrentUploads
 }
 
-func (c *Config) GetNormalizedMaxUploadSize() RandRangeConfig {
-	r := c.MaxUploadSize
-
-	if r == nil {
-		r = &RandRangeConfig{
-			From: 1000000,
-			To:   1000000,
-		}
+func (c *Config) GetNormalizedMaxUploadSize() int32 {
+	if c.MaxUploadSize == 0 {
+		return 1000000
 	}
 
-	return *r
+	return c.MaxUploadSize
 }
 
 func (c *Config) GetNormalizedMinUploadInterval() RandRangeConfig {

diff --git a/transport/internet/splithttp/config.pb.go b/transport/internet/splithttp/config.pb.go
diff --git a/transport/internet/splithttp/config.proto b/transport/internet/splithttp/config.proto
@@ -11,7 +11,7 @@ message Config {
   string path = 2;
   map<string, string> header = 3;
   int32 maxConcurrentUploads = 4;
-  RandRangeConfig maxUploadSize = 5;
+  int32 maxUploadSize = 5;
   RandRangeConfig minUploadIntervalMs = 6;
 }
 

diff --git a/transport/internet/splithttp/dialer.go b/transport/internet/splithttp/dialer.go
@@ -202,7 +202,7 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
 	sessionId := sessionIdUuid.String()
 	baseURL := requestURL.String() + sessionId
 
-	uploadPipeReader, uploadPipeWriter := pipe.New(pipe.WithSizeLimit(maxUploadSize.roll()))
+	uploadPipeReader, uploadPipeWriter := pipe.New(pipe.WithSizeLimit(maxUploadSize))
 
 	go func() {
 		requestsLimiter := semaphore.New(int(maxConcurrentUploads))