github-forks
/
frp
mirror of https://github.com/fatedier/frp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename models to pkg (#2005)

Browse Source
pull/2008/head
fatedier 4 years ago committed by GitHub
parent 710ecf44f5
commit 3fbdea0f6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
111 changed files with 196 additions and 196 deletions
Show Stats Download Patch File Download Diff File

5
Makefile
Unescape Escape View File

@ -28,11 +28,10 @@ test: gotest
gotest: gotest:
go test -v --cover ./assets/... go test -v --cover ./assets/...
go test -v --cover ./client/...
go test -v --cover ./cmd/... go test -v --cover ./cmd/...
go test -v --cover ./models/... go test -v --cover ./client/...
go test -v --cover ./server/... go test -v --cover ./server/...
go test -v --cover ./utils/... go test -v --cover ./pkg/...
ci: ci:
go test -count=1 -p=1 -v ./tests/... go test -count=1 -p=1 -v ./tests/...

2
client/admin.go
Unescape Escape View File

@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/fatedier/frp/assets" "github.com/fatedier/frp/assets"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

4
client/admin_api.go
Unescape Escape View File

@ -23,8 +23,8 @@ import (
"strings" "strings"
"github.com/fatedier/frp/client/proxy" "github.com/fatedier/frp/client/proxy"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/pkg/util/log"
) )
type GeneralResponse struct { type GeneralResponse struct {

12
client/control.go
Unescape Escape View File

@ -25,12 +25,12 @@ import (
"time" "time"
"github.com/fatedier/frp/client/proxy" "github.com/fatedier/frp/client/proxy"
"github.com/fatedier/frp/models/auth" "github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/models/transport" "github.com/fatedier/frp/pkg/transport"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/golib/control/shutdown" "github.com/fatedier/golib/control/shutdown"
"github.com/fatedier/golib/crypto" "github.com/fatedier/golib/crypto"

2
client/event/event.go
Unescape Escape View File

@ -3,7 +3,7 @@ package event
import ( import (
"errors" "errors"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
) )
type Type int type Type int

2
client/health/health.go
Unescape Escape View File

@ -24,7 +24,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
) )
var ( var (

14
client/proxy/proxy.go
Unescape Escape View File

@ -26,13 +26,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
plugin "github.com/fatedier/frp/models/plugin/client" plugin "github.com/fatedier/frp/pkg/plugin/client"
"github.com/fatedier/frp/models/proto/udp" "github.com/fatedier/frp/pkg/proto/udp"
"github.com/fatedier/frp/utils/limit" "github.com/fatedier/frp/pkg/util/limit"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/golib/errors" "github.com/fatedier/golib/errors"
frpIo "github.com/fatedier/golib/io" frpIo "github.com/fatedier/golib/io"

6
client/proxy/proxy_manager.go
Unescape Escape View File

@ -7,9 +7,9 @@ import (
"sync" "sync"
"github.com/fatedier/frp/client/event" "github.com/fatedier/frp/client/event"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/golib/errors" "github.com/fatedier/golib/errors"
) )

6
client/proxy/proxy_wrapper.go
Unescape Escape View File

@ -10,9 +10,9 @@ import (
"github.com/fatedier/frp/client/event" "github.com/fatedier/frp/client/event"
"github.com/fatedier/frp/client/health" "github.com/fatedier/frp/client/health"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/golib/errors" "github.com/fatedier/golib/errors"
) )

16
client/service.go
Unescape Escape View File

@ -18,7 +18,6 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"github.com/fatedier/frp/models/transport"
"io/ioutil" "io/ioutil"
"net" "net"
"runtime" "runtime"
@ -27,13 +26,14 @@ import (
"time" "time"
"github.com/fatedier/frp/assets" "github.com/fatedier/frp/assets"
"github.com/fatedier/frp/models/auth" "github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/pkg/transport"
frpNet "github.com/fatedier/frp/utils/net" "github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/utils/version" frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/version"
"github.com/fatedier/frp/pkg/util/xlog"
fmux "github.com/hashicorp/yamux" fmux "github.com/hashicorp/yamux"
) )

12
client/visitor.go
Unescape Escape View File

