Move telegram to separate module

This commit is contained in:
9seconds
2018-06-19 08:56:12 +03:00
parent dd7a095947
commit 5a169b5026
6 changed files with 165 additions and 93 deletions
+14 -13
View File
@@ -12,6 +12,7 @@ import (
"github.com/9seconds/mtg/config"
"github.com/9seconds/mtg/obfuscated2"
"github.com/9seconds/mtg/telegram"
"github.com/9seconds/mtg/wrappers"
)
@@ -20,6 +21,7 @@ type Server struct {
conf *config.Config
logger *zap.SugaredLogger
stats *Stats
tg telegram.Telegram
}
// Serve does MTPROTO proxying.
@@ -118,23 +120,21 @@ func (s *Server) getClientStream(ctx context.Context, cancel context.CancelFunc,
}
func (s *Server) getTelegramStream(ctx context.Context, cancel context.CancelFunc, dc int16, socketID string) (io.ReadWriteCloser, error) {
socket, err := dialToTelegram(dc, s.conf.TimeoutRead)
conn, err := s.tg.Dial(dc)
if err != nil {
return nil, errors.Annotate(err, "Cannot dial")
}
wConn := wrappers.NewTimeoutRWC(socket, s.conf.TimeoutRead, s.conf.TimeoutWrite)
wConn = wrappers.NewTrafficRWC(wConn, s.stats.addIncomingTraffic, s.stats.addOutgoingTraffic)
obfs2, frame := obfuscated2.MakeTelegramObfuscated2Frame()
if n, err := socket.Write(frame); err != nil || n != len(frame) {
return nil, errors.Annotate(err, "Cannot write hadnshake frame")
return nil, errors.Annotate(err, "Cannot connect to Telegram")
}
wConn = wrappers.NewLogRWC(wConn, s.logger, socketID, "telegram")
wConn = wrappers.NewStreamCipherRWC(wConn, obfs2.Encryptor, obfs2.Decryptor)
wConn = wrappers.NewCtxRWC(ctx, cancel, wConn)
conn = wrappers.NewTrafficRWC(conn, s.stats.addIncomingTraffic, s.stats.addOutgoingTraffic)
conn, err = s.tg.Init(conn)
if err != nil {
return nil, errors.Annotate(err, "Cannot handshake Telegram")
}
return wConn, nil
conn = wrappers.NewLogRWC(conn, s.logger, socketID, "telegram")
conn = wrappers.NewCtxRWC(ctx, cancel, conn)
return conn, nil
}
// NewServer creates new instance of MTPROTO proxy.
@@ -143,5 +143,6 @@ func NewServer(conf *config.Config, logger *zap.SugaredLogger, stat *Stats) *Ser
conf: conf,
logger: logger,
stats: stat,
tg: telegram.NewDirectTelegram(conf),
}
}
-73
View File
@@ -1,73 +0,0 @@
package proxy
import (
"net"
"time"
"github.com/juju/errors"
)
// TelegramAddress presents a pair of v4 and v6 addresses. This pairization
// is required because we want to use DC indexes.
type TelegramAddress struct {
v4 string
v6 string
}
// IPv4 returns v4 address.
func (t *TelegramAddress) IPv4() string {
return net.JoinHostPort(t.v4, telegramPort)
}
// IPv6 returns v4 address.
func (t *TelegramAddress) IPv6() string {
return net.JoinHostPort(t.v6, telegramPort)
}
// TelegramAddresses is a list of all known Telegram addresses for DC indexes.
var TelegramAddresses = []TelegramAddress{
TelegramAddress{v4: "149.154.175.50", v6: "2001:b28:f23d:f001::a"},
TelegramAddress{v4: "149.154.167.51", v6: "2001:67c:04e8:f002::a"},
TelegramAddress{v4: "149.154.175.100", v6: "2001:b28:f23d:f003::a"},
TelegramAddress{v4: "149.154.167.91", v6: "2001:67c:04e8:f004::a"},
TelegramAddress{v4: "149.154.171.5", v6: "2001:b28:f23f:f005::a"},
}
const telegramPort = "443"
const telegramKeepAlive = 30 * time.Second
func dialToTelegram(dcIdx int16, timeout time.Duration) (net.Conn, error) {
if dcIdx < 0 || dcIdx >= 5 {
return nil, errors.New("Incorrect DC IDX")
}
conn, err := doDial(dcIdx, timeout)
if err != nil {
return nil, errors.Annotate(err, "Cannot dial")
}
if err := conn.SetKeepAlive(true); err != nil {
return nil, errors.Annotate(err, "Cannot establish keepalive connection")
}
if err := conn.SetKeepAlivePeriod(telegramKeepAlive); err != nil {
return nil, errors.Annotate(err, "Cannot set keepalive timeout")
}
return conn, nil
}
func doDial(dcIdx int16, timeout time.Duration) (*net.TCPConn, error) {
dialer := net.Dialer{Timeout: timeout}
addr := TelegramAddresses[dcIdx]
if conn, err := dialer.Dial("tcp", addr.IPv6()); err == nil {
return conn.(*net.TCPConn), nil
}
conn, err := dialer.Dial("tcp", addr.IPv4())
if err == nil {
return conn.(*net.TCPConn), nil
}
return nil, err
}