mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-05-08 14:13:22 +00:00
Xray-core: Mark "legacy reverse" as removed to avoid confusions
https://github.com/XTLS/Xray-core/issues/5973#issuecomment-4273582111 https://github.com/XTLS/Xray-core/pull/5947#issuecomment-4273415252
This commit is contained in:
@@ -547,6 +547,7 @@ func (c *Config) Build() (*core.Config, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if c.Reverse != nil {
|
if c.Reverse != nil {
|
||||||
|
return nil, errors.PrintRemovedFeatureError(`"legacy reverse"`, `"VLESS Reverse Proxy"`)
|
||||||
r, err := c.Reverse.Build()
|
r, err := c.Reverse.Build()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.New("failed to build reverse configuration").Base(err)
|
return nil, errors.New("failed to build reverse configuration").Base(err)
|
||||||
|
|||||||
@@ -348,20 +348,19 @@ type PacketReader struct {
|
|||||||
|
|
||||||
func (r *PacketReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
|
func (r *PacketReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
|
||||||
b := buf.New()
|
b := buf.New()
|
||||||
|
b.Resize(0, buf.Size)
|
||||||
for {
|
for {
|
||||||
b.Resize(0, buf.Size)
|
|
||||||
n, d, err := r.PacketConnWrapper.ReadFrom(b.Bytes())
|
n, d, err := r.PacketConnWrapper.ReadFrom(b.Bytes())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
b.Release()
|
b.Release()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
b.Resize(0, int32(n))
|
|
||||||
|
|
||||||
udpAddr := d.(*net.UDPAddr)
|
udpAddr := d.(*net.UDPAddr)
|
||||||
sourceAddr := net.IPAddress(udpAddr.IP)
|
sourceAddr := net.IPAddress(udpAddr.IP)
|
||||||
if isBlockedAddress(r.BlockedIPMatcher, sourceAddr) {
|
if isBlockedAddress(r.BlockedIPMatcher, sourceAddr) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
b.Resize(0, int32(n))
|
||||||
|
|
||||||
// if udp dest addr is changed, we are unable to get the correct src addr
|
// if udp dest addr is changed, we are unable to get the correct src addr
|
||||||
// so we don't attach src info to udp packet, break cone behavior, assuming the dial dest is the expected scr addr
|
// so we don't attach src info to udp packet, break cone behavior, assuming the dial dest is the expected scr addr
|
||||||
|
|||||||
Reference in New Issue
Block a user