Merge branch 'fix_codec' into 'master'

fix:codec

See merge request !6

Makefile

@@ -3,7 +3,7 @@ export GOPROXY="https://goproxy.cn,https://goproxy.io,direct"
 LDFLAGS := -s -w
 
 DATE=$(shell date +"%Y-%m-%d")
-BUILDINFO := -X main.Version=v0.0.5 -X main.Date=$(DATE)
+BUILDINFO := -X main.Version=latest -X main.Date=$(DATE)
 
 all:
 	env CGO_ENABLED=0 go build -trimpath -ldflags '-w -s $(BUILDINFO)' -o bin/majora

cli.go

@@ -13,13 +13,13 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
+	"runtime/debug"
 	"syscall"
 	"time"
 
 	"github.com/adamweixuan/getty"
 	"virjar.com/majora-go/client"
 	"virjar.com/majora-go/common"
-	"virjar.com/majora-go/infra"
 	"virjar.com/majora-go/model"
 )
 
@@ -59,9 +59,9 @@ func initial(cfg *model.Configure) {
 		_ = getty.SetLoggerLevel(getty.LoggerLevel(cfg.LogLevel - 1))
 	}
 	addr := fmt.Sprintf("127.0.0.1:%d", cfg.PprofPort)
-	getty.GetLogger().Infof("enable pprof: %s", addr)
 	if cfg.PprofPort > 0 {
 		go func() {
+			getty.GetLogger().Infof("enable pprof: %s", addr)
 			log.Fatal(http.ListenAndServe(addr, nil))
 		}()
 	}
@@ -76,11 +76,11 @@ func initial(cfg *model.Configure) {
 		getty.GetLogger().Infof("use custom dns server %s", dnsServer)
 	}
 
-	if !cfg.DisableUpdate {
-		if _, err := infra.Update("majora", Version); err != nil {
-			getty.GetLogger().Errorf("check update error %+s", err.Error())
-		}
-	}
+	//if !cfg.DisableUpdate {
+	//	if _, err := infra.Update("majora", Version); err != nil {
+	//		getty.GetLogger().Errorf("check update error %+s", err.Error())
+	//	}
+	//}
 }
 
 func parseFromCmd(cfg *model.Configure) {
@@ -116,6 +116,9 @@ func main() {
 		fmt.Println(Version)
 		os.Exit(0)
 	}
+	runtime.GOMAXPROCS(runtime.NumCPU() * 2)
+	debug.SetGCPercent(200)
+	getty.GetLogger().Warnf("cpu count %d,proc %d", runtime.NumCPU(), runtime.NumCPU()*2)
 
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)

client/codec.go

@@ -3,7 +3,6 @@ package client
 import (
 	"bytes"
 	"encoding/binary"
-	"errors"
 
 	"github.com/adamweixuan/getty"
 	"virjar.com/majora-go/common"
@@ -24,7 +23,11 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	}
 	getty.GetLogger().Debugf("[PacketCodec] read magic %+v", binary.BigEndian.Uint64(data[0:8]))
 
