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

all: modify import path, change version to v0.8.0

Browse Source
This commit is contained in:
fatedier 2016-08-11 16:10:44 +08:00
parent 9c0ca8675d
commit d4ecc2218d
32 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,5 +1,5 @@
export PATH := $(GOPATH)/bin:$(PATH) export PATH := $(GOPATH)/bin:$(PATH)
export GOPATH := $(shell pwd)/Godeps/_workspace:$(shell pwd):$(GOPATH) export GOPATH := $(shell pwd)/Godeps/_workspace:$(GOPATH)
all: build all: build
@ -14,11 +14,11 @@ fmt:
@go fmt ./test/func_test.go @go fmt ./test/func_test.go
frps: frps:
go build -o bin/frps ./src/frp/cmd/frps go build -o bin/frps ./src/cmd/frps
cp -rf ./assets ./bin cp -rf ./assets ./bin
frpc: frpc:
go build -o bin/frpc ./src/frp/cmd/frpc go build -o bin/frpc ./src/cmd/frpc
echo_server: echo_server:
go build -o test/bin/echo_server ./test/echo_server.go go build -o test/bin/echo_server ./test/echo_server.go

2
Makefile.cross-compiles
View File

@ -1,6 +1,6 @@
export PATH := $(GOPATH)/bin:$(PATH) export PATH := $(GOPATH)/bin:$(PATH)
export OLDGOPATH := $(GOPATH) export OLDGOPATH := $(GOPATH)
export GOPATH := $(shell pwd)/Godeps/_workspace:$(shell pwd):$(GOPATH) export GOPATH := $(shell pwd)/Godeps/_workspace:$(GOPATH)
all: build all: build

12
src/frp/cmd/frpc/control.go → src/cmd/frpc/control.go
View File