@ -24,12 +24,12 @@ import (
"sync" "sync"
"time" "time"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/models/proto/udp" "github.com/fatedier/frp/pkg/proto/udp"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/golib/errors" "github.com/fatedier/golib/errors"
frpIo "github.com/fatedier/golib/io" frpIo "github.com/fatedier/golib/io"

4
client/visitor_manager.go
Unescape Escape View File

@ -19,8 +19,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
) )
type VisitorManager struct { type VisitorManager struct {

6
cmd/frpc/sub/http.go
Unescape Escape View File

@ -19,10 +19,10 @@ import (
"os" "os"
"strings" "strings"
"github.com/spf13/cobra" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/models/config" "github.com/spf13/cobra"
"github.com/fatedier/frp/models/consts"
) )
func init() { func init() {

4
cmd/frpc/sub/https.go
Unescape Escape View File

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
) )
func init() { func init() {

4
cmd/frpc/sub/reload.go
Unescape Escape View File

@ -22,9 +22,9 @@ import (
"os" "os"
"strings" "strings"
"github.com/spf13/cobra" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/config" "github.com/spf13/cobra"
) )
func init() { func init() {

12
cmd/frpc/sub/root.go
Unescape Escape View File

@ -25,13 +25,13 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/spf13/cobra"
"github.com/fatedier/frp/client" "github.com/fatedier/frp/client"
"github.com/fatedier/frp/models/auth" "github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/utils/version" "github.com/fatedier/frp/pkg/util/version"
"github.com/spf13/cobra"
) )
const ( const (

6
cmd/frpc/sub/status.go
Unescape Escape View File

@ -23,11 +23,11 @@ import (
"os" "os"
"strings" "strings"
"github.com/fatedier/frp/client"
"github.com/fatedier/frp/pkg/config"
"github.com/rodaine/table" "github.com/rodaine/table"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/fatedier/frp/client"
"github.com/fatedier/frp/models/config"
) )
func init() { func init() {

6
cmd/frpc/sub/stcp.go
Unescape Escape View File

@ -18,10 +18,10 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/spf13/cobra" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/models/config" "github.com/spf13/cobra"
"github.com/fatedier/frp/models/consts"
) )
func init() { func init() {

6
cmd/frpc/sub/sudp.go
Unescape Escape View File

@ -18,10 +18,10 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/spf13/cobra" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/models/config" "github.com/spf13/cobra"
"github.com/fatedier/frp/models/consts"
) )
func init() { func init() {

4
cmd/frpc/sub/tcp.go
Unescape Escape View File

@ -20,8 +20,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
) )
func init() { func init() {

4
cmd/frpc/sub/tcpmux.go
Unescape Escape View File

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
) )
func init() { func init() {

6
cmd/frpc/sub/udp.go
Unescape Escape View File

@ -18,10 +18,10 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/spf13/cobra" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/models/config" "github.com/spf13/cobra"
"github.com/fatedier/frp/models/consts"
) )
func init() { func init() {

6
cmd/frpc/sub/xtcp.go
Unescape Escape View File

@ -18,10 +18,10 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/spf13/cobra" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/models/config" "github.com/spf13/cobra"
"github.com/fatedier/frp/models/consts"
) )
func init() { func init() {

2
cmd/frps/main.go
Unescape Escape View File

@ -21,7 +21,7 @@ import (
"github.com/fatedier/golib/crypto" "github.com/fatedier/golib/crypto"
_ "github.com/fatedier/frp/assets/frps/statik" _ "github.com/fatedier/frp/assets/frps/statik"
_ "github.com/fatedier/frp/models/metrics" _ "github.com/fatedier/frp/pkg/metrics"
) )
func main() { func main() {

14
cmd/frps/root.go
Unescape Escape View File

@ -18,14 +18,14 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/spf13/cobra" "github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/auth" "github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/pkg/util/version"
"github.com/fatedier/frp/server" "github.com/fatedier/frp/server"
"github.com/fatedier/frp/utils/log"
"github.com/fatedier/frp/utils/util" "github.com/spf13/cobra"
"github.com/fatedier/frp/utils/version"
) )
const ( const (

4
models/auth/auth.go → pkg/auth/auth.go
Unescape Escape View File

@ -17,8 +17,8 @@ package auth
import ( import (
"fmt" "fmt"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/vaughan0/go-ini" "github.com/vaughan0/go-ini"
) )

2
models/auth/oidc.go → pkg/auth/oidc.go
Unescape Escape View File

@ -18,7 +18,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/coreos/go-oidc" "github.com/coreos/go-oidc"
"github.com/vaughan0/go-ini" "github.com/vaughan0/go-ini"

4
models/auth/token.go → pkg/auth/token.go
Unescape Escape View File

@ -18,8 +18,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/pkg/util/util"
"github.com/vaughan0/go-ini" "github.com/vaughan0/go-ini"
) )

4
models/config/client_common.go → pkg/config/client_common.go
Unescape Escape View File

@ -20,9 +20,9 @@ import (
"strconv" "strconv"
"strings" "strings"
ini "github.com/vaughan0/go-ini" "github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/models/auth" ini "github.com/vaughan0/go-ini"
) )
// ClientCommonConf contains information for a client service. It is // ClientCommonConf contains information for a client service. It is

6
models/config/proxy.go → pkg/config/proxy.go
Unescape Escape View File

@ -20,9 +20,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/pkg/util/util"
ini "github.com/vaughan0/go-ini" ini "github.com/vaughan0/go-ini"
) )

8
models/config/server_common.go → pkg/config/server_common.go
Unescape Escape View File

@ -19,11 +19,11 @@ import (
"strconv" "strconv"
"strings" "strings"
ini "github.com/vaughan0/go-ini" "github.com/fatedier/frp/pkg/auth"
plugin "github.com/fatedier/frp/pkg/plugin/server"
"github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/models/auth" ini "github.com/vaughan0/go-ini"
plugin "github.com/fatedier/frp/models/plugin/server"
"github.com/fatedier/frp/utils/util"
) )
// ServerCommonConf contains information for a server service. It is // ServerCommonConf contains information for a server service. It is

