update tap

listener/tap/listener.go

@@ -1,7 +1,9 @@
 package tap
 
 import (
+	"context"
 	"net"
+	"time"
 
 	"github.com/go-gost/core/listener"
 	"github.com/go-gost/core/logger"
@@ -18,7 +20,6 @@ func init() {
 }
 
 type tapListener struct {
-	saddr   string
 	addr    net.Addr
 	cqueue  chan net.Conn
 	closed  chan struct{}
@@ -33,7 +34,6 @@ func NewListener(opts ...listener.Option) listener.Listener {
 		opt(&options)
 	}
 	return &tapListener{
-		saddr:   options.Addr,
 		logger:  options.Logger,
 		options: options,
 	}
@@ -48,48 +48,72 @@ func (l *tapListener) Init(md mdata.Metadata) (err error) {
 	if xnet.IsIPv4(l.options.Addr) {
 		network = "udp4"
 	}
-	l.addr, err = net.ResolveUDPAddr(network, l.saddr)
+	l.addr, err = net.ResolveUDPAddr(network, l.options.Addr)
 	if err != nil {
 		return
 	}
 
-	ifce, ip, err := l.createTap()
-	if err != nil {
-		if ifce != nil {
-			ifce.Close()
-		}
-		return
-	}
-
-	itf, err := net.InterfaceByName(ifce.Name())
-	if err != nil {
-		return
-	}
-
-	addrs, _ := itf.Addrs()
-	l.logger.Infof("name: %s, mac: %s, mtu: %d, addrs: %s",
-		itf.Name, itf.HardwareAddr, itf.MTU, addrs)
-
 	l.cqueue = make(chan net.Conn, 1)
 	l.closed = make(chan struct{})
 
-	var c net.Conn
-	c = &conn{
-		ifce:  ifce,
-		laddr: l.addr,
-		raddr: &net.IPAddr{IP: ip},
-	}
-	c = metrics.WrapConn(l.options.Service, c)
-	c = limiter.WrapConn(l.options.TrafficLimiter, c)
-	c = withMetadata(mdx.NewMetadata(map[string]any{
-		"config": l.md.config,
-	}), c)
-
-	l.cqueue <- c
+	go l.listenLoop()
 
 	return
 }
 
+func (l *tapListener) listenLoop() {
+	for {
+		ctx, cancel := context.WithCancel(context.Background())
+		err := func() error {
+			ifce, name, ip, err := l.createTap()
+			if err != nil {
+				if ifce != nil {
+					ifce.Close()
+				}
+				return err
+			}
+
+			itf, err := net.InterfaceByName(name)
+			if err != nil {
+				return err
+			}
+
+			addrs, _ := itf.Addrs()
+			l.logger.Infof("name: %s, net: %s, mtu: %d, addrs: %s",
+				itf.Name, ip, itf.MTU, addrs)
+
+			var c net.Conn
+			c = &conn{
+				ifce:   ifce,
+				laddr:  l.addr,
+				raddr:  &net.IPAddr{IP: ip},
+				cancel: cancel,
+			}
+			c = metrics.WrapConn(l.options.Service, c)
+			c = limiter.WrapConn(l.options.TrafficLimiter, c)
+			c = withMetadata(mdx.NewMetadata(map[string]any{
+				"config": l.md.config,
+			}), c)
+
+			l.cqueue <- c
+
+			return nil
+		}()
+		if err != nil {
+			l.logger.Error(err)
+			cancel()
+		}
+
+		select {
+		case <-ctx.Done():
+		case <-l.closed:
+			return
+		}
+
+		time.Sleep(time.Second)
+	}
+}
+
 func (l *tapListener) Accept() (net.Conn, error) {
 	select {
 	case conn := <-l.cqueue: