Merge pull request #2348 from FH0/master

修复一个导致 TPROXY 下 v2ray 断流的问题

app/proxyman/inbound/worker.go

@@ -187,6 +187,15 @@ func (c *udpConn) Write(buf []byte) (int, error) {
 	return n, err
 }
 
+// Implements buf.ActivityNotifiable
+func (c *udpConn) NotifyActivity() error {
+	if c.done.Done() {
+		return newError("connection is already closed")
+	}
+	c.updateActivity()
+	return nil
+}
+
 func (c *udpConn) Close() error {
 	common.Must(c.done.Close())
 	common.Must(common.Close(c.writer))

common/buf/copy.go

@@ -8,6 +8,11 @@ import (
 	"v2ray.com/core/common/signal"
 )
 
+// ActivityNotifiable is a object that accepts activity notification outside the object
+type ActivityNotifiable interface {
+	NotifyActivity() error
+}
+
 type dataHandler func(MultiBuffer)
 
 type copyHandler struct {
@@ -31,6 +36,15 @@ func UpdateActivity(timer signal.ActivityUpdater) CopyOption {
 	}
 }
 
+// NotifyActivity is a CopyOption to notify activity on each data copy operation.
+func NotifyActivity(notifier ActivityNotifiable) CopyOption {
+	return func(handler *copyHandler) {
+		handler.onData = append(handler.onData, func(MultiBuffer) {
+			notifier.NotifyActivity()
+		})
+	}
+}
+
 // CountSize is a CopyOption that sums the total size of data copied into the given SizeCounter.
 func CountSize(sc *SizeCounter) CopyOption {
 	return func(handler *copyHandler) {

proxy/dokodemo/dokodemo.go

@@ -164,6 +164,10 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn in
 
 			writer = &buf.SequentialWriter{Writer: tConn}
 			tReader := buf.NewPacketReader(tConn)
+			notify, ok := conn.(buf.ActivityNotifiable)
+			if !ok {
+				panic("conn should implement ActivityNotifiable")
+			}
 			requestCount++
 			tproxyRequest = func() error {
 				defer func() {
@@ -171,7 +175,7 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn in
 						timer.SetTimeout(plcy.Timeouts.DownlinkOnly)
 					}
 				}()
-				if err := buf.Copy(tReader, link.Writer, buf.UpdateActivity(timer)); err != nil {
+				if err := buf.Copy(tReader, link.Writer, buf.UpdateActivity(timer), buf.NotifyActivity(notify)); err != nil {
 					return newError("failed to transport request (TPROXY conn)").Base(err)
 				}
 				return nil