0
models/config/types.go → pkg/config/types.go
Unescape Escape View File

0
models/config/types_test.go → pkg/config/types_test.go
Unescape Escape View File

0
models/config/value.go → pkg/config/value.go
Unescape Escape View File

2
models/config/visitor.go → pkg/config/visitor.go
Unescape Escape View File

@ -19,7 +19,7 @@ import (
"reflect" "reflect"
"strconv" "strconv"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
ini "github.com/vaughan0/go-ini" ini "github.com/vaughan0/go-ini"
) )

0
models/consts/consts.go → pkg/consts/consts.go
Unescape Escape View File

0
models/errors/errors.go → pkg/errors/errors.go
Unescape Escape View File

4
models/metrics/aggregate/server.go → pkg/metrics/aggregate/server.go
Unescape Escape View File

@ -15,8 +15,8 @@
package aggregate package aggregate
import ( import (
"github.com/fatedier/frp/models/metrics/mem" "github.com/fatedier/frp/pkg/metrics/mem"
"github.com/fatedier/frp/models/metrics/prometheus" "github.com/fatedier/frp/pkg/metrics/prometheus"
"github.com/fatedier/frp/server/metrics" "github.com/fatedier/frp/server/metrics"
) )

4
models/metrics/mem/server.go → pkg/metrics/mem/server.go
Unescape Escape View File

@ -18,9 +18,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/pkg/util/metric"
server "github.com/fatedier/frp/server/metrics" server "github.com/fatedier/frp/server/metrics"
"github.com/fatedier/frp/utils/log"
"github.com/fatedier/frp/utils/metric"
) )
var sm *serverMetrics = newServerMetrics() var sm *serverMetrics = newServerMetrics()

2
models/metrics/mem/types.go → pkg/metrics/mem/types.go
Unescape Escape View File

