mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-05 14:43:03 +00:00
59f6685774
* maxUploadSize and maxConcurrentUploads can now be ranges on the client * maxUploadSize is now enforced on the server * the default of maxUploadSize is 2MB on the server, and 1MB on the client * the default of maxConcurrentUploads is 200 on the server, and 100 on the client * ranges on the server are treated as a single number. if server is configured as `"1-2"`, server will enforce `2` * querystrings in `path` are now handled correctly
99 lines
1.8 KiB
Go
99 lines
1.8 KiB
Go
package splithttp
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"math/big"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/transport/internet"
|
|
)
|
|
|
|
func (c *Config) GetNormalizedPath(addPath string, addQuery bool) string {
|
|
pathAndQuery := strings.SplitN(c.Path, "?", 2)
|
|
path := pathAndQuery[0]
|
|
query := ""
|
|
if len(pathAndQuery) > 1 && addQuery {
|
|
query = "?" + pathAndQuery[1]
|
|
}
|
|
|
|
if path == "" || path[0] != '/' {
|
|
path = "/" + path
|
|
}
|
|
if path[len(path)-1] != '/' {
|
|
path = path + "/"
|
|
}
|
|
|
|
return path + addPath + query
|
|
}
|
|
|
|
func (c *Config) GetRequestHeader() http.Header {
|
|
header := http.Header{}
|
|
for k, v := range c.Header {
|
|
header.Add(k, v)
|
|
}
|
|
return header
|
|
}
|
|
|
|
func (c *Config) GetNormalizedMaxConcurrentUploads(isServer bool) RandRangeConfig {
|
|
if c.MaxConcurrentUploads == nil {
|
|
if isServer {
|
|
return RandRangeConfig{
|
|
From: 200,
|
|
To: 200,
|
|
}
|
|
} else {
|
|
return RandRangeConfig{
|
|
From: 100,
|
|
To: 100,
|
|
}
|
|
}
|
|
}
|
|
|
|
return *c.MaxConcurrentUploads
|
|
}
|
|
|
|
func (c *Config) GetNormalizedMaxUploadSize(isServer bool) RandRangeConfig {
|
|
if c.MaxUploadSize == nil {
|
|
if isServer {
|
|
return RandRangeConfig{
|
|
From: 2000000,
|
|
To: 2000000,
|
|
}
|
|
} else {
|
|
return RandRangeConfig{
|
|
From: 1000000,
|
|
To: 1000000,
|
|
}
|
|
}
|
|
}
|
|
|
|
return *c.MaxUploadSize
|
|
}
|
|
|
|
func (c *Config) GetNormalizedMinUploadInterval() RandRangeConfig {
|
|
if c.MinUploadIntervalMs == nil {
|
|
return RandRangeConfig{
|
|
From: 30,
|
|
To: 30,
|
|
}
|
|
}
|
|
|
|
return *c.MinUploadIntervalMs
|
|
}
|
|
|
|
func init() {
|
|
common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} {
|
|
return new(Config)
|
|
}))
|
|
}
|
|
|
|
func (c RandRangeConfig) roll() int32 {
|
|
if c.From == c.To {
|
|
return c.From
|
|
}
|
|
bigInt, _ := rand.Int(rand.Reader, big.NewInt(int64(c.To-c.From)))
|
|
return c.From + int32(bigInt.Int64())
|
|
}
|