linting the code

This commit is contained in:
9seconds
2019-10-11 09:41:18 +03:00
parent 432e2970a0
commit 5009859a1e
50 changed files with 172 additions and 55 deletions
+3
View File
@@ -18,13 +18,16 @@ func directConnection(request *protocol.TelegramRequest) error {
if err != nil {
return err
}
telegramConn := telegramConnRaw.(conntypes.StreamReadWriteCloser)
defer telegramConn.Close()
wg := &sync.WaitGroup{}
wg.Add(2)
go directPipe(telegramConn, request.ClientConn, wg, request.Logger)
go directPipe(request.ClientConn, telegramConn, wg, request.Logger)
wg.Wait()
+4 -3
View File
@@ -10,11 +10,12 @@ import (
"github.com/9seconds/mtg/wrappers/packetack"
)
func middleConnection(request *protocol.TelegramRequest) error {
func middleConnection(request *protocol.TelegramRequest) {
telegramConn := packetack.NewProxy(request)
defer telegramConn.Close()
var clientConn conntypes.PacketAckFullReadWriteCloser
switch request.ClientProtocol.ConnectionType() {
case conntypes.ConnectionTypeAbridged:
clientConn = packetack.NewClientAbridged(request.ClientConn)
@@ -30,11 +31,10 @@ func middleConnection(request *protocol.TelegramRequest) error {
wg.Add(2)
go middlePipe(telegramConn, clientConn, wg, request.Logger)
go middlePipe(clientConn, telegramConn, wg, request.Logger)
wg.Wait()
return nil
}
func middlePipe(dst conntypes.PacketAckWriteCloser,
@@ -50,6 +50,7 @@ func middlePipe(dst conntypes.PacketAckWriteCloser,
for {
acks := conntypes.ConnectionAcks{}
packet, err := src.Read(&acks)
if err != nil {
logger.Debugw("Cannot read packet", "error", err)
return
+6 -1
View File
@@ -34,6 +34,7 @@ func (p *Proxy) Serve(listener net.Listener) {
continue
}
}
go p.accept(conn)
}
}
@@ -61,10 +62,12 @@ func (p *Proxy) accept(conn net.Conn) {
clientConn := stream.NewClientConn(conn, connID)
clientConn = stream.NewCtx(ctx, cancel, clientConn)
clientConn = stream.NewTimeout(clientConn)
defer clientConn.Close()
clientProtocol := p.ClientProtocolMaker()
clientConn, err := clientProtocol.Handshake(clientConn)
if err != nil {
logger.Warnw("Cannot perform client handshake", "error", err)
return
@@ -83,8 +86,10 @@ func (p *Proxy) accept(conn net.Conn) {
ClientProtocol: clientProtocol,
}
err = nil
if len(config.C.AdTag) > 0 {
err = middleConnection(req)
middleConnection(req)
} else {
err = directConnection(req)
}