@ -17,7 +17,7 @@ package mem
import ( import (
"time" "time"
"github.com/fatedier/frp/utils/metric" "github.com/fatedier/frp/pkg/util/metric"
) )
const ( const (

2
models/metrics/metrics.go → pkg/metrics/metrics.go
Unescape Escape View File

@ -1,7 +1,7 @@
package metrics package metrics
import ( import (
"github.com/fatedier/frp/models/metrics/aggregate" "github.com/fatedier/frp/pkg/metrics/aggregate"
) )
var EnableMem = aggregate.EnableMem var EnableMem = aggregate.EnableMem

0
models/metrics/prometheus/server.go → pkg/metrics/prometheus/server.go
Unescape Escape View File

0
models/msg/ctl.go → pkg/msg/ctl.go
Unescape Escape View File

0
models/msg/msg.go → pkg/msg/msg.go
Unescape Escape View File

6
models/nathole/nathole.go → pkg/nathole/nathole.go
Unescape Escape View File

@ -7,9 +7,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/golib/errors" "github.com/fatedier/golib/errors"
"github.com/fatedier/golib/pool" "github.com/fatedier/golib/pool"

2
models/plugin/client/http2https.go → pkg/plugin/client/http2https.go
Unescape Escape View File

@ -23,7 +23,7 @@ import (
"net/http/httputil" "net/http/httputil"
"strings" "strings"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
) )
const PluginHTTP2HTTPS = "http2https" const PluginHTTP2HTTPS = "http2https"

2
models/plugin/client/http_proxy.go → pkg/plugin/client/http_proxy.go
Unescape Escape View File

@ -22,7 +22,7 @@ import (
"net/http" "net/http"
"strings" "strings"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
frpIo "github.com/fatedier/golib/io" frpIo "github.com/fatedier/golib/io"
gnet "github.com/fatedier/golib/net" gnet "github.com/fatedier/golib/net"

2
models/plugin/client/https2http.go → pkg/plugin/client/https2http.go
Unescape Escape View File

@ -23,7 +23,7 @@ import (
"net/http/httputil" "net/http/httputil"
"strings" "strings"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
) )
const PluginHTTPS2HTTP = "https2http" const PluginHTTPS2HTTP = "https2http"

0
models/plugin/client/plugin.go → pkg/plugin/client/plugin.go
Unescape Escape View File

2
models/plugin/client/socks5.go → pkg/plugin/client/socks5.go
Unescape Escape View File

@ -20,7 +20,7 @@ import (
"log" "log"
"net" "net"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
gosocks5 "github.com/armon/go-socks5" gosocks5 "github.com/armon/go-socks5"
) )

2
models/plugin/client/static_file.go → pkg/plugin/client/static_file.go
Unescape Escape View File

