hesoyam/sing-box-extended-mirror
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-10-07 06:43:40 +00:00
Code Issues Packages Projects Releases 2 Wiki Activity

endpoint: Drop packets to non-IP destinations

Browse Source
This commit is contained in:
世界
2026-08-30 17:41:47 +08:00
parent 673485755c
commit be54f9afef
6 changed files with 131 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/openconnect/client.go
+8 -3
View File
@@ -15,6 +15,7 @@ import (
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/adapter/endpoint"
"github.com/sagernet/sing-box/common/dialer"
"github.com/sagernet/sing-box/common/iponly"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/option"
@@ -587,16 +588,20 @@ func (e *Endpoint) ListenPacketWithDestination(ctx context.Context, destination
if err != nil {
return nil, netip.Addr{}, err
}
return N.ListenSerial(ctx, e.device, destination, destinationAddresses)
packetConn, destinationAddress, err := N.ListenSerial(ctx, e.device, destination, destinationAddresses)
if err != nil {
return nil, netip.Addr{}, err
}
return iponly.NewPacketConn(e.logger, packetConn), destinationAddress, nil
}
packetConn, err := e.device.ListenPacket(ctx, destination)
if err != nil {
return nil, netip.Addr{}, err
}
if destination.IsIP() {
return packetConn, destination.Addr, nil
return iponly.NewPacketConn(e.logger, packetConn), destination.Addr, nil
}
return packetConn, netip.Addr{}, nil
return iponly.NewPacketConn(e.logger, packetConn), netip.Addr{}, nil
}
func (e *Endpoint) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
protocol/openvpn/client.go
+8 -3
View File
@@ -13,6 +13,7 @@ import (
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/adapter/endpoint"
"github.com/sagernet/sing-box/common/dialer"
"github.com/sagernet/sing-box/common/iponly"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/option"
@@ -791,16 +792,20 @@ func (c *ClientEndpoint) ListenPacketWithDestination(ctx context.Context, destin
if err != nil {
return nil, netip.Addr{}, err
}
return N.ListenSerial(ctx, c.device, destination, destinationAddresses)
packetConn, destinationAddress, err := N.ListenSerial(ctx, c.device, destination, destinationAddresses)
if err != nil {
return nil, netip.Addr{}, err
}
return iponly.NewPacketConn(c.logger, packetConn), destinationAddress, nil
}
packetConn, err := c.device.ListenPacket(ctx, destination)
if err != nil {
return nil, netip.Addr{}, err
}
if destination.IsIP() {
return packetConn, destination.Addr, nil
return iponly.NewPacketConn(c.logger, packetConn), destination.Addr, nil
}
return packetConn, netip.Addr{}, nil
return iponly.NewPacketConn(c.logger, packetConn), netip.Addr{}, nil
}
func (c *ClientEndpoint) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
protocol/openvpn/server.go
+8 -3
View File
@@ -12,6 +12,7 @@ import (
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/adapter/endpoint"
"github.com/sagernet/sing-box/common/dialer"
"github.com/sagernet/sing-box/common/iponly"
"github.com/sagernet/sing-box/common/listener"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/log"
@@ -753,16 +754,20 @@ func (s *ServerEndpoint) ListenPacketWithDestination(ctx context.Context, destin
if err != nil {
return nil, netip.Addr{}, err
}
return N.ListenSerial(ctx, s.device, destination, destinationAddresses)
packetConn, destinationAddress, err := N.ListenSerial(ctx, s.device, destination, destinationAddresses)
if err != nil {
return nil, netip.Addr{}, err
}
return iponly.NewPacketConn(s.logger, packetConn), destinationAddress, nil
}
packetConn, err := s.device.ListenPacket(ctx, destination)
if err != nil {
return nil, netip.Addr{}, err
}
if destination.IsIP() {
return packetConn, destination.Addr, nil
return iponly.NewPacketConn(s.logger, packetConn), destination.Addr, nil
}
return packetConn, netip.Addr{}, nil
return iponly.NewPacketConn(s.logger, packetConn), netip.Addr{}, nil
}
func (s *ServerEndpoint) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
protocol/tailscale/endpoint.go
+4 -3
View File
@@ -26,6 +26,7 @@ import (
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/adapter/endpoint"
"github.com/sagernet/sing-box/common/dialer"
"github.com/sagernet/sing-box/common/iponly"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/dns"
"github.com/sagernet/sing-box/log"
@@ -858,7 +859,7 @@ func (t *Endpoint) ListenPacketWithDestination(ctx context.Context, destination
for _, address := range destinationAddresses {
packetConn, packetErr := t.listenPacketWithAddress(ctx, M.SocksaddrFrom(address, destination.Port))
if packetErr == nil {
return packetConn, address, nil
return iponly.NewPacketConn(t.logger, packetConn), address, nil
}
errors = append(errors, packetErr)
}
@@ -869,9 +870,9 @@ func (t *Endpoint) ListenPacketWithDestination(ctx context.Context, destination
return nil, netip.Addr{}, err
}
if destination.IsIP() {
return packetConn, destination.Addr, nil
return iponly.NewPacketConn(t.logger, packetConn), destination.Addr, nil
}
return packetConn, netip.Addr{}, nil
return iponly.NewPacketConn(t.logger, packetConn), netip.Addr{}, nil
}
func (t *Endpoint) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
protocol/wireguard/endpoint.go
+8 -3
View File
@@ -11,6 +11,7 @@ import (
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/adapter/endpoint"
"github.com/sagernet/sing-box/common/dialer"
"github.com/sagernet/sing-box/common/iponly"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/option"
@@ -298,16 +299,20 @@ func (w *Endpoint) ListenPacketWithDestination(ctx context.Context, destination
if err != nil {
return nil, netip.Addr{}, err
}
return N.ListenSerial(ctx, w.endpoint, destination, destinationAddresses)
packetConn, destinationAddress, err := N.ListenSerial(ctx, w.endpoint, destination, destinationAddresses)
if err != nil {
return nil, netip.Addr{}, err
}
return iponly.NewPacketConn(w.logger, packetConn), destinationAddress, nil
}
packetConn, err := w.endpoint.ListenPacket(ctx, destination)
if err != nil {
return nil, netip.Addr{}, err
}
if destination.IsIP() {
return packetConn, destination.Addr, nil
return iponly.NewPacketConn(w.logger, packetConn), destination.Addr, nil
}
return packetConn, netip.Addr{}, nil
return iponly.NewPacketConn(w.logger, packetConn), netip.Addr{}, nil
}
func (w *Endpoint) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {