mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 20:45:50 +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
52 lines
1.2 KiB
Go
52 lines
1.2 KiB
Go
package singbridge
|
|
|
|
import (
|
|
M "github.com/sagernet/sing/common/metadata"
|
|
N "github.com/sagernet/sing/common/network"
|
|
"github.com/xtls/xray-core/common/net"
|
|
)
|
|
|
|
func ToNetwork(network string) net.Network {
|
|
switch N.NetworkName(network) {
|
|
case N.NetworkTCP:
|
|
return net.Network_TCP
|
|
case N.NetworkUDP:
|
|
return net.Network_UDP
|
|
default:
|
|
return net.Network_Unknown
|
|
}
|
|
}
|
|
|
|
func ToDestination(socksaddr M.Socksaddr, network net.Network) net.Destination {
|
|
// IsFqdn() implicitly checks if the domain name is valid
|
|
if socksaddr.IsFqdn() {
|
|
return net.Destination{
|
|
Network: network,
|
|
Address: net.DomainAddress(socksaddr.Fqdn),
|
|
Port: net.Port(socksaddr.Port),
|
|
}
|
|
}
|
|
|
|
// IsIP() implicitly checks if the IP address is valid
|
|
if socksaddr.IsIP() {
|
|
return net.Destination{
|
|
Network: network,
|
|
Address: net.IPAddress(socksaddr.Addr.AsSlice()),
|
|
Port: net.Port(socksaddr.Port),
|
|
}
|
|
}
|
|
|
|
return net.Destination{}
|
|
}
|
|
|
|
func ToSocksaddr(destination net.Destination) M.Socksaddr {
|
|
var addr M.Socksaddr
|
|
switch destination.Address.Family() {
|
|
case net.AddressFamilyDomain:
|
|
addr.Fqdn = destination.Address.Domain()
|
|
default:
|
|
addr.Addr = M.AddrFromIP(destination.Address.IP())
|
|
}
|
|
addr.Port = uint16(destination.Port)
|
|
return addr
|
|
}
|