Support different client connection types

client/client.go

@@ -5,7 +5,8 @@ import (
 	"net"
 
 	"github.com/9seconds/mtg/config"
+	"github.com/9seconds/mtg/mtproto"
 )
 
 // Init has to initialize client connection based on given config.
-type Init func(net.Conn, *config.Config) (int16, io.ReadWriteCloser, error)
+type Init func(net.Conn, *config.Config) (*mtproto.ConnectionOpts, io.ReadWriteCloser, error)

client/direct.go

@@ -7,25 +7,26 @@ import (
 	"github.com/juju/errors"
 
 	"github.com/9seconds/mtg/config"
+	"github.com/9seconds/mtg/mtproto"
 	"github.com/9seconds/mtg/obfuscated2"
 	"github.com/9seconds/mtg/wrappers"
 )
 
 // DirectInit initializes client to access Telegram bypassing middleproxies.
-func DirectInit(conn net.Conn, conf *config.Config) (int16, io.ReadWriteCloser, error) {
+func DirectInit(conn net.Conn, conf *config.Config) (*mtproto.ConnectionOpts, io.ReadWriteCloser, error) {
 	socket := wrappers.NewTimeoutRWC(conn, conf.TimeoutRead, conf.TimeoutWrite)
 	frame, err := obfuscated2.ExtractFrame(socket)
 	if err != nil {
-		return 0, nil, errors.Annotate(err, "Cannot extract frame")
+		return nil, nil, errors.Annotate(err, "Cannot extract frame")
 	}
 	defer obfuscated2.ReturnFrame(frame)
 
-	obfs2, dc, err := obfuscated2.ParseObfuscated2ClientFrame(conf.Secret, frame)
+	obfs2, connOpts, err := obfuscated2.ParseObfuscated2ClientFrame(conf.Secret, frame)
 	if err != nil {
-		return 0, nil, errors.Annotate(err, "Cannot parse obfuscated frame")
+		return nil, nil, errors.Annotate(err, "Cannot parse obfuscated frame")
 	}
 
 	socket = wrappers.NewStreamCipherRWC(socket, obfs2.Encryptor, obfs2.Decryptor)
 
-	return dc, socket, nil
+	return connOpts, socket, nil
 }