Add intermediate rwc

mtproto/wrappers/abridged.go

@@ -20,14 +20,14 @@ const (
 	abridgedLargePacketLength = 16777216 // 256 ^ 3
 )
 
-type AbridgedReadWriteCloserAddr struct {
+type AbridgedReadWriteCloserWithAddr struct {
 	wrappers.BufferedReader
 
 	conn wrappers.ReadWriteCloserWithAddr
 	opts *mtproto.ConnectionOpts
 }
 
-func (a *AbridgedReadWriteCloserAddr) Read(p []byte) (int, error) {
+func (a *AbridgedReadWriteCloserWithAddr) Read(p []byte) (int, error) {
 	return a.BufferedRead(p, func() error {
 		var msgLength uint8
 		if err := binary.Read(a.conn, binary.LittleEndian, &msgLength); err != nil {
@@ -62,7 +62,7 @@ func (a *AbridgedReadWriteCloserAddr) Read(p []byte) (int, error) {
 	})
 }
 
-func (a *AbridgedReadWriteCloserAddr) Write(p []byte) (int, error) {
+func (a *AbridgedReadWriteCloserWithAddr) Write(p []byte) (int, error) {
 	if len(p)%4 != 0 {
 		return 0, errors.Errorf("Incorrect packet length %d", len(p))
 	}
@@ -92,15 +92,15 @@ func (a *AbridgedReadWriteCloserAddr) Write(p []byte) (int, error) {
 	}
 }
 
-func (a *AbridgedReadWriteCloserAddr) Close() error {
+func (a *AbridgedReadWriteCloserWithAddr) Close() error {
 	return a.conn.Close()
 }
 
-func (a *AbridgedReadWriteCloserAddr) LocalAddr() *net.TCPAddr {
+func (a *AbridgedReadWriteCloserWithAddr) LocalAddr() *net.TCPAddr {
 	return a.conn.LocalAddr()
 }
 
-func (a *AbridgedReadWriteCloserAddr) RemoteAddr() *net.TCPAddr {
+func (a *AbridgedReadWriteCloserWithAddr) RemoteAddr() *net.TCPAddr {
 	return a.conn.RemoteAddr()
 }
 
@@ -113,7 +113,8 @@ func fromUint24(number uint24) uint32 {
 }
 
 func NewAbridgedRWC(conn wrappers.ReadWriteCloserWithAddr, connOpts *mtproto.ConnectionOpts) wrappers.ReadWriteCloserWithAddr {
-	return &AbridgedReadWriteCloserAddr{
+	return &AbridgedReadWriteCloserWithAddr{
+		BufferedReader: wrappers.NewBufferedReader(),
 		conn:           conn,
 		opts:           connOpts,
 	}

mtproto/wrappers/intermediate.go

@@ -0,0 +1,83 @@
+package wrappers
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io"
+	"net"
+
+	"github.com/juju/errors"
+
+	"github.com/9seconds/mtg/mtproto"
+	"github.com/9seconds/mtg/wrappers"
+)
+
+const intermediateQuickAckLength = 0x80000000
+
+type IntermediateReadWriteCloserWithAddr struct {
+	wrappers.BufferedReader
+
+	conn wrappers.ReadWriteCloserWithAddr
+	opts *mtproto.ConnectionOpts
+}
+
+func (i *IntermediateReadWriteCloserWithAddr) Read(p []byte) (int, error) {
+	return i.BufferedRead(p, func() error {
+		var length uint32
+		if err := binary.Read(i.conn, binary.LittleEndian, &length); err != nil {
+			return errors.Annotate(err, "Cannot read message length")
+		}
+
+		if length > intermediateQuickAckLength {
+			i.opts.QuickAck = true
+			length -= intermediateQuickAckLength
+		}
+
+		buf := &bytes.Buffer{}
+		buf.Grow(int(length))
+		if _, err := io.CopyN(buf, i.conn, int64(length)); err != nil {
+			return errors.Annotate(err, "Cannot read the message")
+		}
+
+		if length%4 != 0 {
+			length -= length % 4
+			i.Buffer.Write(buf.Bytes()[:length])
+			return nil
+		}
+
+		i.Buffer.Write(buf.Bytes())
+
+		return nil
+	})
+}
+
+func (i *IntermediateReadWriteCloserWithAddr) Write(p []byte) (int, error) {
+	if i.opts.SimpleAck {
+		return i.conn.Write(p)
+	}
+
+	var length [4]byte
+	binary.LittleEndian.PutUint32(length[:], uint32(len(p)))
+
+	return i.conn.Write(append(length[:], p...))
+}
+
+func (i *IntermediateReadWriteCloserWithAddr) Close() error {
+	return i.conn.Close()
+}
+
+func (i *IntermediateReadWriteCloserWithAddr) LocalAddr() *net.TCPAddr {
+	return i.conn.LocalAddr()
+}
+
+func (i *IntermediateReadWriteCloserWithAddr) RemoteAddr() *net.TCPAddr {
+	return i.conn.RemoteAddr()
+}
+
+func NewIntermediateRWC(conn wrappers.ReadWriteCloserWithAddr, connOpts *mtproto.ConnectionOpts) wrappers.ReadWriteCloserWithAddr {
+	return &IntermediateReadWriteCloserWithAddr{
+		BufferedReader: wrappers.NewBufferedReader(),
+		conn:           conn,
+		opts:           connOpts,
+	}
+}

mtproto/wrappers/proxy_request.go

@@ -105,6 +105,7 @@ func NewProxyRequestRWC(conn wrappers.ReadWriteCloserWithAddr, connOpts *mtproto
 	}
 
 	return &ProxyRequestReadWriteCloserWithAddr{
+		BufferedReader: wrappers.NewBufferedReader(),
 		conn:           conn,
 		req:            req,
 	}, nil