-	if !common.ReadMagic(data[0:common.MagicSize]) {
+	readmagic := data[0:common.MagicSize]
+
+	if !common.ReadMagic(readmagic) {
+		getty.GetLogger().Errorf("[PacketCodec] invalid magic %d|%s",
+			binary.BigEndian.Uint64(readmagic), string(readmagic))
 		return nil, 0, common.ErrInvalidMagic
 	}
 
@@ -33,16 +36,22 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	frameLen, err := common.ReadInt32(reader)
 	if err != nil {
 		getty.GetLogger().Errorf("[PacketCodec] frameLen error %+v", err)
-		return nil, 0, common.ErrInvalidSize
+		return nil, 0, err
 	}
 
+	if reader.Len() < int(frameLen) {
+		getty.GetLogger().Errorf("[PacketCodec] buf not enough %d|%d", reader.Len(), frameLen)
+		return nil, 0, nil
+	}
+
+
 	getty.GetLogger().Debugf("[PacketCodec] read frameLen %d", frameLen)
 
 	// type
 	msgType, err := common.ReadByte(reader)
 	if err != nil {
 		getty.GetLogger().Errorf("[PacketCodec] read type error %+v", err)
-		return nil, 0, common.ErrInvalidSize
+		return nil, 0, err
 	}
 
 	getty.GetLogger().Debugf("[PacketCodec] read msgType %+v", msgType)
@@ -54,7 +63,7 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	pack.SerialNumber, err = common.ReadInt64(reader)
 	if err != nil {
 		getty.GetLogger().Errorf("[PacketCodec] read num error %+v", err)
-		return nil, 0, common.ErrInvalidSize
+		return nil, len(data), nil
 	}
 
 	getty.GetLogger().Debugf("[PacketCodec] read SerialNumber %d", pack.SerialNumber)
@@ -63,13 +72,13 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	extraSize, err := common.ReadByte(reader)
 	if err != nil {
 		getty.GetLogger().Errorf("[PacketCodec] read extra size error  %+v", err)
-		return nil, 0, common.ErrInvalidSize
+		return nil, len(data), nil
 	}
 
 	extra, err := common.ReadN(int(extraSize), reader)
 	if err != nil {
 		getty.GetLogger().Errorf("[PacketCodec] read extra error  %+v", err)
-		return nil, 0, common.ErrInvalidSize
+		return nil, len(data), nil
 	}
 	pack.Extra = string(extra)
 	getty.GetLogger().Debugf("[PacketCodec] read extra %s", pack.Extra)
@@ -78,13 +87,14 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	dataSize := int(frameLen) - common.TypeSize - common.SerialNumberSize - common.ExtraSize - int(extraSize)
 	if dataSize < 0 {
 		getty.GetLogger().Errorf("[PacketCodec] read frameLen error  %+v", err)
-		return nil, 0, common.ErrInvalidSize
+		return nil, len(data), common.ErrInvalidSize
 	}
 
 	if dataSize > 0 {
 		data, err := common.ReadN(dataSize, reader)
 		if err != nil {
-			getty.GetLogger().Errorf("read data error  %+v", err)
+			getty.GetLogger().Errorf("[PacketCodec] read data error %+v", err)
+			return nil, len(data), nil
 		}
 		pack.Data = data
 	}
@@ -95,7 +105,7 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 func (p *PacketCodec) Write(session getty.Session, packet interface{}) ([]byte, error) {
 	majoraPkt, ok := packet.(*protocol.MajoraPacket)
 	if !ok {
-		return nil, errors.New("invalid packet")
+		return nil, common.ErrNilPacket
 	}
 	return protocol.Codec.Encode(majoraPkt), nil
 }

client/event.go

@@ -148,9 +148,8 @@ func (client *Client) handleDestroyMessage() {
 }
 
 func (client *Client) AddConnection(packet *protocol.MajoraPacket, conn *net.TCPConn, addr string) {
-	load, ok := client.connStore.Load(packet.SerialNumber)
-	if ok {
-		getty.GetLogger().Errorf("[AddConnection] %d->error, has one %+v...", packet.SerialNumber, load)
+	if _, ok := client.connStore.Load(packet.SerialNumber); ok {
+		getty.GetLogger().Errorf("[AddConnection] %d->error, has one", packet.SerialNumber)
 	}
 	client.connStore.Store(packet.SerialNumber, conn)
 	getty.GetLogger().Infof("[AddConnection] %d->%s success", packet.SerialNumber, addr)

client/getty.go

@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	taskPool = gxsync.NewTaskPoolSimple(10000)
+	taskPool = gxsync.NewTaskPoolSimple(5000)
 )
 
 func (client *Client) connect() {
@@ -79,7 +79,7 @@ func InitialSession(session getty.Session, client *Client) (err error) {
 }
 
 func (client *Client) Redial(session getty.Session) {
-	getty.GetLogger().Warnf("=================redial start ==============", client.config.Redial.Valid())
+	getty.GetLogger().Warnf("=================redial start %v ==============", client.config.Redial.Valid())
 	if !client.config.Redial.Valid() {
 		return
 	}

common/common.go

@@ -6,8 +6,6 @@ import (
 	"errors"
 	"io"
 	"time"
-
-	"github.com/adamweixuan/getty"
 )
 
 const (
@@ -49,10 +47,10 @@ const (
 const (
 	ReadTimeout      = time.Minute
 	WriteTimeout     = time.Minute
-	WaitTimeout      = time.Second * 30
+	WaitTimeout      = time.Minute
 	KeepAliveTimeout = time.Second * 10
 
-	SessionTimeout  = time.Second * 30
+	SessionTimeout  = time.Minute
 	UpstreamTimeout = time.Minute
 )
 
@@ -68,17 +66,13 @@ const (
 )
 
 const (
-	ConnTimeout    = time.Second * 30
-	ReConnInterval = time.Second * 5
-)
-
-const (
 	ExtrakeyUser = "majora.key.user"
 )
 
 var (
 	ErrInvalidSize  = errors.New("invalid size")
 	ErrInvalidMagic = errors.New("invalid magic")
+	ErrNilPacket     = errors.New("nil packet")
 )
 
 func ConvertInt32ToBytes(input int32) []byte {
@@ -137,8 +131,5 @@ func ReadN(size int, conn io.Reader) ([]byte, error) {
 
 func ReadMagic(buf []byte) bool {
 	magic := int64(binary.BigEndian.Uint64(buf))
-	if magic != MAGIC {
-		getty.GetLogger().Errorf("magic not equal %d|%d|%+v", magic, MAGIC, buf)
-	}
 	return magic == MAGIC
 }

conf/majora-dev.ini

-;tunnel_addr = 127.0.0.1:5879
-tunnel_addr = aoba.vip:5879
+tunnel_addr = 127.0.0.1:5879
+;tunnel_addr = aoba.vip:5879
 dns_server = 114.114.114.114:53
 ;bind to local ip
 ;local_ip = 192.168.0.100

conf/majora.ini

@@ -6,7 +6,7 @@ dns_server = 114.114.114.114:53
 ;pprof_port = 0
 disable_update = false
 ; default is info
-log_level = 1
+log_level = 2
 reconn_interval = 5s
 ;client_id =
 
@@ -16,5 +16,5 @@ account = superman
 [redial]
 command = /bin/bash
 exec_path = /root/ppp_auto_with_auth.sh
-redial_duration = 6m
+redial_duration = 10m
 wait_time = 10s

infra/redail.go

@@ -36,5 +36,5 @@ func Redial(cfg *model.Configure) {
 		getty.GetLogger().Errorf("[redial] Execute Shell:%s failed with error:%s", command, err.Error())
 		return
 	}
-	getty.GetLogger().Infof("[redial] redial success %+v resp:%s", cmd, string(output))
+	getty.GetLogger().Warnf("[redial] redial success %+v resp:%s", cmd, string(output))
 }