@ -19,7 +19,7 @@ import (
"net" "net"
"net/http" "net/http"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

0
models/plugin/client/unix_domain_socket.go → pkg/plugin/client/unix_domain_socket.go
Unescape Escape View File

0
models/plugin/server/http.go → pkg/plugin/server/http.go
Unescape Escape View File

4
models/plugin/server/manager.go → pkg/plugin/server/manager.go
Unescape Escape View File

@ -19,8 +19,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
) )
type Manager struct { type Manager struct {

0
models/plugin/server/plugin.go → pkg/plugin/server/plugin.go
Unescape Escape View File

0
models/plugin/server/tracer.go → pkg/plugin/server/tracer.go
Unescape Escape View File

2
models/plugin/server/types.go → pkg/plugin/server/types.go
Unescape Escape View File

@ -15,7 +15,7 @@
package plugin package plugin
import ( import (
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
) )
type Request struct { type Request struct {

2
models/proto/udp/udp.go → pkg/proto/udp/udp.go
Unescape Escape View File

@ -20,7 +20,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/golib/errors" "github.com/fatedier/golib/errors"
"github.com/fatedier/golib/pool" "github.com/fatedier/golib/pool"

0
models/proto/udp/udp_test.go → pkg/proto/udp/udp_test.go
Unescape Escape View File

0
models/transport/tls.go → pkg/transport/tls.go
Unescape Escape View File

0
utils/limit/reader.go → pkg/util/limit/reader.go
Unescape Escape View File

0
utils/limit/writer.go → pkg/util/limit/writer.go
Unescape Escape View File

0
utils/log/log.go → pkg/util/log/log.go
Unescape Escape View File

0
utils/metric/counter.go → pkg/util/metric/counter.go
Unescape Escape View File

0
utils/metric/counter_test.go → pkg/util/metric/counter_test.go
Unescape Escape View File

0
utils/metric/date_counter.go → pkg/util/metric/date_counter.go
Unescape Escape View File

0
utils/metric/date_counter_test.go → pkg/util/metric/date_counter_test.go
Unescape Escape View File

0
utils/metric/metrics.go → pkg/util/metric/metrics.go
Unescape Escape View File

3
utils/net/conn.go → pkg/util/net/conn.go
Unescape Escape View File

@ -24,7 +24,8 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
gnet "github.com/fatedier/golib/net" gnet "github.com/fatedier/golib/net"
kcp "github.com/fatedier/kcp-go" kcp "github.com/fatedier/kcp-go"
) )

0
utils/net/http.go → pkg/util/net/http.go
Unescape Escape View File

0
utils/net/kcp.go → pkg/util/net/kcp.go
Unescape Escape View File

0
utils/net/listener.go → pkg/util/net/listener.go
Unescape Escape View File

0
utils/net/tls.go → pkg/util/net/tls.go
Unescape Escape View File

0
utils/net/udp.go → pkg/util/net/udp.go
Unescape Escape View File

0
utils/net/websocket.go → pkg/util/net/websocket.go
Unescape Escape View File

4
utils/tcpmux/httpconnect.go → pkg/util/tcpmux/httpconnect.go
Unescape Escape View File

@ -22,8 +22,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/utils/vhost" "github.com/fatedier/frp/pkg/util/vhost"
) )
type HTTPConnectTCPMuxer struct { type HTTPConnectTCPMuxer struct {

0
utils/util/http.go → pkg/util/util/http.go
Unescape Escape View File

0
utils/util/util.go → pkg/util/util/util.go
Unescape Escape View File

0
utils/util/util_test.go → pkg/util/util/util_test.go
Unescape Escape View File

0
utils/version/version.go → pkg/util/version/version.go
Unescape Escape View File

0
utils/version/version_test.go → pkg/util/version/version_test.go
Unescape Escape View File

4
utils/vhost/http.go → pkg/util/vhost/http.go
Unescape Escape View File

@ -25,8 +25,8 @@ import (
"strings" "strings"
"time" "time"
frpLog "github.com/fatedier/frp/utils/log" frpLog "github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/golib/pool" "github.com/fatedier/golib/pool"
) )

0
utils/vhost/https.go → pkg/util/vhost/https.go
Unescape Escape View File

4
utils/vhost/resource.go → pkg/util/vhost/resource.go
Unescape Escape View File

@ -19,8 +19,8 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
frpLog "github.com/fatedier/frp/utils/log" frpLog "github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/utils/version" "github.com/fatedier/frp/pkg/util/version"
) )
var ( var (

0
utils/vhost/reverseproxy.go → pkg/util/vhost/reverseproxy.go
Unescape Escape View File

0
utils/vhost/router.go → pkg/util/vhost/router.go
Unescape Escape View File

6
utils/vhost/vhost.go → pkg/util/vhost/vhost.go
Unescape Escape View File

@ -19,9 +19,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/pkg/util/log"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/utils/xlog" "github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/golib/errors" "github.com/fatedier/golib/errors"
) )

0
utils/xlog/ctx.go → pkg/util/xlog/ctx.go
Unescape Escape View File

2
utils/xlog/xlog.go → pkg/util/xlog/xlog.go
Unescape Escape View File

@ -15,7 +15,7 @@
package xlog package xlog
import ( import (
"github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/pkg/util/log"
) )
// Logger is not thread safety for operations on prefix // Logger is not thread safety for operations on prefix

18
server/control.go
Unescape Escape View File

