all: improve the method of import for internal packages

1. Change directory structure and Makefile to let GOPATH=`pwd`, so wherever the project directory is, just use make to build.

src/frp/models/client/client.go

@@ -0,0 +1,71 @@
+package client
+
+import (
+	"encoding/json"
+
+	"frp/models/consts"
+	"frp/models/msg"
+	"frp/utils/conn"
+	"frp/utils/log"
+)
+
+type ProxyClient struct {
+	Name      string
+	Passwd    string
+	LocalPort int64
+}
+
+func (p *ProxyClient) GetLocalConn() (c *conn.Conn, err error) {
+	c, err = conn.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) {
+	defer func() {
+		if err != nil {
+			c.Close()
+		}
+	}()
+
+	c, err = conn.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
+}

src/frp/models/client/config.go

@@ -0,0 +1,87 @@
+package client
+
+import (
+	"fmt"
+	"strconv"
+
+	ini "github.com/vaughan0/go-ini"
+)
+
+// common config
+var (
+	ServerAddr        string = "0.0.0.0"
+	ServerPort        int64  = 7000
+	LogFile           string = "./frpc.log"
+	LogLevel          string = "warn"
+	LogWay            string = "file"
+	HeartBeatInterval int64  = 5
+)
+
+var ProxyClients map[string]*ProxyClient = make(map[string]*ProxyClient)
+
+func LoadConf(confFile string) (err error) {
+	var tmpStr string
+	var ok bool
+
+	conf, err := ini.LoadFile(confFile)
+	if err != nil {
+		return err
+	}
+
+	// common
+	tmpStr, ok = conf.Get("common", "server_addr")
+	if ok {
+		ServerAddr = tmpStr
+	}
+
+	tmpStr, ok = conf.Get("common", "server_port")
+	if ok {
+		ServerPort, _ = strconv.ParseInt(tmpStr, 10, 64)
+	}
+
+	tmpStr, ok = conf.Get("common", "log_file")
+	if ok {
+		LogFile = tmpStr
+	}
+
+	tmpStr, ok = conf.Get("common", "log_level")
+	if ok {
+		LogLevel = tmpStr
+	}
+
+	tmpStr, ok = conf.Get("common", "log_way")
+	if ok {
+		LogWay = tmpStr
+	}
+
+	// servers
+	for name, section := range conf {
+		if name != "common" {
+			proxyClient := &ProxyClient{}
+			proxyClient.Name = name
+
+			proxyClient.Passwd, ok = section["passwd"]
+			if !ok {
+				return fmt.Errorf("Parse ini file error: proxy [%s] no passwd found", proxyClient.Name)
+			}
+
+			portStr, ok := section["local_port"]
+			if ok {
+				proxyClient.LocalPort, err = strconv.ParseInt(portStr, 10, 64)
+				if err != nil {
+					return fmt.Errorf("Parse ini file error: proxy [%s] local_port error", proxyClient.Name)
+				}
+			} else {
+				return fmt.Errorf("Parse ini file error: proxy [%s] local_port not found", proxyClient.Name)
+			}
+
+			ProxyClients[proxyClient.Name] = proxyClient
+		}
+	}
+
+	if len(ProxyClients) == 0 {
+		return fmt.Errorf("Parse ini file error: no proxy config found")
+	}
+
+	return nil
+}

src/frp/models/consts/consts.go

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

src/frp/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"`
+}

src/frp/models/server/config.go

