mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 04:55:46 +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
35 lines
1 KiB
Go
35 lines
1 KiB
Go
package outbound
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
|
|
"github.com/sagernet/sing/common/uot"
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/transport/internet"
|
|
"github.com/xtls/xray-core/transport/internet/stat"
|
|
)
|
|
|
|
func (h *Handler) getUoTConnection(ctx context.Context, dest net.Destination) (stat.Connection, error) {
|
|
if dest.Address == nil {
|
|
return nil, errors.New("nil destination address")
|
|
}
|
|
if !dest.Address.Family().IsDomain() {
|
|
return nil, os.ErrInvalid
|
|
}
|
|
var uotVersion int
|
|
if dest.Address.Domain() == uot.MagicAddress {
|
|
uotVersion = uot.Version
|
|
} else if dest.Address.Domain() == uot.LegacyMagicAddress {
|
|
uotVersion = uot.LegacyVersion
|
|
} else {
|
|
return nil, os.ErrInvalid
|
|
}
|
|
packetConn, err := internet.ListenSystemPacket(ctx, &net.UDPAddr{IP: net.AnyIP.IP(), Port: 0}, h.streamSettings.SocketSettings)
|
|
if err != nil {
|
|
return nil, errors.New("unable to listen socket").Base(err)
|
|
}
|
|
conn := uot.NewServerConn(packetConn, uotVersion)
|
|
return h.getStatCouterConnection(conn), nil
|
|
}
|