@ -23,18 +23,18 @@ import (
"sync" "sync"
"time" "time"
"github.com/fatedier/frp/models/auth" "github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
frpErr "github.com/fatedier/frp/models/errors" frpErr "github.com/fatedier/frp/pkg/errors"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
plugin "github.com/fatedier/frp/models/plugin/server" plugin "github.com/fatedier/frp/pkg/plugin/server"
"github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/pkg/util/version"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/server/controller" "github.com/fatedier/frp/server/controller"
"github.com/fatedier/frp/server/metrics" "github.com/fatedier/frp/server/metrics"
"github.com/fatedier/frp/server/proxy" "github.com/fatedier/frp/server/proxy"
"github.com/fatedier/frp/utils/util"
"github.com/fatedier/frp/utils/version"
"github.com/fatedier/frp/utils/xlog"
"github.com/fatedier/golib/control/shutdown" "github.com/fatedier/golib/control/shutdown"
"github.com/fatedier/golib/crypto" "github.com/fatedier/golib/crypto"

8
server/controller/resource.go
Unescape Escape View File

@ -15,13 +15,13 @@
package controller package controller
import ( import (
"github.com/fatedier/frp/models/nathole" "github.com/fatedier/frp/pkg/nathole"
plugin "github.com/fatedier/frp/models/plugin/server" plugin "github.com/fatedier/frp/pkg/plugin/server"
"github.com/fatedier/frp/pkg/util/tcpmux"
"github.com/fatedier/frp/pkg/util/vhost"
"github.com/fatedier/frp/server/group" "github.com/fatedier/frp/server/group"
"github.com/fatedier/frp/server/ports" "github.com/fatedier/frp/server/ports"
"github.com/fatedier/frp/server/visitor" "github.com/fatedier/frp/server/visitor"
"github.com/fatedier/frp/utils/tcpmux"
"github.com/fatedier/frp/utils/vhost"
) )
// All resource managers and controllers // All resource managers and controllers

2
server/dashboard.go
Unescape Escape View File

@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/fatedier/frp/assets" "github.com/fatedier/frp/assets"
frpNet "github.com/fatedier/frp/utils/net" frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"

10
server/dashboard_api.go
Unescape Escape View File

@ -18,11 +18,11 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/models/metrics/mem" "github.com/fatedier/frp/pkg/metrics/mem"
"github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/utils/version" "github.com/fatedier/frp/pkg/util/version"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

2
server/group/http.go
Unescape Escape View File

@ -6,7 +6,7 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"github.com/fatedier/frp/utils/vhost" "github.com/fatedier/frp/pkg/util/vhost"
) )
type HTTPGroupController struct { type HTTPGroupController struct {

6
server/group/tcpmux.go
Unescape Escape View File

@ -20,9 +20,9 @@ import (
"net" "net"
"sync" "sync"
"github.com/fatedier/frp/models/consts" "github.com/fatedier/frp/pkg/consts"
"github.com/fatedier/frp/utils/tcpmux" "github.com/fatedier/frp/pkg/util/tcpmux"
"github.com/fatedier/frp/utils/vhost" "github.com/fatedier/frp/pkg/util/vhost"
gerr "github.com/fatedier/golib/errors" gerr "github.com/fatedier/golib/errors"
) )

8
server/proxy/http.go
Unescape Escape View File

@ -19,11 +19,11 @@ import (
"net" "net"
"strings" "strings"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/pkg/util/vhost"
"github.com/fatedier/frp/server/metrics" "github.com/fatedier/frp/server/metrics"
frpNet "github.com/fatedier/frp/utils/net"
"github.com/fatedier/frp/utils/util"
"github.com/fatedier/frp/utils/vhost"
frpIo "github.com/fatedier/golib/io" frpIo "github.com/fatedier/golib/io"
) )

6
server/proxy/https.go
Unescape Escape View File

@ -17,9 +17,9 @@ package proxy
import ( import (
"strings" "strings"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/utils/vhost" "github.com/fatedier/frp/pkg/util/vhost"
) )
type HTTPSProxy struct { type HTTPSProxy struct {

10
server/proxy/proxy.go
Unescape Escape View File

@ -22,13 +22,13 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/pkg/msg"
plugin "github.com/fatedier/frp/models/plugin/server" plugin "github.com/fatedier/frp/pkg/plugin/server"
frpNet "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/server/controller" "github.com/fatedier/frp/server/controller"
"github.com/fatedier/frp/server/metrics" "github.com/fatedier/frp/server/metrics"
frpNet "github.com/fatedier/frp/utils/net"
"github.com/fatedier/frp/utils/xlog"
frpIo "github.com/fatedier/golib/io" frpIo "github.com/fatedier/golib/io"
) )

2
server/proxy/stcp.go
Unescape Escape View File

@ -15,7 +15,7 @@
package proxy package proxy
import ( import (
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
) )
type STCPProxy struct { type STCPProxy struct {

2
server/proxy/sudp.go
Unescape Escape View File

@ -15,7 +15,7 @@
package proxy package proxy
import ( import (
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/pkg/config"
) )
type SUDPProxy struct { type SUDPProxy struct {

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save