ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-09-01 16:01:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ctxrw to wrappers

Browse Source
This commit is contained in:
9seconds
2018-06-05 10:50:57 +03:00
parent 4486fbb8f4
commit 65f8e2ac30
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
@@ -126,7 +126,7 @@ func (s *Server) getClientStream(ctx context.Context, cancel context.CancelFunc,
wConn = newLogReadWriteCloser(wConn, s.logger, socketID, "client") wConn = newLogReadWriteCloser(wConn, s.logger, socketID, "client")
wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor) wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor)
wConn = newCtxReadWriteCloser(ctx, cancel, wConn) wConn = wrappers.NewCtxRWC(ctx, cancel, wConn)
return wConn, dc, nil return wConn, dc, nil
} }
@@ -146,7 +146,7 @@ func (s *Server) getTelegramStream(ctx context.Context, cancel context.CancelFun
wConn = newLogReadWriteCloser(wConn, s.logger, socketID, "telegram") wConn = newLogReadWriteCloser(wConn, s.logger, socketID, "telegram")
wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor) wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor)
wConn = newCtxReadWriteCloser(ctx, cancel, wConn) wConn = wrappers.NewCtxRWC(ctx, cancel, wConn)
return wConn, nil return wConn, nil
} }
proxy/ctxrwc.go → wrappers/ctxrwc.go
+2 -2
View File
@@ -1,4 +1,4 @@
package proxy package wrappers
import ( import (
"context" "context"
@@ -48,7 +48,7 @@ func (c *CtxReadWriteCloser) Close() error {
return c.conn.Close() return c.conn.Close()
} }
func newCtxReadWriteCloser(ctx context.Context, cancel context.CancelFunc, conn io.ReadWriteCloser) io.ReadWriteCloser { func NewCtxRWC(ctx context.Context, cancel context.CancelFunc, conn io.ReadWriteCloser) io.ReadWriteCloser {
return &CtxReadWriteCloser{ return &CtxReadWriteCloser{
conn: conn, conn: conn,
ctx: ctx, ctx: ctx,