|
@@ -160,6 +160,7 @@ func (conn *ShadowsocksConn) GetMetrics() common.LogFields {
|
|
|
return logFields
|
|
return logFields
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+// Not safe for concurrent use.
|
|
|
type saltReader struct {
|
|
type saltReader struct {
|
|
|
net.Conn
|
|
net.Conn
|
|
|
server *ShadowsocksServer
|
|
server *ShadowsocksServer
|
|
@@ -173,9 +174,6 @@ func NewSaltReader(conn net.Conn, server *ShadowsocksServer) *saltReader {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// Note: it is assumed that the underlying transport, net.Conn, is a reliable
|
|
|
|
|
-// stream transport, i.e. TCP, therefore it is required that the caller stop
|
|
|
|
|
-// calling Read() on an instance of saltReader after an error is returned.
|
|
|
|
|
func (conn *saltReader) Read(b []byte) (int, error) {
|
|
func (conn *saltReader) Read(b []byte) (int, error) {
|
|
|
|
|
|
|
|
if conn.reader == nil {
|
|
if conn.reader == nil {
|
Miro