guoswork/frp
1
0
Fork 0
mirror of https://gitee.com/IrisVega/frp.git synced 2024-11-01 22:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use go fmt before build

Browse Source
This commit is contained in:
fatedier 2016-02-03 18:46:24 +08:00
parent bdcdafd768
commit fa9356936b
12 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -2,12 +2,15 @@ export PATH := $(GOPATH)/bin:$(PATH)
all: build
build: godep frps frpc
build: godep fmt frps frpc
godep:
@go get github.com/tools/godep
godep restore
fmt:
@godep go fmt ./...
frps:
godep go build -o bin/frps ./cmd/frps

11
cmd/frpc/config.go
View File

@ -11,16 +11,15 @@ import (
// common config
var (
ServerAddr string = "0.0.0.0"
ServerPort int64 = 7000
LogFile string = "./frpc.log"
LogLevel string = "warn"
LogWay string = "file"
ServerAddr string = "0.0.0.0"
ServerPort int64 = 7000
LogFile string = "./frpc.log"
LogLevel string = "warn"
LogWay string = "file"
)
var ProxyClients map[string]*models.ProxyClient = make(map[string]*models.ProxyClient)
func LoadConf(confFile string) (err error) {
var tmpStr string
var ok bool

8
cmd/frpc/control.go
View File

@ -1,9 +1,9 @@
package main
import (
"encoding/json"
"io"
"sync"
"encoding/json"
"github.com/fatedier/frp/pkg/models"
"github.com/fatedier/frp/pkg/utils/conn"
@ -22,9 +22,9 @@ func ControlProcess(cli *models.ProxyClient, wait *sync.WaitGroup) {
defer c.Close()
req := &models.ClientCtlReq{
Type: models.ControlConn,
ProxyName: cli.Name,
Passwd: cli.Passwd,
Type: models.ControlConn,
ProxyName: cli.Name,
Passwd: cli.Passwd,
}
buf, _ := json.Marshal(req)
err = c.Write(string(buf) + "\n")

2
cmd/frpc/main.go
View File

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

11
cmd/frps/config.go
View File

@ -11,16 +11,15 @@ import (
// common config
var (
BindAddr string = "0.0.0.0"
BindPort int64 = 9527
LogFile string = "./frps.log"
LogLevel string = "warn"
LogWay string = "file"
BindAddr string = "0.0.0.0"
BindPort int64 = 9527
LogFile string = "./frps.log"
LogLevel string = "warn"
LogWay string = "file"
)
var ProxyServers map[string]*models.ProxyServer = make(map[string]*models.ProxyServer)
func LoadConf(confFile string) (err error) {
var tmpStr string
var ok bool

14
cmd/frps/control.go
View File

@ -1,12 +1,12 @@
package main
import (
"fmt"
"encoding/json"
"fmt"
"github.com/fatedier/frp/pkg/utils/log"
"github.com/fatedier/frp/pkg/utils/conn"
"github.com/fatedier/frp/pkg/models"
"github.com/fatedier/frp/pkg/utils/conn"
"github.com/fatedier/frp/pkg/utils/log"
)
func ProcessControlConn(l *conn.Listener) {
@ -41,7 +41,7 @@ func controlWorker(c *conn.Conn) {
clientCtlRes.Code = 1
clientCtlRes.Msg = msg
}
if needRes {
buf, _ := json.Marshal(clientCtlRes)
err = c.Write(string(buf) + "\n")
@ -49,7 +49,7 @@ func controlWorker(c *conn.Conn) {
log.Warn("Write error, %v", err)
}
} else {
// work conn, just return
// work conn, just return
return
}
@ -96,7 +96,7 @@ func checkProxy(req *models.ClientCtlReq, c *conn.Conn) (succ bool, msg string,
log.Warn(msg)
return
}
// control conn
if req.Type == models.ControlConn {
if server.Status != models.Idle {
@ -115,7 +115,7 @@ func checkProxy(req *models.ClientCtlReq, c *conn.Conn) (succ bool, msg string,
log.Info("ProxyName [%s], start proxy success", req.ProxyName)
} else if req.Type == models.WorkConn {
// work conn
// work conn
needRes = false
if server.Status != models.Working {
log.Warn("ProxyName [%s], is not working when it gets one new work conn", req.ProxyName)

2
cmd/frps/main.go
View File

@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/fatedier/frp/pkg/utils/log"
"github.com/fatedier/frp/pkg/utils/conn"
"github.com/fatedier/frp/pkg/utils/log"
)
func main() {

16
pkg/models/client.go
View File

@ -8,9 +8,9 @@ import (
)
type ProxyClient struct {
Name string
Passwd string
LocalPort int64
Name string
Passwd string
LocalPort int64
}
func (p *ProxyClient) GetLocalConn() (c *conn.Conn, err error) {
@ -24,7 +24,7 @@ func (p *ProxyClient) GetLocalConn() (c *conn.Conn, err error) {
func (p *ProxyClient) GetRemoteConn(addr string, port int64) (c *conn.Conn, err error) {
c = &conn.Conn{}
defer func(){
defer func() {
if err != nil {
c.Close()
}
@ -37,9 +37,9 @@ func (p *ProxyClient) GetRemoteConn(addr string, port int64) (c *conn.Conn, err
}
req := &ClientCtlReq{
Type: WorkConn,
ProxyName: p.Name,
Passwd: p.Passwd,
Type: WorkConn,
ProxyName: p.Name,
Passwd: p.Passwd,
}
buf, _ := json.Marshal(req)
@ -64,7 +64,7 @@ func (p *ProxyClient) StartTunnel(serverAddr string, serverPort int64) (err erro
}
log.Debug("Join two conns, (l[%s] r[%s]) (l[%s] r[%s])", localConn.GetLocalAddr(), localConn.GetRemoteAddr(),
remoteConn.GetLocalAddr(), remoteConn.GetRemoteAddr())
remoteConn.GetLocalAddr(), remoteConn.GetRemoteAddr())
go conn.Join(localConn, remoteConn)
return nil
}

13
pkg/models/msg.go
View File

@ -1,8 +1,8 @@
package models
type GeneralRes struct {
Code int64 `json:"code"`
Msg string `json:"msg"`
Code int64 `json:"code"`
Msg string `json:"msg"`
}
// type
@ -12,16 +12,15 @@ const (
)
type ClientCtlReq struct {
Type int64 `json:"type"`
ProxyName string `json:"proxy_name"`
Passwd string `json:"passwd"`
Type int64 `json:"type"`
ProxyName string `json:"proxy_name"`
Passwd string `json:"passwd"`
}
type ClientCtlRes struct {
GeneralRes
}
type ServerCtlReq struct {
Type int64 `json:"type"`
Type int64 `json:"type"`
}

28
pkg/models/server.go
View File

@ -1,8 +1,8 @@
package models
import (
"sync"
"container/list"
"sync"
"github.com/fatedier/frp/pkg/utils/conn"
"github.com/fatedier/frp/pkg/utils/log"
@ -14,17 +14,17 @@ const (
)
type ProxyServer struct {
Name string
Passwd string
BindAddr string
ListenPort int64
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
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() {
@ -55,7 +55,7 @@ func (p *ProxyServer) Start() (err error) {
go func() {
for {
// block
c := p.Listener.GetConn()
c := p.Listener.GetConn()
log.Debug("ProxyName [%s], get one new user conn [%s]", p.Name, c.GetRemoteAddr())
// put to list
@ -93,7 +93,7 @@ func (p *ProxyServer) Start() (err error) {
// msg will transfer to another without modifying
log.Debug("Join two conns, (l[%s] r[%s]) (l[%s] r[%s])", cliConn.GetLocalAddr(), cliConn.GetRemoteAddr(),
userConn.GetLocalAddr(), userConn.GetRemoteAddr())
userConn.GetLocalAddr(), userConn.GetRemoteAddr())
go conn.Join(cliConn, userConn)
}
}()
@ -112,5 +112,5 @@ func (p *ProxyServer) Close() {
func (p *ProxyServer) WaitUserConn() (res int64) {
res = <-p.CtlMsgChan
return
return
}

20
pkg/utils/conn/conn.go
View File

@ -1,18 +1,18 @@
package conn
import (
"fmt"
"net"
"bufio"
"sync"
"fmt"
"io"
"net"
"sync"
"github.com/fatedier/frp/pkg/utils/log"
)
type Listener struct {
Addr net.Addr
Conns chan *Conn
Addr net.Addr
Conns chan *Conn
}
// wait util get one
@ -22,8 +22,8 @@ func (l *Listener) GetConn() (conn *Conn) {
}
type Conn struct {
TcpConn *net.TCPConn
Reader *bufio.Reader
TcpConn *net.TCPConn
Reader *bufio.Reader
}
func (c *Conn) ConnectServer(host string, port int64) (err error) {
@ -70,8 +70,8 @@ func Listen(bindAddr string, bindPort int64) (l *Listener, err error) {
}
l = &Listener{
Addr: listener.Addr(),
Conns: make(chan *Conn),
Addr: listener.Addr(),
Conns: make(chan *Conn),
}
go func() {
@ -83,7 +83,7 @@ func Listen(bindAddr string, bindPort int64) (l *Listener, err error) {
}
c := &Conn{
TcpConn: conn,
TcpConn: conn,
}
c.Reader = bufio.NewReader(c.TcpConn)
l.Conns <- c

2
pkg/utils/log/log.go
View File

@ -22,7 +22,7 @@ func SetLogFile(logWay string, logFile string) {
if logWay == "console" {
Log.SetLogger("console", "")
} else {
Log.SetLogger("file", `{"filename": "` + logFile + `"}`)
Log.SetLogger("file", `{"filename": "`+logFile+`"}`)
}
}