Debug riverrun

v2fly · Mar 22, 2024 · 558175f · 558175f
1 parent e9f73d6
commit 558175f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -25,6 +25,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/v2fly/BrowserBridge v0.0.0-20210430233438-0570fc1d7d08
 	github.com/v2fly/VSign v0.0.0-20201108000810-e2adc24bf848
+	github.com/v2fly/riverrun v0.0.0-20240322144348-1f041445f73f
 	github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e
 	github.com/vincent-petithory/dataurl v1.0.0
 	github.com/xiaokangwang/VLite v0.0.0-20220418190619-cff95160a432
@@ -73,7 +74,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
 	github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4 // indirect
-	github.com/v2fly/riverrun v0.0.0-20240316204402-8447e4fd9049 // indirect
 	github.com/xtaci/smux v1.5.24 // indirect
 	go.uber.org/mock v0.3.0 // indirect
 	golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect

diff --git a/go.sum b/go.sum
@@ -324,8 +324,8 @@ github.com/v2fly/BrowserBridge v0.0.0-20210430233438-0570fc1d7d08 h1:4Yh46CVE3k/
 github.com/v2fly/BrowserBridge v0.0.0-20210430233438-0570fc1d7d08/go.mod h1:KAuQNm+LWQCOFqdBcUgihPzRpVXRKzGbTNhfEfRZ4wY=
 github.com/v2fly/VSign v0.0.0-20201108000810-e2adc24bf848 h1:p1UzXK6VAutXFFQMnre66h7g1BjRKUnLv0HfmmRoz7w=
 github.com/v2fly/VSign v0.0.0-20201108000810-e2adc24bf848/go.mod h1:p80Bv154ZtrGpXMN15slDCqc9UGmfBuUzheDFBYaW/M=
-github.com/v2fly/riverrun v0.0.0-20240316204402-8447e4fd9049 h1:NKX9EG7EjLAzdeI8lXQAbSBywIwkke0TZppSn+u03/I=
-github.com/v2fly/riverrun v0.0.0-20240316204402-8447e4fd9049/go.mod h1:2N9yEQTlHeGrjdpbDi3+RBq/pUf2LdSiOwbgNyva4VI=
+github.com/v2fly/riverrun v0.0.0-20240322144348-1f041445f73f h1:iLZduIN4zpD2a1fYGZBCpyT2+HK8icbcanY6gIOcnKg=
+github.com/v2fly/riverrun v0.0.0-20240322144348-1f041445f73f/go.mod h1:2N9yEQTlHeGrjdpbDi3+RBq/pUf2LdSiOwbgNyva4VI=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e/go.mod h1:5t19P9LBIrNamL6AcMQOncg/r10y3Pc01AbHeMhwlpU=
 github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=

diff --git a/transport/internet/headers/riverrun/riverrun.go b/transport/internet/headers/riverrun/riverrun.go
@@ -31,11 +31,11 @@ func (e errConn) Close() error {
 }
 
 func (e errConn) LocalAddr() gonet.Addr {
-	return nil
+	return &gonet.UnixAddr{Name: "error"}
 }
 
 func (e errConn) RemoteAddr() gonet.Addr {
-	return nil
+	return &gonet.UnixAddr{Name: "error"}
 }
 
 func (e errConn) SetDeadline(t time.Time) error {
@@ -55,11 +55,11 @@ type riverrunConnectionFactory struct {
 }
 
 func (p riverrunConnectionFactory) Infof(format string, a ...interface{}) {
-	newError(fmt.Scanf(format, a...)).AtInfo().WriteToLog()
+	newError(fmt.Sprintf(format, a...)).AtInfo().WriteToLog()
 }
 
 func (p riverrunConnectionFactory) Debugf(format string, a ...interface{}) {
-	newError(fmt.Scanf(format, a...)).AtDebug().WriteToLog()
+	newError(fmt.Sprintf(format, a...)).AtDebug().WriteToLog()
 }
 
 func (p riverrunConnectionFactory) Client(conn net.Conn) net.Conn {