Change directory structure, move models and utils to root directory

models/client/client.go

@@ -0,0 +1,73 @@
+package client
+
+import (
+	"encoding/json"
+
+	"github.com/fatedier/frp/models/consts"
+	"github.com/fatedier/frp/models/msg"
+	"github.com/fatedier/frp/utils/conn"
+	"github.com/fatedier/frp/utils/log"
+)
+
+type ProxyClient struct {
+	Name      string
+	Passwd    string
+	LocalPort int64
+}
+
+func (p *ProxyClient) GetLocalConn() (c *conn.Conn, err error) {
+	c = &conn.Conn{}
+	err = c.ConnectServer("127.0.0.1", p.LocalPort)
+	if err != nil {
+		log.Error("ProxyName [%s], connect to local port error, %v", p.Name, err)
+	}
+	return
+}
+
+func (p *ProxyClient) GetRemoteConn(addr string, port int64) (c *conn.Conn, err error) {
+	c = &conn.Conn{}
+	defer func() {
+		if err != nil {
+			c.Close()
+		}
+	}()
+
+	err = c.ConnectServer(addr, port)
+	if err != nil {
+		log.Error("ProxyName [%s], connect to server [%s:%d] error, %v", p.Name, addr, port, err)
+		return
+	}
+
+	req := &msg.ClientCtlReq{
+		Type:      consts.WorkConn,
+		ProxyName: p.Name,
+		Passwd:    p.Passwd,
+	}
+
+	buf, _ := json.Marshal(req)
+	err = c.Write(string(buf) + "\n")
+	if err != nil {
+		log.Error("ProxyName [%s], write to server error, %v", p.Name, err)
+		return
+	}
+
+	err = nil
+	return
+}
+
+func (p *ProxyClient) StartTunnel(serverAddr string, serverPort int64) (err error) {
+	localConn, err := p.GetLocalConn()
+	if err != nil {
+		return
+	}
+	remoteConn, err := p.GetRemoteConn(serverAddr, serverPort)
+	if err != nil {
+		return
+	}
+
+	// l means local, r means remote
+	log.Debug("Join two conns, (l[%s] r[%s]) (l[%s] r[%s])", localConn.GetLocalAddr(), localConn.GetRemoteAddr(),
+		remoteConn.GetLocalAddr(), remoteConn.GetRemoteAddr())
+	go conn.Join(localConn, remoteConn)
+	return nil
+}

models/consts/consts.go

@@ -0,0 +1,13 @@
+package consts
+
+// server status
+const (
+	Idle = iota
+	Working
+)
+
+// connection type
+const (
+	CtlConn = iota
+	WorkConn
+)

models/msg/msg.go

@@ -0,0 +1,20 @@
+package msg
+
+type GeneralRes struct {
+	Code int64  `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+type ClientCtlReq struct {
+	Type      int64  `json:"type"`
+	ProxyName string `json:"proxy_name"`
+	Passwd    string `json:"passwd"`
+}
+
+type ClientCtlRes struct {
+	GeneralRes
+}
+
+type ServerCtlReq struct {
+	Type int64 `json:"type"`
+}

models/server/server.go

@@ -0,0 +1,124 @@
+package server
+
+import (
+	"container/list"
+	"sync"
+
+	"github.com/fatedier/frp/models/consts"
+	"github.com/fatedier/frp/utils/conn"
+	"github.com/fatedier/frp/utils/log"
+)
+
+type ProxyServer struct {
+	Name       string
+	Passwd     string
+	BindAddr   string
+	ListenPort int64
+
+	Status        int64
+	Listener      *conn.Listener  // accept new connection from remote users
+	CtlMsgChan    chan int64      // every time accept a new user conn, put "1" to the channel
+	StopBlockChan chan int64      // put any number to the channel, if you want to stop wait user conn
+	CliConnChan   chan *conn.Conn // get client conns from control goroutine
+	UserConnList  *list.List      // store user conns
+	Mutex         sync.Mutex
+}
+
+func (p *ProxyServer) Init() {
+	p.Status = consts.Idle
+	p.CtlMsgChan = make(chan int64)
+	p.StopBlockChan = make(chan int64)
+	p.CliConnChan = make(chan *conn.Conn)
+	p.UserConnList = list.New()
+}
+
+func (p *ProxyServer) Lock() {
+	p.Mutex.Lock()
+}
+
+func (p *ProxyServer) Unlock() {
+	p.Mutex.Unlock()
+}
+
+// start listening for user conns
+func (p *ProxyServer) Start() (err error) {
+	p.Listener, err = conn.Listen(p.BindAddr, p.ListenPort)
+	if err != nil {
+		return err
+	}
+
+	p.Status = consts.Working
+
+	// start a goroutine for listener
+	go func() {
+		for {
+			// block
+			c := p.Listener.GetConn()
+			log.Debug("ProxyName [%s], get one new user conn [%s]", p.Name, c.GetRemoteAddr())
+
+			// put to list
+			p.Lock()
+			if p.Status != consts.Working {
+				log.Debug("ProxyName [%s] is not working, new user conn close", p.Name)
+				c.Close()
+				p.Unlock()
+				return
+			}
+			p.UserConnList.PushBack(c)
+			p.Unlock()
+
+			// put msg to control conn
+			p.CtlMsgChan <- 1
+		}
+	}()
+
+	// start another goroutine for join two conns from client and user
+	go func() {
+		for {
+			cliConn := <-p.CliConnChan
+			p.Lock()
+			element := p.UserConnList.Front()
+
+			var userConn *conn.Conn
+			if element != nil {
+				userConn = element.Value.(*conn.Conn)
+				p.UserConnList.Remove(element)
+			} else {
+				cliConn.Close()
+				p.Unlock()
+				continue
+			}
+			p.Unlock()
+
+			// msg will transfer to another without modifying
+			// l means local, r means remote
+			log.Debug("Join two conns, (l[%s] r[%s]) (l[%s] r[%s])", cliConn.GetLocalAddr(), cliConn.GetRemoteAddr(),
+				userConn.GetLocalAddr(), userConn.GetRemoteAddr())
+			go conn.Join(cliConn, userConn)
+		}
+	}()
+
+	return nil
+}
+
+func (p *ProxyServer) Close() {
+	p.Lock()
+	p.Status = consts.Idle
+	p.CtlMsgChan = make(chan int64)
+	p.CliConnChan = make(chan *conn.Conn)
+	p.UserConnList = list.New()
+	p.Unlock()
+}
+
+func (p *ProxyServer) WaitUserConn() (res int64, isStop bool) {
+	select {
+	case res = <-p.CtlMsgChan:
+		return res, false
+	case <-p.StopBlockChan:
+		return 0, true
+	}
+}
+
+func (p *ProxyServer) StopWaitUserConn() {
+	p.StopBlockChan <- 1
+}