mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 12:35:54 +00:00
367152556a
1. **Fixed XPadding Placement Dropdown**: - Added the missing `cookie` and `query` options to `xPaddingPlacement` (`stream_xhttp.html`). - *Why:* Previously, users wanting `cookie` obfuscation were forced to use the `header` placement string. This caused Xray-core to blindly intercept the entire monolithic HTTP Cookie header, failing internal padding-length validations and causing the inbound to silently drop the connection. 2. **Fixed Uplink Data Placement Validation**: - Replaced the unsupported `query` option with `cookie` in `uplinkDataPlacement`. - *Why:* Xray-core's `transport_internet.go` explicitly forbids `query` as an uplink placement option. Selecting it from the UI previously sent a payload that would cause Xray-core to instantly throw an `unsupported uplink data placement: query` panic. Adding `cookie` perfectly aligns the UI with Xray-core restrictions. ### Related Issues - Resolves #3992
72 lines
1.5 KiB
Go
72 lines
1.5 KiB
Go
package bytespool
|
|
|
|
import "sync"
|
|
|
|
func createAllocFunc(size int32) func() interface{} {
|
|
return func() interface{} {
|
|
return make([]byte, size)
|
|
}
|
|
}
|
|
|
|
// The following parameters controls the size of buffer pools.
|
|
// There are numPools pools. Starting from 2k size, the size of each pool is sizeMulti of the previous one.
|
|
// Package buf is guaranteed to not use buffers larger than the largest pool.
|
|
// Other packets may use larger buffers.
|
|
const (
|
|
numPools = 4
|
|
sizeMulti = 4
|
|
)
|
|
|
|
var (
|
|
pool [numPools]sync.Pool
|
|
poolSize [numPools]int32
|
|
)
|
|
|
|
func init() {
|
|
size := int32(2048)
|
|
for i := 0; i < numPools; i++ {
|
|
pool[i] = sync.Pool{
|
|
New: createAllocFunc(size),
|
|
}
|
|
poolSize[i] = size
|
|
size *= sizeMulti
|
|
}
|
|
}
|
|
|
|
// GetPool returns a sync.Pool that generates bytes array with at least the given size.
|
|
// It may return nil if no such pool exists.
|
|
//
|
|
// xray:api:stable
|
|
func GetPool(size int32) *sync.Pool {
|
|
for idx, ps := range poolSize {
|
|
if size <= ps {
|
|
return &pool[idx]
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Alloc returns a byte slice with at least the given size. Minimum size of returned slice is 2048.
|
|
//
|
|
// xray:api:stable
|
|
func Alloc(size int32) []byte {
|
|
pool := GetPool(size)
|
|
if pool != nil {
|
|
return pool.Get().([]byte)
|
|
}
|
|
return make([]byte, size)
|
|
}
|
|
|
|
// Free puts a byte slice into the internal pool.
|
|
//
|
|
// xray:api:stable
|
|
func Free(b []byte) {
|
|
size := int32(cap(b))
|
|
b = b[0:cap(b)]
|
|
for i := numPools - 1; i >= 0; i-- {
|
|
if size >= poolSize[i] {
|
|
pool[i].Put(b)
|
|
return
|
|
}
|
|
}
|
|
}
|