ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-08-31 20:24:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor logrwc to wrappers

Browse Source
This commit is contained in:
9seconds
2018-06-05 10:52:50 +03:00
parent 65f8e2ac30
commit 26020fcd0c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/server.go
+2 -2
View File
@@ -124,7 +124,7 @@ func (s *Server) getClientStream(ctx context.Context, cancel context.CancelFunc,
return nil, 0, errors.Annotate(err, "Cannot create client stream") return nil, 0, errors.Annotate(err, "Cannot create client stream")
} }
wConn = newLogReadWriteCloser(wConn, s.logger, socketID, "client") wConn = wrappers.NewLogRWC(wConn, s.logger, socketID, "client")
wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor) wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor)
wConn = wrappers.NewCtxRWC(ctx, cancel, wConn) wConn = wrappers.NewCtxRWC(ctx, cancel, wConn)
@@ -144,7 +144,7 @@ func (s *Server) getTelegramStream(ctx context.Context, cancel context.CancelFun
return nil, errors.Annotate(err, "Cannot write hadnshake frame") return nil, errors.Annotate(err, "Cannot write hadnshake frame")
} }
wConn = newLogReadWriteCloser(wConn, s.logger, socketID, "telegram") wConn = wrappers.NewLogRWC(wConn, s.logger, socketID, "telegram")
wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor) wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor)
wConn = wrappers.NewCtxRWC(ctx, cancel, wConn) wConn = wrappers.NewCtxRWC(ctx, cancel, wConn)
proxy/logrwc.go → wrappers/logrwc.go
+2 -2
View File
@@ -1,4 +1,4 @@
package proxy package wrappers
import ( import (
"io" "io"
@@ -36,7 +36,7 @@ func (l *LogReadWriteCloser) Close() error {
return err return err
} }
func newLogReadWriteCloser(conn io.ReadWriteCloser, logger *zap.SugaredLogger, sockid string, name string) io.ReadWriteCloser { func NewLogRWC(conn io.ReadWriteCloser, logger *zap.SugaredLogger, sockid string, name string) io.ReadWriteCloser {
return &LogReadWriteCloser{ return &LogReadWriteCloser{
conn: conn, conn: conn,
logger: logger, logger: logger,