@@ -0,0 +1,94 @@
+package server
+
+import (
+	"fmt"
+	"strconv"
+
+	ini "github.com/vaughan0/go-ini"
+)
+
+// common config
+var (
+	BindAddr         string = "0.0.0.0"
+	BindPort         int64  = 9527
+	LogFile          string = "./frps.log"
+	LogLevel         string = "warn"
+	LogWay           string = "file"
+	HeartBeatTimeout int64  = 30
+	UserConnTimeout  int64  = 10
+)
+
+var ProxyServers map[string]*ProxyServer = make(map[string]*ProxyServer)
+
+func LoadConf(confFile string) (err error) {
+	var tmpStr string
+	var ok bool
+
+	conf, err := ini.LoadFile(confFile)
+	if err != nil {
+		return err
+	}
+
+	// common
+	tmpStr, ok = conf.Get("common", "bind_addr")
+	if ok {
+		BindAddr = tmpStr
+	}
+
+	tmpStr, ok = conf.Get("common", "bind_port")
+	if ok {
+		BindPort, _ = strconv.ParseInt(tmpStr, 10, 64)
+	}
+
+	tmpStr, ok = conf.Get("common", "log_file")
+	if ok {
+		LogFile = tmpStr
+	}
+
+	tmpStr, ok = conf.Get("common", "log_level")
+	if ok {
+		LogLevel = tmpStr
+	}
+
+	tmpStr, ok = conf.Get("common", "log_way")
+	if ok {
+		LogWay = tmpStr
+	}
+
+	// servers
+	for name, section := range conf {
+		if name != "common" {
+			proxyServer := &ProxyServer{}
+			proxyServer.Name = name
+
+			proxyServer.Passwd, ok = section["passwd"]
+			if !ok {
+				return fmt.Errorf("Parse ini file error: proxy [%s] no passwd found", proxyServer.Name)
+			}
+
+			proxyServer.BindAddr, ok = section["bind_addr"]
+			if !ok {
+				proxyServer.BindAddr = "0.0.0.0"
+			}
+
+			portStr, ok := section["listen_port"]
+			if ok {
+				proxyServer.ListenPort, err = strconv.ParseInt(portStr, 10, 64)
+				if err != nil {
+					return fmt.Errorf("Parse ini file error: proxy [%s] listen_port error", proxyServer.Name)
+				}
+			} else {
+				return fmt.Errorf("Parse ini file error: proxy [%s] listen_port not found", proxyServer.Name)
+			}
+
+			proxyServer.Init()
+			ProxyServers[proxyServer.Name] = proxyServer
+		}
+	}
+
+	if len(ProxyServers) == 0 {
+		return fmt.Errorf("Parse ini file error: no proxy config found")
+	}
+
+	return nil
+}

src/frp/models/server/server.go

@@ -0,0 +1,150 @@
+package server
+
+import (
+	"container/list"
+	"sync"
+	"time"
+
+	"frp/models/consts"
+	"frp/utils/conn"
+	"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
+	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.cliConnChan = make(chan *conn.Conn)
+	p.ctlMsgChan = make(chan int64)
+	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.Init()
+	p.listener, err = conn.Listen(p.BindAddr, p.ListenPort)
+	if err != nil {
+		return err
+	}
+
+	p.Status = consts.Working
+
+	// start a goroutine for listener to accept user connection
+	go func() {
+		for {
+			// block
+			// if listener is closed, err returned
+			c, err := p.listener.GetConn()
+			if err != nil {
+				log.Info("ProxyName [%s], listener is closed", p.Name)
+				return
+			}
+			log.Debug("ProxyName [%s], get one new user conn [%s]", p.Name, c.GetRemoteAddr())
+
+			// insert into 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
+
+			// set timeout
+			time.AfterFunc(time.Duration(UserConnTimeout)*time.Second, func() {
+				p.Lock()
+				defer p.Unlock()
+				element := p.userConnList.Front()
+				if element == nil {
+					return
+				}
+
+				userConn := element.Value.(*conn.Conn)
+				if userConn == c {
+					log.Warn("ProxyName [%s], user conn [%s] timeout", p.Name, c.GetRemoteAddr())
+				}
+			})
+		}
+	}()
+
+	// start another goroutine for join two conns from client and user
+	go func() {
+		for {
+			cliConn, ok := <-p.cliConnChan
+			if !ok {
+				return
+			}
+
+			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.listener.Close()
+	close(p.ctlMsgChan)
+	close(p.cliConnChan)
+	p.userConnList = list.New()
+	p.Unlock()
+}
+
+func (p *ProxyServer) WaitUserConn() (closeFlag bool) {
+	closeFlag = false
+
+	_, ok := <-p.ctlMsgChan
+	if !ok {
+		closeFlag = true
+	}
+	return
+}
+
+func (p *ProxyServer) GetNewCliConn(c *conn.Conn) {
+	p.cliConnChan <- c
+}