Add HandshakeSuccess interface

SagerNet · Sep 8, 2023 · b0849c4 · b0849c4
1 parent 03c21c0
commit b0849c4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/common/bufio/copy.go b/common/bufio/copy.go
@@ -98,7 +98,7 @@ func CopyExtendedBuffer(originSource io.Writer, destination N.ExtendedWriter, so
 		err = destination.WriteBuffer(buffer)
 		if err != nil {
 			if !notFirstTime {
-				err = N.HandshakeFailure(originSource, err)
+				err = N.ReportHandshakeFailure(originSource, err)
 			}
 			return
 		}
@@ -130,7 +130,7 @@ func CopyExtendedWithSrcBuffer(originSource io.Reader, destination N.ExtendedWri
 		if err != nil {
 			buffer.Release()
 			if !notFirstTime {
-				err = N.HandshakeFailure(originSource, err)
+				err = N.ReportHandshakeFailure(originSource, err)
 			}
 			return
 		}
@@ -175,7 +175,7 @@ func CopyExtendedWithPool(originSource io.Reader, destination N.ExtendedWriter,
 		if err != nil {
 			buffer.Release()
 			if !notFirstTime {
-				err = N.HandshakeFailure(originSource, err)
+				err = N.ReportHandshakeFailure(originSource, err)
 			}
 			return
 		}
@@ -304,7 +304,7 @@ func CopyPacketWithSrcBuffer(originSource N.PacketReader, destinationConn N.Pack
 		if err != nil {
 			buffer.Release()
 			if !notFirstTime {
-				err = N.HandshakeFailure(originSource, err)
+				err = N.ReportHandshakeFailure(originSource, err)
 			}
 			return
 		}
@@ -345,7 +345,7 @@ func CopyPacketWithPool(originSource N.PacketReader, destinationConn N.PacketWri
 		if err != nil {
 			buffer.Release()
 			if !notFirstTime {
-				err = N.HandshakeFailure(originSource, err)
+				err = N.ReportHandshakeFailure(originSource, err)
 			}
 			return
 		}
@@ -381,7 +381,7 @@ func WritePacketWithPool(originSource N.PacketReader, destinationConn N.PacketWr
 		if err != nil {
 			buffer.Release()
 			if !notFirstTime {
-				err = N.HandshakeFailure(originSource, err)
+				err = N.ReportHandshakeFailure(originSource, err)
 			}
 			return
 		}

diff --git a/common/bufio/copy_direct_posix.go b/common/bufio/copy_direct_posix.go
@@ -53,7 +53,7 @@ func copyWaitWithPool(originSource io.Reader, destination N.ExtendedWriter, sour
 		if err != nil {
 			buffer.Release()
 			if !notFirstTime {
-				err = N.HandshakeFailure(originSource, err)
+				err = N.ReportHandshakeFailure(originSource, err)
 			}
 			return
 		}
@@ -102,7 +102,7 @@ func copyPacketWaitWithPool(originSource N.PacketReader, destinationConn N.Packe
 		if err != nil {
 			buffer.Release()
 			if !notFirstTime {
-				err = N.HandshakeFailure(originSource, err)
+				err = N.ReportHandshakeFailure(originSource, err)
 			}
 			return
 		}

diff --git a/common/network/handshake.go b/common/network/handshake.go
@@ -5,15 +5,26 @@ import (
 	E "github.com/sagernet/sing/common/exceptions"
 )
 
-type HandshakeConn interface {
+type HandshakeFailure interface {
 	HandshakeFailure(err error) error
 }
 
-func HandshakeFailure(conn any, err error) error {
-	if handshakeConn, isHandshakeConn := common.Cast[HandshakeConn](conn); isHandshakeConn {
+type HandshakeSuccess interface {
+	HandshakeSuccess() error
+}
+
+func ReportHandshakeFailure(conn any, err error) error {
+	if handshakeConn, isHandshakeConn := common.Cast[HandshakeFailure](conn); isHandshakeConn {
 		return E.Append(err, handshakeConn.HandshakeFailure(err), func(err error) error {
 			return E.Cause(err, "write handshake failure")
 		})
 	}
 	return err
 }
+
+func ReportHandshakeSuccess(conn any) error {
+	if handshakeConn, isHandshakeConn := common.Cast[HandshakeSuccess](conn); isHandshakeConn {
+		return handshakeConn.HandshakeSuccess()
+	}
+	return nil
+}