Merge branch 'main' into socket_options

* main: (24 commits) Add "nosni" option to send empty SNI (XTLS#3214) API: add Source IP Block command (XTLS#3211) v1.8.10 Fix TestXrayConfig in xray_test.go Add separate host config for websocket Update proto file for websocket and httpupgrade (breaking) API - Add | Remove Routing Rules (XTLS#3189) Fix host in headers field does not work XTLS#3191 fix: config `burstObservatory` override Bump github.com/sagernet/sing from 0.3.6 to 0.3.8 Add support for HTTPupgrade custom headers improve balancer_info.go Fix(httpupgrade): `X-Forwarded-For` header not read. (XTLS#3172) Allow to send through random IPv6 Update HTTPUpgrade spelling and proto Chore: Clean up legacy `field` usage Update README.md Bump github.com/quic-go/quic-go from 0.41.0 to 0.42.0 Fix HTTPUpgrade transport register HTTPUpgrade 0-RTT (XTLS#3152) ...
arror · Apr 2, 2024 · 52940ae · 52940ae
2 parents 72c572d + ec22249
commit 52940ae
Show file tree

Hide file tree

Showing 103 changed files with 1,490 additions and 649 deletions.
diff --git a/README.md b/README.md
@@ -77,7 +77,6 @@
   - [HiddifyNG](https://github.com/hiddify/HiddifyNG)
   - [X-flutter](https://github.com/XTLS/X-flutter)
 - iOS & macOS arm64
-  - [Mango](https://github.com/arror/Mango)
   - [FoXray](https://apps.apple.com/app/foxray/id6448898396)
   - [Streisand](https://apps.apple.com/app/streisand/id6450534064)
 - macOS arm64 & x64

diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go
diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go
diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go
diff --git a/app/dns/fakedns/fakedns.pb.go b/app/dns/fakedns/fakedns.pb.go
diff --git a/app/dns/nameserver_quic.go b/app/dns/nameserver_quic.go
@@ -48,7 +48,7 @@ func NewQUICNameServer(url *url.URL, queryStrategy QueryStrategy) (*QUICNameServ
 	newError("DNS: created Local DNS-over-QUIC client for ", url.String()).AtInfo().WriteToLog()
 
 	var err error
-	port := net.Port(784)
+	port := net.Port(853)
 	if url.Port() != "" {
 		port, err = net.PortFromString(url.Port())
 		if err != nil {

diff --git a/app/log/command/config.pb.go b/app/log/command/config.pb.go
diff --git a/app/log/config.pb.go b/app/log/config.pb.go
diff --git a/app/metrics/config.pb.go b/app/metrics/config.pb.go
diff --git a/app/observatory/burst/config.pb.go b/app/observatory/burst/config.pb.go
diff --git a/app/observatory/command/command.pb.go b/app/observatory/command/command.pb.go
diff --git a/app/observatory/config.pb.go b/app/observatory/config.pb.go
diff --git a/app/policy/config.pb.go b/app/policy/config.pb.go
diff --git a/app/proxyman/command/command.pb.go b/app/proxyman/command/command.pb.go
diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go
diff --git a/app/proxyman/config.proto b/app/proxyman/config.proto
@@ -91,6 +91,7 @@ message SenderConfig {
   xray.transport.internet.StreamConfig stream_settings = 2;
   xray.transport.internet.ProxyConfig proxy_settings = 3;
   MultiplexingConfig multiplex_settings = 4;
+  string via_cidr = 5;
 }
 
 message MultiplexingConfig {

diff --git a/app/proxyman/outbound/handler.go b/app/proxyman/outbound/handler.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"errors"
 	"io"
+	"math/rand"
+	gonet "net"
 	"os"
 
 	"github.com/xtls/xray-core/app/proxyman"
@@ -269,7 +271,11 @@ func (h *Handler) Dial(ctx context.Context, dest net.Destination) (stat.Connecti
 				outbound = new(session.Outbound)
 				ctx = session.ContextWithOutbound(ctx, outbound)
 			}
-			outbound.Gateway = h.senderSettings.Via.AsAddress()
+			if h.senderSettings.ViaCidr == "" {
+				outbound.Gateway = h.senderSettings.Via.AsAddress()
+			} else { //Get a random address.
+				outbound.Gateway = ParseRandomIPv6(h.senderSettings.Via.AsAddress(), h.senderSettings.ViaCidr)
+			}
 		}
 	}
 
@@ -312,3 +318,17 @@ func (h *Handler) Close() error {
 	common.Close(h.mux)
 	return nil
 }
+
+// Return random IPv6 in a CIDR block
+func ParseRandomIPv6(address net.Address, prefix string) net.Address {
+	addr := address.IP().String()
+	_, network, _ := gonet.ParseCIDR(addr + "/" + prefix)
+
+	ipv6 := network.IP.To16()
+	prefixLen, _ := network.Mask.Size()
+	for i := prefixLen / 8; i < 16; i++ {
+		ipv6[i] = byte(rand.Intn(256))
+	}
+
+	return net.ParseAddress(gonet.IP(ipv6).String())
+}
diff --git a/app/reverse/config.pb.go b/app/reverse/config.pb.go
diff --git a/app/router/command/command.go b/app/router/command/command.go
@@ -54,6 +54,20 @@ func (s *routingServer) OverrideBalancerTarget(ctx context.Context, request *Ove
 	return nil, newError("unsupported router implementation")
 }
 
+func (s *routingServer) AddRule(ctx context.Context, request *AddRuleRequest) (*AddRuleResponse, error) {
+	if bo, ok := s.router.(routing.Router); ok {
+		return &AddRuleResponse{}, bo.AddRule(request.Config, request.ShouldAppend)
+	}
+	return nil, newError("unsupported router implementation")
+
+}
+func (s *routingServer) RemoveRule(ctx context.Context, request *RemoveRuleRequest) (*RemoveRuleResponse, error) {
+	if bo, ok := s.router.(routing.Router); ok {
+		return &RemoveRuleResponse{}, bo.RemoveRule(request.RuleTag)
+	}
+	return nil, newError("unsupported router implementation")
+}
+
 // NewRoutingServer creates a statistics service with statistics manager.
 func NewRoutingServer(router routing.Router, routingStats stats.Channel) RoutingServiceServer {
 	return &routingServer{