add router handler & connector

2025-02-07 15:44:31 +08:00
parent 379d9a73ad
commit 355c72477a
25 changed files with 1265 additions and 110 deletions
@@ -3,12 +3,15 @@ package tun
 import (
 	"bytes"
 	"context"
+	"errors"
+	"fmt"
 	"io"
 	"net"
 	"time"

 	"github.com/go-gost/core/common/bufpool"
 	"github.com/go-gost/core/logger"
+	xip "github.com/go-gost/x/internal/net/ip"
 	tun_util "github.com/go-gost/x/internal/util/tun"
 	"github.com/songgao/water/waterutil"
 	"golang.org/x/net/ipv4"
@@ -24,7 +27,7 @@ var (
 	magicHeader = []byte("GOST")
 )

-func (h *tunHandler) handleClient(ctx context.Context, conn net.Conn, raddr string, config *tun_util.Config, log logger.Logger) error {
+func (h *tunHandler) handleClient(ctx context.Context, conn net.Conn, network string, raddr string, config *tun_util.Config, log logger.Logger) error {
 	var ips []net.IP
 	for _, net := range config.Net {
 		ips = append(ips, net.IP)
@@ -35,20 +38,22 @@ func (h *tunHandler) handleClient(ctx context.Context, conn net.Conn, raddr stri

 	for {
 		err := func() error {
-			cc, err := h.options.Router.Dial(ctx, "udp", raddr)
+			cc, err := h.options.Router.Dial(ctx, network, raddr)
 			if err != nil {
 				return err
 			}
 			defer cc.Close()

-			ctx, cancel := context.WithCancel(ctx)
-			defer cancel()
+			if network == "udp" {
+				ctx, cancel := context.WithCancel(ctx)
+				defer cancel()

-			go h.keepalive(ctx, cc, ips)
+				go h.keepalive(ctx, cc, ips)
+			}

-			return h.transportClient(conn, cc, log)
+			return h.transportClient(ctx, conn, cc, log)
 		}()
-		if err == ErrTun {
+		if errors.Is(err, ErrTun) {
 			return err
 		}

@@ -94,8 +99,8 @@ func (h *tunHandler) keepalive(ctx context.Context, conn net.Conn, ips []net.IP)
 	}
 }

-func (h *tunHandler) transportClient(tun io.ReadWriter, conn net.Conn, log logger.Logger) error {
-	errc := make(chan error, 1)
+func (h *tunHandler) transportClient(ctx context.Context, tun io.ReadWriter, conn net.Conn, log logger.Logger) error {
+	errc := make(chan error, 2)

 	go func() {
 		for {
@@ -105,7 +110,7 @@ func (h *tunHandler) transportClient(tun io.ReadWriter, conn net.Conn, log logge

 				n, err := tun.Read(b)
 				if err != nil {
-					return ErrTun
+					return fmt.Errorf("%w: %s", ErrTun, err.Error())
 				}

 				if waterutil.IsIPv4(b[:n]) {
@@ -115,9 +120,11 @@ func (h *tunHandler) transportClient(tun io.ReadWriter, conn net.Conn, log logge
 						return nil
 					}

-					log.Tracef("%s >> %s %-4s %d/%-4d %-4x %d",
-						header.Src, header.Dst, ipProtocol(waterutil.IPv4Protocol(b[:n])),
-						header.Len, header.TotalLen, header.ID, header.Flags)
+					if log.IsLevelEnabled(logger.TraceLevel) {
+						log.Tracef("%s >> %s %-4s %d/%-4d %-4x %d",
+							header.Src, header.Dst, xip.Protocol(waterutil.IPv4Protocol(b[:n])),
+							header.Len, header.TotalLen, header.ID, header.Flags)
+					}
 				} else if waterutil.IsIPv6(b[:n]) {
 					header, err := ipv6.ParseHeader(b[:n])
 					if err != nil {
@@ -125,10 +132,12 @@ func (h *tunHandler) transportClient(tun io.ReadWriter, conn net.Conn, log logge
 						return nil
 					}

-					log.Tracef("%s >> %s %s %d %d",
-						header.Src, header.Dst,
-						ipProtocol(waterutil.IPProtocol(header.NextHeader)),
-						header.PayloadLen, header.TrafficClass)
+					if log.IsLevelEnabled(logger.TraceLevel) {
+						log.Tracef("%s >> %s %s %d %d",
+							header.Src, header.Dst,
+							xip.Protocol(waterutil.IPProtocol(header.NextHeader)),
+							header.PayloadLen, header.TrafficClass)
+					}
 				} else {
 					log.Warnf("unknown packet, discarded(%d)", n)
 					return nil
@@ -166,16 +175,18 @@ func (h *tunHandler) transportClient(tun io.ReadWriter, conn net.Conn, log logge
 					return nil
 				}

-				if waterutil.IsIPv4(b[:n]) {
+				if waterutil.IsIPv4(b) {
 					header, err := ipv4.ParseHeader(b[:n])
 					if err != nil {
 						log.Warn(err)
 						return nil
 					}

-					log.Tracef("%s >> %s %-4s %d/%-4d %-4x %d",
-						header.Src, header.Dst, ipProtocol(waterutil.IPv4Protocol(b[:n])),
-						header.Len, header.TotalLen, header.ID, header.Flags)
+					if log.IsLevelEnabled(logger.TraceLevel) {
+						log.Tracef("%s >> %s %-4s %d/%-4d %-4x %d",
+							header.Src, header.Dst, xip.Protocol(waterutil.IPv4Protocol(b[:n])),
+							header.Len, header.TotalLen, header.ID, header.Flags)
+					}
 				} else if waterutil.IsIPv6(b[:n]) {
 					header, err := ipv6.ParseHeader(b[:n])
 					if err != nil {
@@ -183,17 +194,19 @@ func (h *tunHandler) transportClient(tun io.ReadWriter, conn net.Conn, log logge
 						return nil
 					}

-					log.Tracef("%s > %s %s %d %d",
-						header.Src, header.Dst,
-						ipProtocol(waterutil.IPProtocol(header.NextHeader)),
-						header.PayloadLen, header.TrafficClass)
+					if log.IsLevelEnabled(logger.TraceLevel) {
+						log.Tracef("%s > %s %s %d %d",
+							header.Src, header.Dst,
+							xip.Protocol(waterutil.IPProtocol(header.NextHeader)),
+							header.PayloadLen, header.TrafficClass)
+					}
 				} else {
 					log.Warn("unknown packet, discarded")
 					return nil
 				}

 				if _, err = tun.Write(b[:n]); err != nil {
-					return ErrTun
+					return fmt.Errorf("%w: %s", ErrTun, err.Error())
 				}
 				return nil
 			}()
@@ -205,9 +218,14 @@ func (h *tunHandler) transportClient(tun io.ReadWriter, conn net.Conn, log logge
 		}
 	}()

-	err := <-errc
-	if err != nil && err == io.EOF {
-		err = nil
+	select {
+	case err := <-errc:
+		if err != nil && err == io.EOF {
+			err = nil
+		}
+		return err
+
+	case <-ctx.Done():
+		return ctx.Err()
 	}
-	return err
 }
@@ -12,10 +12,9 @@ import (
 	"github.com/go-gost/core/handler"
 	"github.com/go-gost/core/hop"
 	md "github.com/go-gost/core/metadata"
+	ctxvalue "github.com/go-gost/x/ctx"
 	tun_util "github.com/go-gost/x/internal/util/tun"
 	"github.com/go-gost/x/registry"
-	"github.com/songgao/water/waterutil"
-	ctxvalue "github.com/go-gost/x/ctx"
 )

 var (
@@ -90,12 +89,17 @@ func (h *tunHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
 		target = h.hop.Select(ctx)
 	}
 	if target != nil {
+		network := "udp"
+		if _, _, err := net.SplitHostPort(target.Addr); err != nil {
+			network = "ip"
+		}
+
 		log = log.WithFields(map[string]any{
-			"dst": fmt.Sprintf("%s/%s", target.Addr, "udp"),
+			"dst": fmt.Sprintf("%s/%s", target.Addr, network),
 		})
 		log.Debugf("%s >> %s", conn.RemoteAddr(), target.Addr)

-		if err := h.handleClient(ctx, conn, target.Addr, config, log); err != nil {
+		if err := h.handleClient(ctx, conn, network, target.Addr, config, log); err != nil {
 			log.Error(err)
 		}
 		return nil
@@ -104,25 +108,6 @@ func (h *tunHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
 	return h.handleServer(ctx, conn, config, log)
 }

-var mIPProts = map[waterutil.IPProtocol]string{
-	waterutil.HOPOPT:     "HOPOPT",
-	waterutil.ICMP:       "ICMP",
-	waterutil.IGMP:       "IGMP",
-	waterutil.GGP:        "GGP",
-	waterutil.TCP:        "TCP",
-	waterutil.UDP:        "UDP",
-	waterutil.IPv6_Route: "IPv6-Route",
-	waterutil.IPv6_Frag:  "IPv6-Frag",
-	waterutil.IPv6_ICMP:  "IPv6-ICMP",
-}
-
-func ipProtocol(p waterutil.IPProtocol) string {
-	if v, ok := mIPProts[p]; ok {
-		return v
-	}
-	return fmt.Sprintf("unknown(%d)", p)
-}
-
 type tunRouteKey [16]byte

 func ipToTunRouteKey(ip net.IP) (key tunRouteKey) {
@@ -11,6 +11,7 @@ import (
 	"github.com/go-gost/core/common/bufpool"
 	"github.com/go-gost/core/logger"
 	"github.com/go-gost/core/router"
+	xip "github.com/go-gost/x/internal/net/ip"
 	tun_util "github.com/go-gost/x/internal/util/tun"
 	"github.com/songgao/water/waterutil"
 	"golang.org/x/net/ipv4"
@@ -63,9 +64,11 @@ func (h *tunHandler) transportServer(ctx context.Context, tun io.ReadWriter, con
 					}
 					src, dst = header.Src, header.Dst

-					log.Tracef("%s >> %s %-4s %d/%-4d %-4x %d",
-						src, dst, ipProtocol(waterutil.IPv4Protocol(b[:n])),
-						header.Len, header.TotalLen, header.ID, header.Flags)
+					if log.IsLevelEnabled(logger.TraceLevel) {
+						log.Tracef("%s >> %s %-4s %d/%-4d %-4x %d",
+							src, dst, xip.Protocol(waterutil.IPv4Protocol(b[:n])),
+							header.Len, header.TotalLen, header.ID, header.Flags)
+					}
 				} else if waterutil.IsIPv6(b[:n]) {
 					header, err := ipv6.ParseHeader(b[:n])
 					if err != nil {
@@ -74,10 +77,12 @@ func (h *tunHandler) transportServer(ctx context.Context, tun io.ReadWriter, con
 					}
 					src, dst = header.Src, header.Dst

-					log.Tracef("%s >> %s %s %d %d",
-						src, dst,
-						ipProtocol(waterutil.IPProtocol(header.NextHeader)),
-						header.PayloadLen, header.TrafficClass)
+					if log.IsLevelEnabled(logger.TraceLevel) {
+						log.Tracef("%s >> %s %s %d %d",
+							src, dst,
+							xip.Protocol(waterutil.IPProtocol(header.NextHeader)),
+							header.PayloadLen, header.TrafficClass)
+					}
 				} else {
 					log.Warnf("unknown packet, discarded(%d)", n)
 					return nil
@@ -184,9 +189,11 @@ func (h *tunHandler) transportServer(ctx context.Context, tun io.ReadWriter, con
 					}
 					src, dst = header.Src, header.Dst

-					log.Tracef("%s >> %s %-4s %d/%-4d %-4x %d",
-						src, dst, ipProtocol(waterutil.IPv4Protocol(b[:n])),
-						header.Len, header.TotalLen, header.ID, header.Flags)
+					if log.IsLevelEnabled(logger.TraceLevel) {
+						log.Tracef("%s >> %s %-4s %d/%-4d %-4x %d",
+							src, dst, xip.Protocol(waterutil.IPv4Protocol(b[:n])),
+							header.Len, header.TotalLen, header.ID, header.Flags)
+					}
 				} else if waterutil.IsIPv6(b[:n]) {
 					header, err := ipv6.ParseHeader(b[:n])
 					if err != nil {
@@ -195,10 +202,12 @@ func (h *tunHandler) transportServer(ctx context.Context, tun io.ReadWriter, con
 					}
 					src, dst = header.Src, header.Dst

-					log.Tracef("%s > %s %s %d %d",
-						src, dst,
-						ipProtocol(waterutil.IPProtocol(header.NextHeader)),
-						header.PayloadLen, header.TrafficClass)
+					if log.IsLevelEnabled(logger.TraceLevel) {
+						log.Tracef("%s > %s %s %d %d",
+							src, dst,
+							xip.Protocol(waterutil.IPProtocol(header.NextHeader)),
+							header.PayloadLen, header.TrafficClass)
+					}
 				} else {
 					log.Warnf("unknown packet, discarded(%d): % x", n, b[:n])
 					return nil
@@ -263,9 +272,11 @@ func (h *tunHandler) findRouteFor(ctx context.Context, dst net.IP, router router
 		return nil
 	}

-	if route := router.GetRoute(ctx, dst); route != nil && route.Gateway != nil {
-		if v, ok := h.routes.Load(ipToTunRouteKey(route.Gateway)); ok {
-			return v.(net.Addr)
+	if route := router.GetRoute(ctx, dst); route != nil {
+		if gw := net.ParseIP(route.Gateway); gw != nil {
+			if v, ok := h.routes.Load(ipToTunRouteKey(gw)); ok {
+				return v.(net.Addr)
+			}
 		}
 	}
 	return nil