Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
企猫商务
frp
提交
5763eb36
F
frp
项目概览
企猫商务
/
frp
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
frp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
5763eb36
编写于
9月 23, 2020
作者:
F
fatedier
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename models to pkg
上级
710ecf44
变更
111
展开全部
隐藏空白更改
内联
并排
Showing
111 changed file
with
196 addition
and
196 deletion
+196
-196
Makefile
Makefile
+2
-3
client/admin.go
client/admin.go
+1
-1
client/admin_api.go
client/admin_api.go
+2
-2
client/control.go
client/control.go
+6
-6
client/event/event.go
client/event/event.go
+1
-1
client/health/health.go
client/health/health.go
+1
-1
client/proxy/proxy.go
client/proxy/proxy.go
+7
-7
client/proxy/proxy_manager.go
client/proxy/proxy_manager.go
+3
-3
client/proxy/proxy_wrapper.go
client/proxy/proxy_wrapper.go
+3
-3
client/service.go
client/service.go
+8
-8
client/visitor.go
client/visitor.go
+6
-6
client/visitor_manager.go
client/visitor_manager.go
+2
-2
cmd/frpc/sub/http.go
cmd/frpc/sub/http.go
+3
-3
cmd/frpc/sub/https.go
cmd/frpc/sub/https.go
+2
-2
cmd/frpc/sub/reload.go
cmd/frpc/sub/reload.go
+2
-2
cmd/frpc/sub/root.go
cmd/frpc/sub/root.go
+6
-6
cmd/frpc/sub/status.go
cmd/frpc/sub/status.go
+3
-3
cmd/frpc/sub/stcp.go
cmd/frpc/sub/stcp.go
+3
-3
cmd/frpc/sub/sudp.go
cmd/frpc/sub/sudp.go
+3
-3
cmd/frpc/sub/tcp.go
cmd/frpc/sub/tcp.go
+2
-2
cmd/frpc/sub/tcpmux.go
cmd/frpc/sub/tcpmux.go
+2
-2
cmd/frpc/sub/udp.go
cmd/frpc/sub/udp.go
+3
-3
cmd/frpc/sub/xtcp.go
cmd/frpc/sub/xtcp.go
+3
-3
cmd/frps/main.go
cmd/frps/main.go
+1
-1
cmd/frps/root.go
cmd/frps/root.go
+7
-7
pkg/auth/auth.go
pkg/auth/auth.go
+2
-2
pkg/auth/oidc.go
pkg/auth/oidc.go
+1
-1
pkg/auth/token.go
pkg/auth/token.go
+2
-2
pkg/config/client_common.go
pkg/config/client_common.go
+2
-2
pkg/config/proxy.go
pkg/config/proxy.go
+3
-3
pkg/config/server_common.go
pkg/config/server_common.go
+4
-4
pkg/config/types.go
pkg/config/types.go
+0
-0
pkg/config/types_test.go
pkg/config/types_test.go
+0
-0
pkg/config/value.go
pkg/config/value.go
+0
-0
pkg/config/visitor.go
pkg/config/visitor.go
+1
-1
pkg/consts/consts.go
pkg/consts/consts.go
+0
-0
pkg/errors/errors.go
pkg/errors/errors.go
+0
-0
pkg/metrics/aggregate/server.go
pkg/metrics/aggregate/server.go
+2
-2
pkg/metrics/mem/server.go
pkg/metrics/mem/server.go
+2
-2
pkg/metrics/mem/types.go
pkg/metrics/mem/types.go
+1
-1
pkg/metrics/metrics.go
pkg/metrics/metrics.go
+1
-1
pkg/metrics/prometheus/server.go
pkg/metrics/prometheus/server.go
+0
-0
pkg/msg/ctl.go
pkg/msg/ctl.go
+0
-0
pkg/msg/msg.go
pkg/msg/msg.go
+0
-0
pkg/nathole/nathole.go
pkg/nathole/nathole.go
+3
-3
pkg/plugin/client/http2https.go
pkg/plugin/client/http2https.go
+1
-1
pkg/plugin/client/http_proxy.go
pkg/plugin/client/http_proxy.go
+1
-1
pkg/plugin/client/https2http.go
pkg/plugin/client/https2http.go
+1
-1
pkg/plugin/client/plugin.go
pkg/plugin/client/plugin.go
+0
-0
pkg/plugin/client/socks5.go
pkg/plugin/client/socks5.go
+1
-1
pkg/plugin/client/static_file.go
pkg/plugin/client/static_file.go
+1
-1
pkg/plugin/client/unix_domain_socket.go
pkg/plugin/client/unix_domain_socket.go
+0
-0
pkg/plugin/server/http.go
pkg/plugin/server/http.go
+0
-0
pkg/plugin/server/manager.go
pkg/plugin/server/manager.go
+2
-2
pkg/plugin/server/plugin.go
pkg/plugin/server/plugin.go
+0
-0
pkg/plugin/server/tracer.go
pkg/plugin/server/tracer.go
+0
-0
pkg/plugin/server/types.go
pkg/plugin/server/types.go
+1
-1
pkg/proto/udp/udp.go
pkg/proto/udp/udp.go
+1
-1
pkg/proto/udp/udp_test.go
pkg/proto/udp/udp_test.go
+0
-0
pkg/transport/tls.go
pkg/transport/tls.go
+0
-0
pkg/util/limit/reader.go
pkg/util/limit/reader.go
+0
-0
pkg/util/limit/writer.go
pkg/util/limit/writer.go
+0
-0
pkg/util/log/log.go
pkg/util/log/log.go
+0
-0
pkg/util/metric/counter.go
pkg/util/metric/counter.go
+0
-0
pkg/util/metric/counter_test.go
pkg/util/metric/counter_test.go
+0
-0
pkg/util/metric/date_counter.go
pkg/util/metric/date_counter.go
+0
-0
pkg/util/metric/date_counter_test.go
pkg/util/metric/date_counter_test.go
+0
-0
pkg/util/metric/metrics.go
pkg/util/metric/metrics.go
+0
-0
pkg/util/net/conn.go
pkg/util/net/conn.go
+2
-1
pkg/util/net/http.go
pkg/util/net/http.go
+0
-0
pkg/util/net/kcp.go
pkg/util/net/kcp.go
+0
-0
pkg/util/net/listener.go
pkg/util/net/listener.go
+0
-0
pkg/util/net/tls.go
pkg/util/net/tls.go
+0
-0
pkg/util/net/udp.go
pkg/util/net/udp.go
+0
-0
pkg/util/net/websocket.go
pkg/util/net/websocket.go
+0
-0
pkg/util/tcpmux/httpconnect.go
pkg/util/tcpmux/httpconnect.go
+2
-2
pkg/util/util/http.go
pkg/util/util/http.go
+0
-0
pkg/util/util/util.go
pkg/util/util/util.go
+0
-0
pkg/util/util/util_test.go
pkg/util/util/util_test.go
+0
-0
pkg/util/version/version.go
pkg/util/version/version.go
+0
-0
pkg/util/version/version_test.go
pkg/util/version/version_test.go
+0
-0
pkg/util/vhost/http.go
pkg/util/vhost/http.go
+2
-2
pkg/util/vhost/https.go
pkg/util/vhost/https.go
+0
-0
pkg/util/vhost/resource.go
pkg/util/vhost/resource.go
+2
-2
pkg/util/vhost/reverseproxy.go
pkg/util/vhost/reverseproxy.go
+0
-0
pkg/util/vhost/router.go
pkg/util/vhost/router.go
+0
-0
pkg/util/vhost/vhost.go
pkg/util/vhost/vhost.go
+3
-3
pkg/util/xlog/ctx.go
pkg/util/xlog/ctx.go
+0
-0
pkg/util/xlog/xlog.go
pkg/util/xlog/xlog.go
+1
-1
server/control.go
server/control.go
+9
-9
server/controller/resource.go
server/controller/resource.go
+4
-4
server/dashboard.go
server/dashboard.go
+1
-1
server/dashboard_api.go
server/dashboard_api.go
+5
-5
server/group/http.go
server/group/http.go
+1
-1
server/group/tcpmux.go
server/group/tcpmux.go
+3
-3
server/proxy/http.go
server/proxy/http.go
+4
-4
server/proxy/https.go
server/proxy/https.go
+3
-3
server/proxy/proxy.go
server/proxy/proxy.go
+5
-5
server/proxy/stcp.go
server/proxy/stcp.go
+1
-1
server/proxy/sudp.go
server/proxy/sudp.go
+1
-1
server/proxy/tcp.go
server/proxy/tcp.go
+1
-1
server/proxy/tcpmux.go
server/proxy/tcpmux.go
+4
-4
server/proxy/udp.go
server/proxy/udp.go
+4
-4
server/proxy/xtcp.go
server/proxy/xtcp.go
+2
-2
server/service.go
server/service.go
+14
-14
server/visitor/visitor.go
server/visitor/visitor.go
+2
-2
test/e2e/e2e.go
test/e2e/e2e.go
+1
-1
test/e2e/e2e_test.go
test/e2e/e2e_test.go
+1
-1
test/e2e/framework/process.go
test/e2e/framework/process.go
+1
-1
test/e2e/mock/echoserver/echoserver.go
test/e2e/mock/echoserver/echoserver.go
+1
-1
tests/mock/echo_server.go
tests/mock/echo_server.go
+1
-1
未找到文件。
Makefile
浏览文件 @
5763eb36
...
...
@@ -28,11 +28,10 @@ test: gotest
gotest
:
go
test
-v
--cover
./assets/...
go
test
-v
--cover
./client/...
go
test
-v
--cover
./cmd/...
go
test
-v
--cover
./
models
/...
go
test
-v
--cover
./
client
/...
go
test
-v
--cover
./server/...
go
test
-v
--cover
./
utils
/...
go
test
-v
--cover
./
pkg
/...
ci
:
go
test
-count
=
1
-p
=
1
-v
./tests/...
...
...
client/admin.go
浏览文件 @
5763eb36
...
...
@@ -21,7 +21,7 @@ import (
"time"
"github.com/fatedier/frp/assets"
frpNet
"github.com/fatedier/frp/
utils
/net"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
"github.com/gorilla/mux"
)
...
...
client/admin_api.go
浏览文件 @
5763eb36
...
...
@@ -23,8 +23,8 @@ import (
"strings"
"github.com/fatedier/frp/client/proxy"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
utils
/log"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg/util
/log"
)
type
GeneralResponse
struct
{
...
...
client/control.go
浏览文件 @
5763eb36
...
...
@@ -25,12 +25,12 @@ import (
"time"
"github.com/fatedier/frp/client/proxy"
"github.com/fatedier/frp/
models
/auth"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
models
/transport"
frpNet
"github.com/fatedier/frp/
utils
/net"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg
/auth"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/fatedier/frp/
pkg
/transport"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
"github.com/fatedier/frp/
pkg/util
/xlog"
"github.com/fatedier/golib/control/shutdown"
"github.com/fatedier/golib/crypto"
...
...
client/event/event.go
浏览文件 @
5763eb36
...
...
@@ -3,7 +3,7 @@ package event
import
(
"errors"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
pkg
/msg"
)
type
Type
int
...
...
client/health/health.go
浏览文件 @
5763eb36
...
...
@@ -24,7 +24,7 @@ import (
"net/http"
"time"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg/util
/xlog"
)
var
(
...
...
client/proxy/proxy.go
浏览文件 @
5763eb36
...
...
@@ -26,13 +26,13 @@ import (
"sync"
"time"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/msg"
plugin
"github.com/fatedier/frp/
models
/plugin/client"
"github.com/fatedier/frp/
models
/proto/udp"
"github.com/fatedier/frp/
utils
/limit"
frpNet
"github.com/fatedier/frp/
utils
/net"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/msg"
plugin
"github.com/fatedier/frp/
pkg
/plugin/client"
"github.com/fatedier/frp/
pkg
/proto/udp"
"github.com/fatedier/frp/
pkg/util
/limit"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
"github.com/fatedier/frp/
pkg/util
/xlog"
"github.com/fatedier/golib/errors"
frpIo
"github.com/fatedier/golib/io"
...
...
client/proxy/proxy_manager.go
浏览文件 @
5763eb36
...
...
@@ -7,9 +7,9 @@ import (
"sync"
"github.com/fatedier/frp/client/event"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/fatedier/frp/
pkg/util
/xlog"
"github.com/fatedier/golib/errors"
)
...
...
client/proxy/proxy_wrapper.go
浏览文件 @
5763eb36
...
...
@@ -10,9 +10,9 @@ import (
"github.com/fatedier/frp/client/event"
"github.com/fatedier/frp/client/health"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/fatedier/frp/
pkg/util
/xlog"
"github.com/fatedier/golib/errors"
)
...
...
client/service.go
浏览文件 @
5763eb36
...
...
@@ -18,7 +18,6 @@ import (
"context"
"crypto/tls"
"fmt"
"github.com/fatedier/frp/models/transport"
"io/ioutil"
"net"
"runtime"
...
...
@@ -27,13 +26,14 @@ import (
"time"
"github.com/fatedier/frp/assets"
"github.com/fatedier/frp/models/auth"
"github.com/fatedier/frp/models/config"
"github.com/fatedier/frp/models/msg"
"github.com/fatedier/frp/utils/log"
frpNet
"github.com/fatedier/frp/utils/net"
"github.com/fatedier/frp/utils/version"
"github.com/fatedier/frp/utils/xlog"
"github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/transport"
"github.com/fatedier/frp/pkg/util/log"
frpNet
"github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/version"
"github.com/fatedier/frp/pkg/util/xlog"
fmux
"github.com/hashicorp/yamux"
)
...
...
client/visitor.go
浏览文件 @
5763eb36
...
...
@@ -24,12 +24,12 @@ import (
"sync"
"time"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
models
/proto/udp"
frpNet
"github.com/fatedier/frp/
utils
/net"
"github.com/fatedier/frp/
utils
/util"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/fatedier/frp/
pkg
/proto/udp"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
"github.com/fatedier/frp/
pkg/util
/util"
"github.com/fatedier/frp/
pkg/util
/xlog"
"github.com/fatedier/golib/errors"
frpIo
"github.com/fatedier/golib/io"
...
...
client/visitor_manager.go
浏览文件 @
5763eb36
...
...
@@ -19,8 +19,8 @@ import (
"sync"
"time"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg/util
/xlog"
)
type
VisitorManager
struct
{
...
...
cmd/frpc/sub/http.go
浏览文件 @
5763eb36
...
...
@@ -19,10 +19,10 @@ import (
"os"
"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/fatedier/frp/models/consts"
"github.com/spf13/cobra"
)
func
init
()
{
...
...
cmd/frpc/sub/https.go
浏览文件 @
5763eb36
...
...
@@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/consts"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/consts"
)
func
init
()
{
...
...
cmd/frpc/sub/reload.go
浏览文件 @
5763eb36
...
...
@@ -22,9 +22,9 @@ import (
"os"
"strings"
"github.com/
spf13/cobra
"
"github.com/
fatedier/frp/pkg/config
"
"github.com/
fatedier/frp/models/config
"
"github.com/
spf13/cobra
"
)
func
init
()
{
...
...
cmd/frpc/sub/root.go
浏览文件 @
5763eb36
...
...
@@ -25,13 +25,13 @@ import (
"syscall"
"time"
"github.com/spf13/cobra"
"github.com/fatedier/frp/client"
"github.com/fatedier/frp/models/auth"
"github.com/fatedier/frp/models/config"
"github.com/fatedier/frp/utils/log"
"github.com/fatedier/frp/utils/version"
"github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/pkg/util/version"
"github.com/spf13/cobra"
)
const
(
...
...
cmd/frpc/sub/status.go
浏览文件 @
5763eb36
...
...
@@ -23,11 +23,11 @@ import (
"os"
"strings"
"github.com/fatedier/frp/client"
"github.com/fatedier/frp/pkg/config"
"github.com/rodaine/table"
"github.com/spf13/cobra"
"github.com/fatedier/frp/client"
"github.com/fatedier/frp/models/config"
)
func
init
()
{
...
...
cmd/frpc/sub/stcp.go
浏览文件 @
5763eb36
...
...
@@ -18,10 +18,10 @@ import (
"fmt"
"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/fatedier/frp/models/consts"
"github.com/spf13/cobra"
)
func
init
()
{
...
...
cmd/frpc/sub/sudp.go
浏览文件 @
5763eb36
...
...
@@ -18,10 +18,10 @@ import (
"fmt"
"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/fatedier/frp/models/consts"
"github.com/spf13/cobra"
)
func
init
()
{
...
...
cmd/frpc/sub/tcp.go
浏览文件 @
5763eb36
...
...
@@ -20,8 +20,8 @@ import (
"github.com/spf13/cobra"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/consts"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/consts"
)
func
init
()
{
...
...
cmd/frpc/sub/tcpmux.go
浏览文件 @
5763eb36
...
...
@@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/consts"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/consts"
)
func
init
()
{
...
...
cmd/frpc/sub/udp.go
浏览文件 @
5763eb36
...
...
@@ -18,10 +18,10 @@ import (
"fmt"
"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/fatedier/frp/models/consts"
"github.com/spf13/cobra"
)
func
init
()
{
...
...
cmd/frpc/sub/xtcp.go
浏览文件 @
5763eb36
...
...
@@ -18,10 +18,10 @@ import (
"fmt"
"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/fatedier/frp/models/consts"
"github.com/spf13/cobra"
)
func
init
()
{
...
...
cmd/frps/main.go
浏览文件 @
5763eb36
...
...
@@ -21,7 +21,7 @@ import (
"github.com/fatedier/golib/crypto"
_
"github.com/fatedier/frp/assets/frps/statik"
_
"github.com/fatedier/frp/
models
/metrics"
_
"github.com/fatedier/frp/
pkg
/metrics"
)
func
main
()
{
...
...
cmd/frps/root.go
浏览文件 @
5763eb36
...
...
@@ -18,14 +18,14 @@ import (
"fmt"
"os"
"github.com/spf13/cobra"
"github.com/fatedier/frp/models/auth"
"github.com/fatedier/frp/models/config"
"github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/pkg/util/version"
"github.com/fatedier/frp/server"
"github.com/fatedier/frp/utils/log"
"github.com/fatedier/frp/utils/util"
"github.com/fatedier/frp/utils/version"
"github.com/spf13/cobra"
)
const
(
...
...
models
/auth/auth.go
→
pkg
/auth/auth.go
浏览文件 @
5763eb36
...
...
@@ -17,8 +17,8 @@ package auth
import
(
"fmt"
"github.com/fatedier/frp/
models
/consts"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
pkg
/consts"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/vaughan0/go-ini"
)
...
...
models
/auth/oidc.go
→
pkg
/auth/oidc.go
浏览文件 @
5763eb36
...
...
@@ -18,7 +18,7 @@ import (
"context"
"fmt"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/coreos/go-oidc"
"github.com/vaughan0/go-ini"
...
...
models
/auth/token.go
→
pkg
/auth/token.go
浏览文件 @
5763eb36
...
...
@@ -18,8 +18,8 @@ import (
"fmt"
"time"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
utils
/util"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/fatedier/frp/
pkg/util
/util"
"github.com/vaughan0/go-ini"
)
...
...
models
/config/client_common.go
→
pkg
/config/client_common.go
浏览文件 @
5763eb36
...
...
@@ -20,9 +20,9 @@ import (
"strconv"
"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
...
...
models
/config/proxy.go
→
pkg
/config/proxy.go
浏览文件 @
5763eb36
...
...
@@ -20,9 +20,9 @@ import (
"strconv"
"strings"
"github.com/fatedier/frp/
models
/consts"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
utils
/util"
"github.com/fatedier/frp/
pkg
/consts"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/fatedier/frp/
pkg/util
/util"
ini
"github.com/vaughan0/go-ini"
)
...
...
models
/config/server_common.go
→
pkg
/config/server_common.go
浏览文件 @
5763eb36
...
...
@@ -19,11 +19,11 @@ import (
"strconv"
"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"
plugin
"github.com/fatedier/frp/models/plugin/server"
"github.com/fatedier/frp/utils/util"
ini
"github.com/vaughan0/go-ini"
)
// ServerCommonConf contains information for a server service. It is
...
...
models
/config/types.go
→
pkg
/config/types.go
浏览文件 @
5763eb36
文件已移动
models
/config/types_test.go
→
pkg
/config/types_test.go
浏览文件 @
5763eb36
文件已移动
models
/config/value.go
→
pkg
/config/value.go
浏览文件 @
5763eb36
文件已移动
models
/config/visitor.go
→
pkg
/config/visitor.go
浏览文件 @
5763eb36
...
...
@@ -19,7 +19,7 @@ import (
"reflect"
"strconv"
"github.com/fatedier/frp/
models
/consts"
"github.com/fatedier/frp/
pkg
/consts"
ini
"github.com/vaughan0/go-ini"
)
...
...
models
/consts/consts.go
→
pkg
/consts/consts.go
浏览文件 @
5763eb36
文件已移动
models
/errors/errors.go
→
pkg
/errors/errors.go
浏览文件 @
5763eb36
文件已移动
models
/metrics/aggregate/server.go
→
pkg
/metrics/aggregate/server.go
浏览文件 @
5763eb36
...
...
@@ -15,8 +15,8 @@
package
aggregate
import
(
"github.com/fatedier/frp/
models
/metrics/mem"
"github.com/fatedier/frp/
models
/metrics/prometheus"
"github.com/fatedier/frp/
pkg
/metrics/mem"
"github.com/fatedier/frp/
pkg
/metrics/prometheus"
"github.com/fatedier/frp/server/metrics"
)
...
...
models
/metrics/mem/server.go
→
pkg
/metrics/mem/server.go
浏览文件 @
5763eb36
...
...
@@ -18,9 +18,9 @@ import (
"sync"
"time"
"github.com/fatedier/frp/pkg/util/log"
"github.com/fatedier/frp/pkg/util/metric"
server
"github.com/fatedier/frp/server/metrics"
"github.com/fatedier/frp/utils/log"
"github.com/fatedier/frp/utils/metric"
)
var
sm
*
serverMetrics
=
newServerMetrics
()
...
...
models
/metrics/mem/types.go
→
pkg
/metrics/mem/types.go
浏览文件 @
5763eb36
...
...
@@ -17,7 +17,7 @@ package mem
import
(
"time"
"github.com/fatedier/frp/
utils
/metric"
"github.com/fatedier/frp/
pkg/util
/metric"
)
const
(
...
...
models
/metrics/metrics.go
→
pkg
/metrics/metrics.go
浏览文件 @
5763eb36
package
metrics
import
(
"github.com/fatedier/frp/
models
/metrics/aggregate"
"github.com/fatedier/frp/
pkg
/metrics/aggregate"
)
var
EnableMem
=
aggregate
.
EnableMem
...
...
models
/metrics/prometheus/server.go
→
pkg
/metrics/prometheus/server.go
浏览文件 @
5763eb36
文件已移动
models
/msg/ctl.go
→
pkg
/msg/ctl.go
浏览文件 @
5763eb36
文件已移动
models
/msg/msg.go
→
pkg
/msg/msg.go
浏览文件 @
5763eb36
文件已移动
models
/nathole/nathole.go
→
pkg
/nathole/nathole.go
浏览文件 @
5763eb36
...
...
@@ -7,9 +7,9 @@ import (
"sync"
"time"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
utils
/log"
"github.com/fatedier/frp/
utils
/util"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/fatedier/frp/
pkg/util
/log"
"github.com/fatedier/frp/
pkg/util
/util"
"github.com/fatedier/golib/errors"
"github.com/fatedier/golib/pool"
...
...
models
/plugin/client/http2https.go
→
pkg
/plugin/client/http2https.go
浏览文件 @
5763eb36
...
...
@@ -23,7 +23,7 @@ import (
"net/http/httputil"
"strings"
frpNet
"github.com/fatedier/frp/
utils
/net"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
)
const
PluginHTTP2HTTPS
=
"http2https"
...
...
models
/plugin/client/http_proxy.go
→
pkg
/plugin/client/http_proxy.go
浏览文件 @
5763eb36
...
...
@@ -22,7 +22,7 @@ import (
"net/http"
"strings"
frpNet
"github.com/fatedier/frp/
utils
/net"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
frpIo
"github.com/fatedier/golib/io"
gnet
"github.com/fatedier/golib/net"
...
...
models
/plugin/client/https2http.go
→
pkg
/plugin/client/https2http.go
浏览文件 @
5763eb36
...
...
@@ -23,7 +23,7 @@ import (
"net/http/httputil"
"strings"
frpNet
"github.com/fatedier/frp/
utils
/net"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
)
const
PluginHTTPS2HTTP
=
"https2http"
...
...
models
/plugin/client/plugin.go
→
pkg
/plugin/client/plugin.go
浏览文件 @
5763eb36
文件已移动
models
/plugin/client/socks5.go
→
pkg
/plugin/client/socks5.go
浏览文件 @
5763eb36
...
...
@@ -20,7 +20,7 @@ import (
"log"
"net"
frpNet
"github.com/fatedier/frp/
utils
/net"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
gosocks5
"github.com/armon/go-socks5"
)
...
...
models
/plugin/client/static_file.go
→
pkg
/plugin/client/static_file.go
浏览文件 @
5763eb36
...
...
@@ -19,7 +19,7 @@ import (
"net"
"net/http"
frpNet
"github.com/fatedier/frp/
utils
/net"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
"github.com/gorilla/mux"
)
...
...
models
/plugin/client/unix_domain_socket.go
→
pkg
/plugin/client/unix_domain_socket.go
浏览文件 @
5763eb36
文件已移动
models
/plugin/server/http.go
→
pkg
/plugin/server/http.go
浏览文件 @
5763eb36
文件已移动
models
/plugin/server/manager.go
→
pkg
/plugin/server/manager.go
浏览文件 @
5763eb36
...
...
@@ -19,8 +19,8 @@ import (
"errors"
"fmt"
"github.com/fatedier/frp/
utils
/util"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg/util
/util"
"github.com/fatedier/frp/
pkg/util
/xlog"
)
type
Manager
struct
{
...
...
models
/plugin/server/plugin.go
→
pkg
/plugin/server/plugin.go
浏览文件 @
5763eb36
文件已移动
models
/plugin/server/tracer.go
→
pkg
/plugin/server/tracer.go
浏览文件 @
5763eb36
文件已移动
models
/plugin/server/types.go
→
pkg
/plugin/server/types.go
浏览文件 @
5763eb36
...
...
@@ -15,7 +15,7 @@
package
plugin
import
(
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
pkg
/msg"
)
type
Request
struct
{
...
...
models
/proto/udp/udp.go
→
pkg
/proto/udp/udp.go
浏览文件 @
5763eb36
...
...
@@ -20,7 +20,7 @@ import (
"sync"
"time"
"github.com/fatedier/frp/
models
/msg"
"github.com/fatedier/frp/
pkg
/msg"
"github.com/fatedier/golib/errors"
"github.com/fatedier/golib/pool"
...
...
models
/proto/udp/udp_test.go
→
pkg
/proto/udp/udp_test.go
浏览文件 @
5763eb36
文件已移动
models
/transport/tls.go
→
pkg
/transport/tls.go
浏览文件 @
5763eb36
文件已移动
utils
/limit/reader.go
→
pkg/util
/limit/reader.go
浏览文件 @
5763eb36
文件已移动
utils
/limit/writer.go
→
pkg/util
/limit/writer.go
浏览文件 @
5763eb36
文件已移动
utils
/log/log.go
→
pkg/util
/log/log.go
浏览文件 @
5763eb36
文件已移动
utils
/metric/counter.go
→
pkg/util
/metric/counter.go
浏览文件 @
5763eb36
文件已移动
utils
/metric/counter_test.go
→
pkg/util
/metric/counter_test.go
浏览文件 @
5763eb36
文件已移动
utils
/metric/date_counter.go
→
pkg/util
/metric/date_counter.go
浏览文件 @
5763eb36
文件已移动
utils
/metric/date_counter_test.go
→
pkg/util
/metric/date_counter_test.go
浏览文件 @
5763eb36
文件已移动
utils
/metric/metrics.go
→
pkg/util
/metric/metrics.go
浏览文件 @
5763eb36
文件已移动
utils
/net/conn.go
→
pkg/util
/net/conn.go
浏览文件 @
5763eb36
...
...
@@ -24,7 +24,8 @@ import (
"sync/atomic"
"time"
"github.com/fatedier/frp/utils/xlog"
"github.com/fatedier/frp/pkg/util/xlog"
gnet
"github.com/fatedier/golib/net"
kcp
"github.com/fatedier/kcp-go"
)
...
...
utils
/net/http.go
→
pkg/util
/net/http.go
浏览文件 @
5763eb36
文件已移动
utils
/net/kcp.go
→
pkg/util
/net/kcp.go
浏览文件 @
5763eb36
文件已移动
utils
/net/listener.go
→
pkg/util
/net/listener.go
浏览文件 @
5763eb36
文件已移动
utils
/net/tls.go
→
pkg/util
/net/tls.go
浏览文件 @
5763eb36
文件已移动
utils
/net/udp.go
→
pkg/util
/net/udp.go
浏览文件 @
5763eb36
文件已移动
utils
/net/websocket.go
→
pkg/util
/net/websocket.go
浏览文件 @
5763eb36
文件已移动
utils
/tcpmux/httpconnect.go
→
pkg/util
/tcpmux/httpconnect.go
浏览文件 @
5763eb36
...
...
@@ -22,8 +22,8 @@ import (
"net/http"
"time"
"github.com/fatedier/frp/
utils
/util"
"github.com/fatedier/frp/
utils
/vhost"
"github.com/fatedier/frp/
pkg/util
/util"
"github.com/fatedier/frp/
pkg/util
/vhost"
)
type
HTTPConnectTCPMuxer
struct
{
...
...
utils
/util/http.go
→
pkg/util
/util/http.go
浏览文件 @
5763eb36
文件已移动
utils
/util/util.go
→
pkg/util
/util/util.go
浏览文件 @
5763eb36
文件已移动
utils
/util/util_test.go
→
pkg/util
/util/util_test.go
浏览文件 @
5763eb36
文件已移动
utils
/version/version.go
→
pkg/util
/version/version.go
浏览文件 @
5763eb36
文件已移动
utils
/version/version_test.go
→
pkg/util
/version/version_test.go
浏览文件 @
5763eb36
文件已移动
utils
/vhost/http.go
→
pkg/util
/vhost/http.go
浏览文件 @
5763eb36
...
...
@@ -25,8 +25,8 @@ import (
"strings"
"time"
frpLog
"github.com/fatedier/frp/
utils
/log"
"github.com/fatedier/frp/
utils
/util"
frpLog
"github.com/fatedier/frp/
pkg/util
/log"
"github.com/fatedier/frp/
pkg/util
/util"
"github.com/fatedier/golib/pool"
)
...
...
utils
/vhost/https.go
→
pkg/util
/vhost/https.go
浏览文件 @
5763eb36
文件已移动
utils
/vhost/resource.go
→
pkg/util
/vhost/resource.go
浏览文件 @
5763eb36
...
...
@@ -19,8 +19,8 @@ import (
"io/ioutil"
"net/http"
frpLog
"github.com/fatedier/frp/
utils
/log"
"github.com/fatedier/frp/
utils
/version"
frpLog
"github.com/fatedier/frp/
pkg/util
/log"
"github.com/fatedier/frp/
pkg/util
/version"
)
var
(
...
...
utils
/vhost/reverseproxy.go
→
pkg/util
/vhost/reverseproxy.go
浏览文件 @
5763eb36
文件已移动
utils
/vhost/router.go
→
pkg/util
/vhost/router.go
浏览文件 @
5763eb36
文件已移动
utils
/vhost/vhost.go
→
pkg/util
/vhost/vhost.go
浏览文件 @
5763eb36
...
...
@@ -19,9 +19,9 @@ import (
"strings"
"time"
"github.com/fatedier/frp/
utils
/log"
frpNet
"github.com/fatedier/frp/
utils
/net"
"github.com/fatedier/frp/
utils
/xlog"
"github.com/fatedier/frp/
pkg/util
/log"
frpNet
"github.com/fatedier/frp/
pkg/util
/net"
"github.com/fatedier/frp/
pkg/util
/xlog"
"github.com/fatedier/golib/errors"
)
...
...
utils
/xlog/ctx.go
→
pkg/util
/xlog/ctx.go
浏览文件 @
5763eb36
文件已移动
utils
/xlog/xlog.go
→
pkg/util
/xlog/xlog.go
浏览文件 @
5763eb36
...
...
@@ -15,7 +15,7 @@
package
xlog
import
(
"github.com/fatedier/frp/
utils
/log"
"github.com/fatedier/frp/
pkg/util
/log"
)
// Logger is not thread safety for operations on prefix
...
...
server/control.go
浏览文件 @
5763eb36
...
...
@@ -23,18 +23,18 @@ import (
"sync"
"time"
"github.com/fatedier/frp/models/auth"
"github.com/fatedier/frp/models/config"
"github.com/fatedier/frp/models/consts"
frpErr
"github.com/fatedier/frp/models/errors"
"github.com/fatedier/frp/models/msg"
plugin
"github.com/fatedier/frp/models/plugin/server"
"github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/consts"
frpErr
"github.com/fatedier/frp/pkg/errors"
"github.com/fatedier/frp/pkg/msg"
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/metrics"
"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/crypto"
...
...
server/controller/resource.go
浏览文件 @
5763eb36
...
...
@@ -15,13 +15,13 @@
package
controller
import
(
"github.com/fatedier/frp/models/nathole"
plugin
"github.com/fatedier/frp/models/plugin/server"
"github.com/fatedier/frp/pkg/nathole"
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/ports"
"github.com/fatedier/frp/server/visitor"
"github.com/fatedier/frp/utils/tcpmux"
"github.com/fatedier/frp/utils/vhost"
)
// All resource managers and controllers
...
...
server/dashboard.go
浏览文件 @
5763eb36
...
...
@@ -21,7 +21,7 @@ import (
"time"
"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/prometheus/client_golang/prometheus/promhttp"
...
...
server/dashboard_api.go
浏览文件 @
5763eb36
...
...
@@ -18,11 +18,11 @@ import (
"encoding/json"
"net/http"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
models
/consts"
"github.com/fatedier/frp/
models
/metrics/mem"
"github.com/fatedier/frp/
utils
/log"
"github.com/fatedier/frp/
utils
/version"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg
/consts"
"github.com/fatedier/frp/
pkg
/metrics/mem"
"github.com/fatedier/frp/
pkg/util
/log"
"github.com/fatedier/frp/
pkg/util
/version"
"github.com/gorilla/mux"
)
...
...
server/group/http.go
浏览文件 @
5763eb36
...
...
@@ -6,7 +6,7 @@ import (
"sync"
"sync/atomic"
"github.com/fatedier/frp/
utils
/vhost"
"github.com/fatedier/frp/
pkg/util
/vhost"
)
type
HTTPGroupController
struct
{
...
...
server/group/tcpmux.go
浏览文件 @
5763eb36
...
...
@@ -20,9 +20,9 @@ import (
"net"
"sync"
"github.com/fatedier/frp/
models
/consts"
"github.com/fatedier/frp/
utils
/tcpmux"
"github.com/fatedier/frp/
utils
/vhost"
"github.com/fatedier/frp/
pkg
/consts"
"github.com/fatedier/frp/
pkg/util
/tcpmux"
"github.com/fatedier/frp/
pkg/util
/vhost"
gerr
"github.com/fatedier/golib/errors"
)
...
...
server/proxy/http.go
浏览文件 @
5763eb36
...
...
@@ -19,11 +19,11 @@ import (
"net"
"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"
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"
)
...
...
server/proxy/https.go
浏览文件 @
5763eb36
...
...
@@ -17,9 +17,9 @@ package proxy
import
(
"strings"
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
utils
/util"
"github.com/fatedier/frp/
utils
/vhost"
"github.com/fatedier/frp/
pkg
/config"
"github.com/fatedier/frp/
pkg/util
/util"
"github.com/fatedier/frp/
pkg/util
/vhost"
)
type
HTTPSProxy
struct
{
...
...
server/proxy/proxy.go
浏览文件 @
5763eb36
...
...
@@ -22,13 +22,13 @@ import (
"strconv"
"sync"
"github.com/fatedier/frp/models/config"
"github.com/fatedier/frp/models/msg"
plugin
"github.com/fatedier/frp/models/plugin/server"
"github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/msg"
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/metrics"
frpNet
"github.com/fatedier/frp/utils/net"
"github.com/fatedier/frp/utils/xlog"
frpIo
"github.com/fatedier/golib/io"
)
...
...
server/proxy/stcp.go
浏览文件 @
5763eb36
...
...
@@ -15,7 +15,7 @@
package
proxy
import
(
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
pkg
/config"
)
type
STCPProxy
struct
{
...
...
server/proxy/sudp.go
浏览文件 @
5763eb36
...
...
@@ -15,7 +15,7 @@
package
proxy
import
(
"github.com/fatedier/frp/
models
/config"
"github.com/fatedier/frp/
pkg
/config"
)
type
SUDPProxy
struct
{
...
...
server/proxy/tcp.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
server/proxy/tcpmux.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
server/proxy/udp.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
server/proxy/xtcp.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
server/service.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
server/visitor/visitor.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
test/e2e/e2e.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
test/e2e/e2e_test.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
test/e2e/framework/process.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
test/e2e/mock/echoserver/echoserver.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
tests/mock/echo_server.go
浏览文件 @
5763eb36
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录