XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-27 07:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change directory structure, move models and utils to root directory

Browse Source
This commit is contained in:
fatedier
2016-02-18 16:56:55 +08:00
parent 30da2a2d15
commit 50165053f8
14 changed files with 76 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/frpc/config.go
View File

@@ -4,8 +4,7 @@ import (
"fmt"
"strconv"
"github.com/fatedier/frp/pkg/models"
"github.com/fatedier/frp/models/client"
ini "github.com/vaughan0/go-ini"
)
@@ -19,7 +18,7 @@ var (
HeartBeatInterval int64 = 5
)
var ProxyClients map[string]*models.ProxyClient = make(map[string]*models.ProxyClient)
var ProxyClients map[string]*client.ProxyClient = make(map[string]*client.ProxyClient)
func LoadConf(confFile string) (err error) {
var tmpStr string
@@ -59,7 +58,7 @@ func LoadConf(confFile string) (err error) {
// servers
for name, section := range conf {
if name != "common" {
proxyClient := &models.ProxyClient{}
proxyClient := &client.ProxyClient{}
proxyClient.Name = name
proxyClient.Passwd, ok = section["passwd"]

18
cmd/frpc/control.go
View File

@@ -6,14 +6,16 @@ import (
"sync"
"time"
"github.com/fatedier/frp/pkg/models"
"github.com/fatedier/frp/pkg/utils/conn"
"github.com/fatedier/frp/pkg/utils/log"
"github.com/fatedier/frp/models/client"
"github.com/fatedier/frp/models/consts"
"github.com/fatedier/frp/models/msg"
"github.com/fatedier/frp/utils/conn"
"github.com/fatedier/frp/utils/log"
)
var isHeartBeatContinue bool = true
func ControlProcess(cli *models.ProxyClient, wait *sync.WaitGroup) {
func ControlProcess(cli *client.ProxyClient, wait *sync.WaitGroup) {
defer wait.Done()
c := loginToServer(cli)
@@ -54,7 +56,7 @@ func ControlProcess(cli *models.ProxyClient, wait *sync.WaitGroup) {
}
}
func loginToServer(cli *models.ProxyClient) (connection *conn.Conn) {
func loginToServer(cli *client.ProxyClient) (connection *conn.Conn) {
c := &conn.Conn{}
connection = nil
@@ -65,8 +67,8 @@ func loginToServer(cli *models.ProxyClient) (connection *conn.Conn) {
break
}
req := &models.ClientCtlReq{
Type: models.ControlConn,
req := &msg.ClientCtlReq{
Type: consts.CtlConn,
ProxyName: cli.Name,
Passwd: cli.Passwd,
}
@@ -84,7 +86,7 @@ func loginToServer(cli *models.ProxyClient) (connection *conn.Conn) {
}
log.Debug("ProxyName [%s], read [%s]", cli.Name, res)
clientCtlRes := &models.ClientCtlRes{}
clientCtlRes := &msg.ClientCtlRes{}
if err = json.Unmarshal([]byte(res), &clientCtlRes); err != nil {
log.Error("ProxyName [%s], format server response error, %v", cli.Name, err)
break

2
cmd/frpc/main.go
View File

@@ -4,7 +4,7 @@ import (
"os"
"sync"
"github.com/fatedier/frp/pkg/utils/log"
"github.com/fatedier/frp/utils/log"
)
func main() {