diff --git a/mtproto/extras.go b/mtproto/extras.go deleted file mode 100644 index 5c0ad19..0000000 --- a/mtproto/extras.go +++ /dev/null @@ -1,6 +0,0 @@ -package mtproto - -type Extras struct { - QuickAck bool - SimpleAck bool -} diff --git a/mtproto/rpc/rpc.go b/mtproto/rpc/rpc.go index 8f2ae99..0ae4d7f 100644 --- a/mtproto/rpc/rpc.go +++ b/mtproto/rpc/rpc.go @@ -4,3 +4,8 @@ const ( RPCNonceSeqNo = -2 RPCHandshakeSeqNo = -1 ) + +type Extras struct { + QuickAck bool + SimpleAck bool +} diff --git a/mtproto/rpc/rpc_proxy_request.go b/mtproto/rpc/rpc_proxy_request.go index 84edafb..2ffa36f 100644 --- a/mtproto/rpc/rpc_proxy_request.go +++ b/mtproto/rpc/rpc_proxy_request.go @@ -28,8 +28,8 @@ type RPCProxyRequest struct { RemoteIPPort [rpcProxyRequestIPPortLength]byte LocalIPPort [rpcProxyRequestIPPortLength]byte ADTag []byte + Extras Extras Message *bytes.Buffer - Extras *mtproto.Extras } func (r *RPCProxyRequest) Bytes() []byte { @@ -65,7 +65,7 @@ func (r *RPCProxyRequest) Bytes() []byte { return buf.Bytes() } -func NewRPCProxyRequest(connectionType mtproto.ConnectionType, local, remote *net.TCPAddr, adTag []byte, extras *mtproto.Extras) (*RPCProxyRequest, error) { +func NewRPCProxyRequest(connectionType mtproto.ConnectionType, local, remote *net.TCPAddr, adTag []byte, extras Extras) (*RPCProxyRequest, error) { flags := RPCProxyRequestFlagsHasAdTag | RPCProxyRequestFlagsMagic | RPCProxyRequestFlagsExtMode2 switch connectionType { diff --git a/telegram/middle.go b/telegram/middle.go index 01a3b73..4f38b8f 100644 --- a/telegram/middle.go +++ b/telegram/middle.go @@ -8,13 +8,15 @@ import ( "go.uber.org/zap" "github.com/9seconds/mtg/config" + "github.com/9seconds/mtg/mtproto" + "github.com/9seconds/mtg/wrappers" ) type middleTelegram struct { middleTelegramCaller } -func NewMiddleTelegram(conf *config.Config, logger *zap.SugaredLogger) *middleTelegram { +func NewMiddleTelegram(conf *config.Config, logger *zap.SugaredLogger) Telegram { tg := &middleTelegram{ middleTelegramCaller: middleTelegramCaller{ baseTelegram: baseTelegram{ @@ -35,3 +37,7 @@ func NewMiddleTelegram(conf *config.Config, logger *zap.SugaredLogger) *middleTe return tg } + +func (t *middleTelegram) Init(connOpts *mtproto.ConnectionOpts, conn wrappers.ReadWriteCloserWithAddr) (wrappers.ReadWriteCloserWithAddr, error) { + return nil, nil +}