@ -21,12 +21,12 @@ import (
"sync" "sync"
"time" "time"
"frp/models/client" "github.com/fatedier/frp/src/models/client"
"frp/models/consts" "github.com/fatedier/frp/src/models/consts"
"frp/models/msg" "github.com/fatedier/frp/src/models/msg"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
"frp/utils/pcrypto" "github.com/fatedier/frp/src/utils/pcrypto"
) )
func ControlProcess(cli *client.ProxyClient, wait *sync.WaitGroup) { func ControlProcess(cli *client.ProxyClient, wait *sync.WaitGroup) {

6
src/frp/cmd/frpc/main.go → src/cmd/frpc/main.go
View File

@ -23,9 +23,9 @@ import (
docopt "github.com/docopt/docopt-go" docopt "github.com/docopt/docopt-go"
"frp/models/client" "github.com/fatedier/frp/src/models/client"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
"frp/utils/version" "github.com/fatedier/frp/src/utils/version"
) )
var ( var (

12
src/frp/cmd/frps/control.go → src/cmd/frps/control.go
View File

@ -20,12 +20,12 @@ import (
"io" "io"
"time" "time"
"frp/models/consts" "github.com/fatedier/frp/src/models/consts"
"frp/models/msg" "github.com/fatedier/frp/src/models/msg"
"frp/models/server" "github.com/fatedier/frp/src/models/server"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
"frp/utils/pcrypto" "github.com/fatedier/frp/src/utils/pcrypto"
) )
func ProcessControlConn(l *conn.Listener) { func ProcessControlConn(l *conn.Listener) {

10
src/frp/cmd/frps/main.go → src/cmd/frps/main.go
View File

@ -26,11 +26,11 @@ import (
docopt "github.com/docopt/docopt-go" docopt "github.com/docopt/docopt-go"
"frp/models/server" "github.com/fatedier/frp/src/models/server"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
"frp/utils/version" "github.com/fatedier/frp/src/utils/version"
"frp/utils/vhost" "github.com/fatedier/frp/src/utils/vhost"
) )
var usage string = `frps is the server of frp var usage string = `frps is the server of frp

12
src/frp/models/client/client.go → src/models/client/client.go
View File

@ -19,12 +19,12 @@ import (
"fmt" "fmt"
"time" "time"
"frp/models/config" "github.com/fatedier/frp/src/models/config"
"frp/models/consts" "github.com/fatedier/frp/src/models/consts"
"frp/models/msg" "github.com/fatedier/frp/src/models/msg"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
"frp/utils/pcrypto" "github.com/fatedier/frp/src/utils/pcrypto"
) )
type ProxyClient struct { type ProxyClient struct {

0
src/frp/models/client/config.go → src/models/client/config.go
View File

0
src/frp/models/config/config.go → src/models/config/config.go
View File

0
src/frp/models/consts/consts.go → src/models/consts/consts.go
View File

2
src/frp/models/metric/server.go → src/models/metric/server.go
View File

@ -19,7 +19,7 @@ import (
"sync" "sync"
"time" "time"
"frp/models/consts" "github.com/fatedier/frp/src/models/consts"
) )
var ( var (

0
src/frp/models/msg/msg.go → src/models/msg/msg.go
View File

12
src/frp/models/msg/process.go → src/models/msg/process.go
View File

@ -21,12 +21,12 @@ import (
"io" "io"
"sync" "sync"
"frp/models/config" "github.com/fatedier/frp/src/models/config"
"frp/models/metric" "github.com/fatedier/frp/src/models/metric"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
"frp/utils/pcrypto" "github.com/fatedier/frp/src/utils/pcrypto"
"frp/utils/pool" "github.com/fatedier/frp/src/utils/pool"
) )
// will block until connection close // will block until connection close

8
src/frp/models/server/config.go → src/models/server/config.go
View File

@ -22,10 +22,10 @@ import (
ini "github.com/vaughan0/go-ini" ini "github.com/vaughan0/go-ini"
"frp/models/consts" "github.com/fatedier/frp/src/models/consts"
"frp/models/metric" "github.com/fatedier/frp/src/models/metric"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
"frp/utils/vhost" "github.com/fatedier/frp/src/utils/vhost"
) )
// common config // common config

0
src/frp/models/server/dashboard.go → src/models/server/dashboard.go
View File

4
src/frp/models/server/dashboard_api.go → src/models/server/dashboard_api.go
View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"frp/models/metric" "github.com/fatedier/frp/src/models/metric"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
) )
type GeneralResponse struct { type GeneralResponse struct {

4
src/frp/models/server/dashboard_view.go → src/models/server/dashboard_view.go
View File

@ -19,8 +19,8 @@ import (
"net/http" "net/http"
"path" "path"
"frp/models/metric" "github.com/fatedier/frp/src/models/metric"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
) )
func viewDashboard(w http.ResponseWriter, r *http.Request) { func viewDashboard(w http.ResponseWriter, r *http.Request) {

12
src/frp/models/server/server.go → src/models/server/server.go
View File

@ -19,12 +19,12 @@ import (
"sync" "sync"
"time" "time"
"frp/models/config" "github.com/fatedier/frp/src/models/config"
"frp/models/consts" "github.com/fatedier/frp/src/models/consts"
"frp/models/metric" "github.com/fatedier/frp/src/models/metric"
"frp/models/msg" "github.com/fatedier/frp/src/models/msg"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
"frp/utils/log" "github.com/fatedier/frp/src/utils/log"
) )
type Listener interface { type Listener interface {

0
src/frp/utils/broadcast/broadcast.go → src/utils/broadcast/broadcast.go
View File

0
src/frp/utils/broadcast/broadcast_test.go → src/utils/broadcast/broadcast_test.go
View File

0
src/frp/utils/conn/conn.go → src/utils/conn/conn.go
View File

0
src/frp/utils/log/log.go → src/utils/log/log.go
View File

0
src/frp/utils/pcrypto/pcrypto.go → src/utils/pcrypto/pcrypto.go
View File

0
src/frp/utils/pcrypto/pcrypto_test.go → src/utils/pcrypto/pcrypto_test.go
View File

0
src/frp/utils/pool/pool.go → src/utils/pool/pool.go
View File

2
src/frp/utils/version/version.go → src/utils/version/version.go
View File

@ -19,7 +19,7 @@ import (
"strings" "strings"
) )
var version string = "0.7.0" var version string = "0.8.0"
func Full() string { func Full() string {
return version return version

0
src/frp/utils/version/version_test.go → src/utils/version/version_test.go
View File

4
src/frp/utils/vhost/http.go → src/utils/vhost/http.go
View File

@ -25,8 +25,8 @@ import (
"strings" "strings"
"time" "time"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
"frp/utils/pool" "github.com/fatedier/frp/src/utils/pool"
) )
type HttpMuxer struct { type HttpMuxer struct {

4
src/frp/utils/vhost/https.go → src/utils/vhost/https.go
View File

@ -21,8 +21,8 @@ import (
"strings" "strings"
"time" "time"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
"frp/utils/pool" "github.com/fatedier/frp/src/utils/pool"
) )
const ( const (

2
src/frp/utils/vhost/vhost.go → src/utils/vhost/vhost.go
View File

@ -23,7 +23,7 @@ import (
"sync" "sync"
"time" "time"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
) )
type muxFunc func(*conn.Conn) (net.Conn, string, error) type muxFunc func(*conn.Conn) (net.Conn, string, error)

2
test/echo_server.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"io" "io"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
) )
var ( var (

2
test/func_test.go
View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"frp/utils/conn" "github.com/fatedier/frp/src/utils/conn"
) )
var ( var (