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

Minor cleanups

Browse Source
This commit is contained in:
9seconds
2018-07-03 10:41:10 +03:00
parent 812b5e6e0b
commit daddf50390
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mtproto/rpc/rpc_handshake_request.go
+1 -4
View File
@@ -8,8 +8,7 @@ const (
rpcHandshakeSenderPIDLength = 12 rpcHandshakeSenderPIDLength = 12
rpcHandshakePeerPIDLength = rpcHandshakeSenderPIDLength rpcHandshakePeerPIDLength = rpcHandshakeSenderPIDLength
rpcHandshakeRequestLength = rpcHandshakeTagLength + rpcHandshakeFlagsLength + rpcHandshakeRequestLength = rpcHandshakeTagLength + rpcHandshakeFlagsLength + rpcHandshakeSenderPIDLength + rpcHandshakePeerPIDLength
rpcHandshakeSenderPIDLength + rpcHandshakePeerPIDLength
) )
var ( var (
@@ -18,8 +17,6 @@ var (
rpcHandshakeTag = [rpcHandshakeTagLength]byte{0xf5, 0xee, 0x82, 0x76} rpcHandshakeTag = [rpcHandshakeTagLength]byte{0xf5, 0xee, 0x82, 0x76}
rpcHandshakeFlags = [rpcHandshakeFlagsLength]byte{0x00, 0x00, 0x00, 0x00} rpcHandshakeFlags = [rpcHandshakeFlagsLength]byte{0x00, 0x00, 0x00, 0x00}
rpcHandshakeBuffer *bytes.Buffer
) )
type RPCHandshakeRequest struct { type RPCHandshakeRequest struct {
mtproto/rpc/rpc_nonce_request.go
+1 -2
View File
@@ -16,8 +16,7 @@ const (
rpcNonceTagLength = 4 rpcNonceTagLength = 4
rpcNonceCryptoAESLength = 4 rpcNonceCryptoAESLength = 4
rpcNonceRequestLength = rpcNonceTagLength + rpcNonceKeySelectorLength + rpcNonceRequestLength = rpcNonceTagLength + rpcNonceKeySelectorLength + rpcNonceCryptoAESLength + rpcNonceCryptoTSLength + rpcNonceLength
rpcNonceCryptoAESLength + rpcNonceCryptoTSLength + rpcNonceLength
) )
var ( var (
telegram/middle.go
+6 -5
View File
@@ -1,11 +1,13 @@
package telegram package telegram
import ( import (
"io"
"io/ioutil" "io/ioutil"
"net" "net"
"net/http" "net/http"
"sync" "sync"
"github.com/juju/errors"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/9seconds/mtg/config" "github.com/9seconds/mtg/config"
@@ -13,7 +15,6 @@ import (
"github.com/9seconds/mtg/mtproto/rpc" "github.com/9seconds/mtg/mtproto/rpc"
mtwrappers "github.com/9seconds/mtg/mtproto/wrappers" mtwrappers "github.com/9seconds/mtg/mtproto/wrappers"
"github.com/9seconds/mtg/wrappers" "github.com/9seconds/mtg/wrappers"
"github.com/juju/errors"
) )
type middleTelegram struct { type middleTelegram struct {
@@ -70,7 +71,7 @@ func (t *middleTelegram) Init(connOpts *mtproto.ConnectionOpts, conn wrappers.Re
return nil, nil return nil, nil
} }
func (t *middleTelegram) sendRPCNonceRequest(conn wrappers.ReadWriteCloserWithAddr) (*rpc.RPCNonceRequest, error) { func (t *middleTelegram) sendRPCNonceRequest(conn io.Writer) (*rpc.RPCNonceRequest, error) {
rpcNonceReq, err := rpc.NewRPCNonceRequest(t.proxySecret) rpcNonceReq, err := rpc.NewRPCNonceRequest(t.proxySecret)
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot create RPC nonce request") return nil, errors.Annotate(err, "Cannot create RPC nonce request")
@@ -82,7 +83,7 @@ func (t *middleTelegram) sendRPCNonceRequest(conn wrappers.ReadWriteCloserWithAd
return rpcNonceReq, nil return rpcNonceReq, nil
} }
func (t *middleTelegram) receiveRPCNonceResponse(conn wrappers.ReadWriteCloserWithAddr, req *rpc.RPCNonceRequest) (*rpc.RPCNonceResponse, error) { func (t *middleTelegram) receiveRPCNonceResponse(conn io.Reader, req *rpc.RPCNonceRequest) (*rpc.RPCNonceResponse, error) {
ans, err := ioutil.ReadAll(conn) ans, err := ioutil.ReadAll(conn)
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot read RPC nonce response") return nil, errors.Annotate(err, "Cannot read RPC nonce response")
@@ -98,7 +99,7 @@ func (t *middleTelegram) receiveRPCNonceResponse(conn wrappers.ReadWriteCloserWi
return rpcNonceResp, nil return rpcNonceResp, nil
} }
func (t *middleTelegram) sendRPCHandshakeRequest(conn wrappers.ReadWriteCloserWithAddr) (*rpc.RPCHandshakeRequest, error) { func (t *middleTelegram) sendRPCHandshakeRequest(conn io.Writer) (*rpc.RPCHandshakeRequest, error) {
req := rpc.NewRPCHandshakeRequest() req := rpc.NewRPCHandshakeRequest()
if _, err := conn.Write(req.Bytes()); err != nil { if _, err := conn.Write(req.Bytes()); err != nil {
return nil, errors.Annotate(err, "Cannot send RPC handshake request") return nil, errors.Annotate(err, "Cannot send RPC handshake request")
@@ -107,7 +108,7 @@ func (t *middleTelegram) sendRPCHandshakeRequest(conn wrappers.ReadWriteCloserWi
return req, nil return req, nil
} }
func (t *middleTelegram) receiveRPCHandshakeResponse(conn wrappers.ReadWriteCloserWithAddr, req *rpc.RPCHandshakeRequest) (*rpc.RPCHandshakeResponse, error) { func (t *middleTelegram) receiveRPCHandshakeResponse(conn io.Reader, req *rpc.RPCHandshakeRequest) (*rpc.RPCHandshakeResponse, error) {
ans, err := ioutil.ReadAll(conn) ans, err := ioutil.ReadAll(conn)
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot read RPC handshake response") return nil, errors.Annotate(err, "Cannot read RPC handshake response")