Wire things altogether

proxy/proxy.go

@@ -2,23 +2,18 @@ package proxy
 
 import (
 	"context"
-	"io"
 	"net"
-	"sync"
 
 	"go.uber.org/zap"
 
 	"github.com/9seconds/mtg/config"
 	"github.com/9seconds/mtg/conntypes"
-	"github.com/9seconds/mtg/obfuscated2"
 	"github.com/9seconds/mtg/protocol"
 	"github.com/9seconds/mtg/stats"
 	"github.com/9seconds/mtg/utils"
 	"github.com/9seconds/mtg/wrappers/stream"
 )
 
-const directPipeBufferSize = 1024 * 1024
-
 type Proxy struct {
 	Logger              *zap.SugaredLogger
 	Context             context.Context
@@ -89,46 +84,10 @@ func (p *Proxy) accept(conn net.Conn) {
 	}
 
 	if len(config.C.AdTag) > 0 {
-		err = p.acceptMiddleProxyConnection(req)
+		err = middleConnection(req)
 	} else {
-		err = p.acceptDirectConnection(req)
+		err = directConnection(req)
 	}
 
 	logger.Infow("Client disconnected", "error", err, "addr", conn.RemoteAddr())
 }
-
-func (p *Proxy) acceptDirectConnection(request *protocol.TelegramRequest) error {
-	telegramConnRaw, err := obfuscated2.TelegramProtocol(request)
-	if err != nil {
-		return err
-	}
-	telegramConn := telegramConnRaw.(conntypes.StreamReadWriteCloser)
-	defer telegramConn.Close()
-
-	wg := &sync.WaitGroup{}
-	wg.Add(2)
-
-	go p.directPipe(telegramConn, request.ClientConn, wg, request.Logger)
-	go p.directPipe(request.ClientConn, telegramConn, wg, request.Logger)
-
-	<-request.Ctx.Done()
-	wg.Wait()
-
-	return request.Ctx.Err()
-}
-
-func (p *Proxy) directPipe(dst io.Writer,
-	src io.Reader,
-	wg *sync.WaitGroup,
-	logger *zap.SugaredLogger) {
-	defer wg.Done()
-
-	buf := make([]byte, directPipeBufferSize)
-	if _, err := io.CopyBuffer(dst, src, buf); err != nil {
-		logger.Debugw("Cannot pump sockets", "error", err)
-	}
-}
-
-func (p *Proxy) acceptMiddleProxyConnection(request *protocol.TelegramRequest) error {
-	return nil
-}