From 26020fcd0cb42ed3b59f820ce180fe501331f9cb Mon Sep 17 00:00:00 2001 From: 9seconds Date: Tue, 5 Jun 2018 10:52:50 +0300 Subject: [PATCH] Refactor logrwc to wrappers --- proxy/server.go | 4 ++-- {proxy => wrappers}/logrwc.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename {proxy => wrappers}/logrwc.go (88%) diff --git a/proxy/server.go b/proxy/server.go index 14458a0..67815e5 100644 --- a/proxy/server.go +++ b/proxy/server.go @@ -124,7 +124,7 @@ func (s *Server) getClientStream(ctx context.Context, cancel context.CancelFunc, 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.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") } - 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.NewCtxRWC(ctx, cancel, wConn) diff --git a/proxy/logrwc.go b/wrappers/logrwc.go similarity index 88% rename from proxy/logrwc.go rename to wrappers/logrwc.go index b783d3b..00ef597 100644 --- a/proxy/logrwc.go +++ b/wrappers/logrwc.go @@ -1,4 +1,4 @@ -package proxy +package wrappers import ( "io" @@ -36,7 +36,7 @@ func (l *LogReadWriteCloser) Close() error { 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{ conn: conn, logger: logger,