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

Use all wrappers

Browse Source
This commit is contained in:
9seconds
2018-05-31 09:54:20 +03:00
parent 61c70bb07d
commit a27a8494a6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/server.go
+8 -4
View File
@@ -97,7 +97,7 @@ func (s *Server) makeSocketID() string {
return uuid.NewV4().String() return uuid.NewV4().String()
} }
func (s *Server) getClientStream(conn net.Conn, ctx context.Context, cancel context.CancelFunc, socketID string) (*CipherReadWriteCloser, int16, error) { func (s *Server) getClientStream(conn net.Conn, ctx context.Context, cancel context.CancelFunc, socketID string) (io.ReadWriteCloser, int16, error) {
frame, err := obfuscated2.ExtractFrame(conn) frame, err := obfuscated2.ExtractFrame(conn)
if err != nil { if err != nil {
return nil, 0, errors.Annotate(err, "Cannot create client stream") return nil, 0, errors.Annotate(err, "Cannot create client stream")
@@ -108,12 +108,14 @@ func (s *Server) getClientStream(conn net.Conn, ctx context.Context, cancel cont
return nil, 0, errors.Annotate(err, "Cannot create client stream") return nil, 0, errors.Annotate(err, "Cannot create client stream")
} }
wConn := newCipherReadWriteCloser(conn, obfs2) wConn := newLogReadWriteCloser(conn, s.logger, socketID, "client")
wConn = newCipherReadWriteCloser(conn, obfs2)
wConn = newCtxReadWriteCloser(wConn, ctx, cancel)
return wConn, dc, nil return wConn, dc, nil
} }
func (s *Server) getTelegramStream(dc int16, ctx context.Context, cancel context.CancelFunc, socketID string) (*CipherReadWriteCloser, error) { func (s *Server) getTelegramStream(dc int16, ctx context.Context, cancel context.CancelFunc, socketID string) (io.ReadWriteCloser, error) {
socket, err := dialToTelegram(dc) socket, err := dialToTelegram(dc)
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot dial") return nil, errors.Annotate(err, "Cannot dial")
@@ -124,7 +126,9 @@ func (s *Server) getTelegramStream(dc int16, ctx context.Context, cancel context
return nil, errors.Annotate(err, "Cannot write hadnshake frame") return nil, errors.Annotate(err, "Cannot write hadnshake frame")
} }
wConn := newCipherReadWriteCloser(socket, obfs2) wConn := newLogReadWriteCloser(socket, s.logger, socketID, "telegram")
wConn = newCipherReadWriteCloser(wConn, obfs2)
wConn = newCtxReadWriteCloser(wConn, ctx, cancel)
return wConn, nil return wConn, nil
} }