Merge pull request #115 from 9seconds/gogettable

Make mtg go-gettable

Makefile

@@ -6,10 +6,7 @@ CC_BINARIES  := $(shell bash -c "echo -n $(APP_NAME)-{linux,freebsd,openbsd}-{38
 
 GOLANGCI_LINT_VERSION := v1.21.0
 
-VERSION_GO         := $(shell go version)
+COMMON_BUILD_FLAGS := -ldflags="-s -w"
-VERSION_DATE       := $(shell date -Ru)
-VERSION_TAG        := $(shell git describe --tags --always)
-COMMON_BUILD_FLAGS := -ldflags="-s -w -X 'main.version=$(VERSION_TAG) ($(VERSION_GO)) [$(VERSION_DATE)]'"
 
 MOD_ON  := env GO111MODULE=on
 MOD_OFF := env GO111MODULE=auto

antireplay/init.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/VictoriaMetrics/fastcache"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
 )
 
 var (

cli/generate.go

@@ -4,7 +4,7 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
 )
 
 func Generate(secretType, hostname string) {

cli/proxy.go

@@ -8,16 +8,16 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"mtg/antireplay"
+	"github.com/9seconds/mtg/antireplay"
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/faketls"
+	"github.com/9seconds/mtg/faketls"
-	"mtg/hub"
+	"github.com/9seconds/mtg/hub"
-	"mtg/ntp"
+	"github.com/9seconds/mtg/ntp"
-	"mtg/obfuscated2"
+	"github.com/9seconds/mtg/obfuscated2"
-	"mtg/proxy"
+	"github.com/9seconds/mtg/proxy"
-	"mtg/stats"
+	"github.com/9seconds/mtg/stats"
-	"mtg/telegram"
+	"github.com/9seconds/mtg/telegram"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
 )
 
 func Proxy() error { // nolint: funlen

faketls/client_protocol.go

@@ -11,14 +11,14 @@ import (
 	"sync"
 	"time"
 
-	"mtg/antireplay"
+	"github.com/9seconds/mtg/antireplay"
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/obfuscated2"
+	"github.com/9seconds/mtg/obfuscated2"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
-	"mtg/stats"
+	"github.com/9seconds/mtg/stats"
-	"mtg/tlstypes"
+	"github.com/9seconds/mtg/tlstypes"
-	"mtg/wrappers/stream"
+	"github.com/9seconds/mtg/wrappers/stream"
 )
 
 type ClientProtocol struct {

go.mod

@@ -1,4 +1,4 @@
-module mtg
+module github.com/9seconds/mtg
 
 go 1.13
 

hub/connection.go

@@ -7,10 +7,10 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/mtproto"
+	"github.com/9seconds/mtg/mtproto"
-	"mtg/mtproto/rpc"
+	"github.com/9seconds/mtg/mtproto/rpc"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
 )
 
 type connection struct {

hub/connection_list.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
 )
 
 type connectionList struct {

hub/hub.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
 )
 
 type hub struct {

hub/interface.go

@@ -1,6 +1,6 @@
 package hub
 
-import "mtg/protocol"
+import "github.com/9seconds/mtg/protocol"
 
 type Interface interface {
 	Register(*protocol.TelegramRequest) (*ProxyConn, error)

hub/mux.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
 )
 
 const muxGCEvery = time.Minute

hub/proxy_conn.go

@@ -4,9 +4,9 @@ import (
 	"sync"
 	"time"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/mtproto/rpc"
+	"github.com/9seconds/mtg/mtproto/rpc"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
 )
 
 const (

main.go

@@ -3,17 +3,17 @@ package main
 import (
 	"math/rand"
 	"os"
+	"runtime/debug"
+	"strings"
 	"time"
 
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 
-	"mtg/cli"
+	"github.com/9seconds/mtg/cli"
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
 )
 
-var version = "dev" // this has to be set by build ld flags
-
 var (
 	app = kingpin.New("mtg", "Simple MTPROTO proxy.")
 
@@ -114,7 +114,7 @@ var (
 
 func main() {
 	rand.Seed(time.Now().UTC().UnixNano())
-	app.Version(version)
+	app.Version(getVersion())
 	app.HelpFlag.Short('h')
 
 	if err := utils.SetLimits(); err != nil {
@@ -153,3 +153,26 @@ func main() {
 		}
 	}
 }
+
+func getVersion() string {
+	if info, ok := debug.ReadBuildInfo(); ok {
+		builder := strings.Builder{}
+		version := info.Main.Version
+
+		if version == "(devel)" {
+			version = "dev"
+		}
+
+		builder.WriteString(version)
+
+		if info.Main.Sum != "" {
+			builder.WriteString(" (checksum: ")
+			builder.WriteString(info.Main.Sum)
+			builder.WriteRune(')')
+		}
+
+		return builder.String()
+	}
+
+	return "dev"
+}

mtproto/protocol.go

@@ -3,12 +3,12 @@ package mtproto
 import (
 	"fmt"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/mtproto/rpc"
+	"github.com/9seconds/mtg/mtproto/rpc"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
-	"mtg/telegram"
+	"github.com/9seconds/mtg/telegram"
-	"mtg/wrappers/packet"
+	"github.com/9seconds/mtg/wrappers/packet"
-	"mtg/wrappers/stream"
+	"github.com/9seconds/mtg/wrappers/stream"
 )
 
 func TelegramProtocol(req *protocol.TelegramRequest) (conntypes.PacketReadWriteCloser, error) {

mtproto/rpc/proxy_response.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type ProxyResponseType uint8

obfuscated2/client_protocol.go

@@ -9,13 +9,13 @@ import (
 	"io"
 	"time"
 
-	"mtg/antireplay"
+	"github.com/9seconds/mtg/antireplay"
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
-	"mtg/stats"
+	"github.com/9seconds/mtg/stats"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
-	"mtg/wrappers/stream"
+	"github.com/9seconds/mtg/wrappers/stream"
 )
 
 const clientProtocolHandshakeTimeout = 10 * time.Second

obfuscated2/telegram_protocol.go

@@ -4,11 +4,11 @@ import (
 	"crypto/rand"
 	"fmt"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
-	"mtg/telegram"
+	"github.com/9seconds/mtg/telegram"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
-	"mtg/wrappers/stream"
+	"github.com/9seconds/mtg/wrappers/stream"
 )
 
 func TelegramProtocol(req *protocol.TelegramRequest) (conntypes.StreamReadWriteCloser, error) {

protocol/interfaces.go

@@ -1,6 +1,6 @@
 package protocol
 
-import "mtg/conntypes"
+import "github.com/9seconds/mtg/conntypes"
 
 type ClientProtocol interface {
 	Handshake(conntypes.StreamReadWriteCloser) (conntypes.StreamReadWriteCloser, error)

protocol/request.go

@@ -5,7 +5,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type TelegramRequest struct {

proxy/direct.go

@@ -6,9 +6,9 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/obfuscated2"
+	"github.com/9seconds/mtg/obfuscated2"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
 )
 
 const directPipeBufferSize = 1024 * 1024

proxy/middle.go

@@ -5,9 +5,9 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
-	"mtg/wrappers/packetack"
+	"github.com/9seconds/mtg/wrappers/packetack"
 )
 
 func middleConnection(request *protocol.TelegramRequest) {

proxy/proxy.go

@@ -6,12 +6,12 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
-	"mtg/stats"
+	"github.com/9seconds/mtg/stats"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
-	"mtg/wrappers/stream"
+	"github.com/9seconds/mtg/wrappers/stream"
 )
 
 type Proxy struct {

stats/interfaces.go

@@ -3,7 +3,7 @@ package stats
 import (
 	"net"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type IngressTrafficInterface interface {

stats/multi_stats.go

@@ -3,7 +3,7 @@ package stats
 import (
 	"net"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type multiStats []Interface

stats/stats.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"net/http"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
 )
 
 var Stats Interface

stats/stats_prometheus.go

@@ -8,8 +8,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type statsPrometheus struct {

stats/stats_statsd.go

@@ -11,8 +11,8 @@ import (
 	statsd "github.com/smira/go-statsd"
 	"go.uber.org/zap"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 var (

telegram/api/addresses.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 const (

telegram/api/api.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	apiUserAgent   = "mtg"
+	apiUserAgent   = "github.com/9seconds/mtg"
 	apiHTTPTimeout = 30 * time.Second
 )
 

telegram/base.go

@@ -5,9 +5,9 @@ import (
 	"math/rand"
 	"net"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
-	"mtg/wrappers/stream"
+	"github.com/9seconds/mtg/wrappers/stream"
 )
 
 type baseTelegram struct {

telegram/direct.go

@@ -1,6 +1,6 @@
 package telegram
 
-import "mtg/conntypes"
+import "github.com/9seconds/mtg/conntypes"
 
 const (
 	directV4DefaultIdx conntypes.DC = 1

telegram/interfaces.go

@@ -1,6 +1,6 @@
 package telegram
 
-import "mtg/conntypes"
+import "github.com/9seconds/mtg/conntypes"
 
 type Telegram interface {
 	Dial(conntypes.DC, conntypes.ConnectionProtocol) (conntypes.StreamReadWriteCloser, error)

telegram/middle.go

@@ -7,8 +7,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/telegram/api"
+	"github.com/9seconds/mtg/telegram/api"
 )
 
 const middleTelegramBackgroundUpdateEvery = time.Hour

tlstypes/client_hello.go

@@ -6,8 +6,8 @@ import (
 	"crypto/sha256"
 	"fmt"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
 )
 
 type ClientHello struct {

tlstypes/handshake.go

@@ -3,7 +3,7 @@ package tlstypes
 import (
 	"bytes"
 
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
 )
 
 type Handshake struct {

tlstypes/server_hello.go

@@ -10,7 +10,7 @@ import (
 
 	"golang.org/x/crypto/curve25519"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
 )
 
 type ServerHello struct {

utils/init_tcp.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
 )
 
 func InitTCP(conn net.Conn) error {

wrappers/packet/mtproto_frame.go

@@ -12,7 +12,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 const (

wrappers/packetack/client_abridged.go

@@ -8,8 +8,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
 )
 
 const (

wrappers/packetack/client_intermediate.go

@@ -9,7 +9,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 const clientIntermediateQuickAckLength = 0x80000000

wrappers/packetack/client_intermediate_secure.go

@@ -8,7 +8,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type wrapperClientIntermediateSecure struct {

wrappers/packetack/proxy.go

@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"net"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/hub"
+	"github.com/9seconds/mtg/hub"
-	"mtg/mtproto/rpc"
+	"github.com/9seconds/mtg/mtproto/rpc"
-	"mtg/protocol"
+	"github.com/9seconds/mtg/protocol"
 )
 
 type wrapperProxy struct {

wrappers/stream/base.go

@@ -3,7 +3,7 @@ package stream
 import (
 	"net"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 func NewClientConn(parent net.Conn, connID conntypes.ConnID) conntypes.StreamReadWriteCloser {

wrappers/stream/blockcipher.go

@@ -9,8 +9,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
 )
 
 type wrapperBlockCipher struct {

wrappers/stream/conn.go

@@ -7,8 +7,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/config"
+	"github.com/9seconds/mtg/config"
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type connPurpose uint8

wrappers/stream/ctx.go

@@ -8,7 +8,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type wrapperCtx struct {

wrappers/stream/faketls.go

@@ -8,8 +8,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/tlstypes"
+	"github.com/9seconds/mtg/tlstypes"
 )
 
 type wrapperFakeTLS struct {

wrappers/stream/mtproto_cipher.go

@@ -9,9 +9,9 @@ import (
 	"encoding/binary"
 	"net"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/mtproto/rpc"
+	"github.com/9seconds/mtg/mtproto/rpc"
-	"mtg/utils"
+	"github.com/9seconds/mtg/utils"
 )
 
 type mtprotoCipherPurpose uint8

wrappers/stream/obfuscated2.go

@@ -8,7 +8,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type wrapperObfuscated2 struct {

wrappers/stream/rewind.go

@@ -9,7 +9,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 type ReadWriteCloseRewinder interface {

wrappers/stream/stats_telegram.go

@@ -7,8 +7,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/stats"
+	"github.com/9seconds/mtg/stats"
 )
 
 type wrapperTelegramStats struct {

wrappers/stream/stats_traffic.go

@@ -6,8 +6,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
-	"mtg/stats"
+	"github.com/9seconds/mtg/stats"
 )
 
 type wrapperTrafficStats struct {

wrappers/stream/timeout.go

@@ -6,7 +6,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"mtg/conntypes"
+	"github.com/9seconds/mtg/conntypes"
 )
 
 const (