rebrand: frp -> kanhole (kanhole server, kanholec client)
golangci-lint / lint (push) Failing after 1m5s

This commit is contained in:
kannn
2026-05-29 09:05:34 +00:00
Unverified
parent a0a42a4966
commit 2cd3052da1
265 changed files with 949 additions and 962 deletions
+4 -4
View File
@@ -17,10 +17,10 @@ package client
import (
"net/http"
adminapi "github.com/fatedier/frp/client/http"
"github.com/fatedier/frp/client/proxy"
httppkg "github.com/fatedier/frp/pkg/util/http"
netpkg "github.com/fatedier/frp/pkg/util/net"
adminapi "kanhole/client/http"
"kanhole/client/proxy"
httppkg "kanhole/pkg/util/http"
netpkg "kanhole/pkg/util/net"
)
func (svr *Service) registerRouteHandlers(helper *httppkg.RouterRegisterHelper) {
+7 -7
View File
@@ -6,13 +6,13 @@ import (
"os"
"time"
"github.com/fatedier/frp/client/configmgmt"
"github.com/fatedier/frp/client/proxy"
"github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/config/source"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/config/v1/validation"
"github.com/fatedier/frp/pkg/util/log"
"kanhole/client/configmgmt"
"kanhole/client/proxy"
"kanhole/pkg/config"
"kanhole/pkg/config/source"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/config/v1/validation"
"kanhole/pkg/util/log"
)
type serviceConfigManager struct {
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"
"github.com/fatedier/frp/client/configmgmt"
"github.com/fatedier/frp/pkg/config/source"
v1 "github.com/fatedier/frp/pkg/config/v1"
"kanhole/client/configmgmt"
"kanhole/pkg/config/source"
v1 "kanhole/pkg/config/v1"
)
func newTestRawTCPProxyConfig(name string) *v1.TCPProxyConfig {
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"errors"
"time"
"github.com/fatedier/frp/client/proxy"
v1 "github.com/fatedier/frp/pkg/config/v1"
"kanhole/client/proxy"
v1 "kanhole/pkg/config/v1"
)
var (
+6 -6
View File
@@ -28,12 +28,12 @@ import (
quic "github.com/quic-go/quic-go"
"github.com/samber/lo"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/proto/wire"
"github.com/fatedier/frp/pkg/transport"
netpkg "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/xlog"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/proto/wire"
"kanhole/pkg/transport"
netpkg "kanhole/pkg/util/net"
"kanhole/pkg/util/xlog"
)
// Connector is an interface for establishing connections to the server.
+10 -10
View File
@@ -20,16 +20,16 @@ import (
"sync/atomic"
"time"
"github.com/fatedier/frp/client/proxy"
"github.com/fatedier/frp/client/visitor"
"github.com/fatedier/frp/pkg/auth"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/naming"
"github.com/fatedier/frp/pkg/transport"
"github.com/fatedier/frp/pkg/util/wait"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/pkg/vnet"
"kanhole/client/proxy"
"kanhole/client/visitor"
"kanhole/pkg/auth"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/naming"
"kanhole/pkg/transport"
"kanhole/pkg/util/wait"
"kanhole/pkg/util/xlog"
"kanhole/pkg/vnet"
)
type SessionContext struct {
+7 -7
View File
@@ -26,13 +26,13 @@ import (
"github.com/samber/lo"
"github.com/fatedier/frp/pkg/auth"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/proto/wire"
netpkg "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/version"
"github.com/fatedier/frp/pkg/vnet"
"kanhole/pkg/auth"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/proto/wire"
netpkg "kanhole/pkg/util/net"
"kanhole/pkg/util/version"
"kanhole/pkg/vnet"
)
type controlSessionDialer struct {
+5 -5
View File
@@ -25,11 +25,11 @@ import (
"github.com/stretchr/testify/require"
"github.com/fatedier/frp/pkg/auth"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/proto/wire"
netpkg "github.com/fatedier/frp/pkg/util/net"
"kanhole/pkg/auth"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/proto/wire"
netpkg "kanhole/pkg/util/net"
)
type testConnector struct {
+1 -1
View File
@@ -3,7 +3,7 @@ package event
import (
"errors"
"github.com/fatedier/frp/pkg/msg"
"kanhole/pkg/msg"
)
var ErrPayloadType = errors.New("error payload type")
+5 -5
View File
@@ -1,4 +1,4 @@
//go:build frpc_gui
//go:build kanholec_gui
package gui
@@ -17,9 +17,9 @@ import (
"fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget"
"github.com/fatedier/frp/pkg/config"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/util/log"
"kanhole/pkg/config"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/util/log"
)
type App struct {
@@ -44,7 +44,7 @@ type App struct {
func New() *App {
a := &App{}
a.fyneApp = app.New()
a.window = a.fyneApp.NewWindow("frpc GUI")
a.window = a.fyneApp.NewWindow("kanholec GUI")
a.window.Resize(fyne.NewSize(850, 620))
a.window.SetMaster()
a.setupUI()
+2 -2
View File
@@ -24,8 +24,8 @@ import (
"strings"
"time"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/util/xlog"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/util/xlog"
)
var ErrHealthCheckType = errors.New("error health check type")
+5 -5
View File
@@ -24,11 +24,11 @@ import (
"strconv"
"time"
"github.com/fatedier/frp/client/configmgmt"
"github.com/fatedier/frp/client/http/model"
"github.com/fatedier/frp/client/proxy"
httppkg "github.com/fatedier/frp/pkg/util/http"
"github.com/fatedier/frp/pkg/util/jsonx"
"kanhole/client/configmgmt"
"kanhole/client/http/model"
"kanhole/client/proxy"
httppkg "kanhole/pkg/util/http"
"kanhole/pkg/util/jsonx"
)
// Controller handles HTTP API requests for frpc.
+5 -5
View File
@@ -12,11 +12,11 @@ import (
"github.com/gorilla/mux"
"github.com/fatedier/frp/client/configmgmt"
"github.com/fatedier/frp/client/http/model"
"github.com/fatedier/frp/client/proxy"
v1 "github.com/fatedier/frp/pkg/config/v1"
httppkg "github.com/fatedier/frp/pkg/util/http"
"kanhole/client/configmgmt"
"kanhole/client/http/model"
"kanhole/client/proxy"
v1 "kanhole/pkg/config/v1"
httppkg "kanhole/pkg/util/http"
)
type fakeConfigManager struct {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
v1 "github.com/fatedier/frp/pkg/config/v1"
v1 "kanhole/pkg/config/v1"
)
type ProxyDefinition struct {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
v1 "github.com/fatedier/frp/pkg/config/v1"
v1 "kanhole/pkg/config/v1"
)
type VisitorDefinition struct {
+1 -1
View File
@@ -17,7 +17,7 @@ package proxy
import (
"reflect"
v1 "github.com/fatedier/frp/pkg/config/v1"
v1 "kanhole/pkg/config/v1"
)
func init() {
+9 -9
View File
@@ -28,15 +28,15 @@ import (
libnet "github.com/fatedier/golib/net"
"golang.org/x/time/rate"
"github.com/fatedier/frp/pkg/config/types"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
plugin "github.com/fatedier/frp/pkg/plugin/client"
"github.com/fatedier/frp/pkg/transport"
"github.com/fatedier/frp/pkg/util/limit"
netpkg "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/pkg/vnet"
"kanhole/pkg/config/types"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
plugin "kanhole/pkg/plugin/client"
"kanhole/pkg/transport"
"kanhole/pkg/util/limit"
netpkg "kanhole/pkg/util/net"
"kanhole/pkg/util/xlog"
"kanhole/pkg/vnet"
)
var proxyFactoryRegistry = map[reflect.Type]func(*BaseProxy, v1.ProxyConfigurer) Proxy{}
+6 -6
View File
@@ -23,12 +23,12 @@ import (
"github.com/samber/lo"
"github.com/fatedier/frp/client/event"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/transport"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/pkg/vnet"
"kanhole/client/event"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/transport"
"kanhole/pkg/util/xlog"
"kanhole/pkg/vnet"
)
type Manager struct {
+8 -8
View File
@@ -25,14 +25,14 @@ import (
"github.com/fatedier/golib/errors"
"github.com/fatedier/frp/client/event"
"github.com/fatedier/frp/client/health"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/naming"
"github.com/fatedier/frp/pkg/transport"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/pkg/vnet"
"kanhole/client/event"
"kanhole/client/health"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/naming"
"kanhole/pkg/transport"
"kanhole/pkg/util/xlog"
"kanhole/pkg/vnet"
)
const (
+4 -4
View File
@@ -25,10 +25,10 @@ import (
"github.com/fatedier/golib/errors"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/proto/udp"
netpkg "github.com/fatedier/frp/pkg/util/net"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/proto/udp"
netpkg "kanhole/pkg/util/net"
)
func init() {
+4 -4
View File
@@ -24,10 +24,10 @@ import (
"github.com/fatedier/golib/errors"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/proto/udp"
netpkg "github.com/fatedier/frp/pkg/util/net"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/proto/udp"
netpkg "kanhole/pkg/util/net"
)
func init() {
+6 -6
View File
@@ -25,12 +25,12 @@ import (
fmux "github.com/hashicorp/yamux"
"github.com/quic-go/quic-go"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/naming"
"github.com/fatedier/frp/pkg/nathole"
"github.com/fatedier/frp/pkg/transport"
netpkg "github.com/fatedier/frp/pkg/util/net"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/naming"
"kanhole/pkg/nathole"
"kanhole/pkg/transport"
netpkg "kanhole/pkg/util/net"
)
func init() {
+2 -2
View File
@@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/proto/wire"
"kanhole/pkg/msg"
"kanhole/pkg/proto/wire"
)
func TestReadNatHoleSidUsesSelectedWireProtocol(t *testing.T) {
+13 -13
View File
@@ -28,19 +28,19 @@ import (
"github.com/fatedier/golib/crypto"
"github.com/samber/lo"
"github.com/fatedier/frp/client/proxy"
"github.com/fatedier/frp/pkg/auth"
"github.com/fatedier/frp/pkg/config"
"github.com/fatedier/frp/pkg/config/source"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/policy/security"
httppkg "github.com/fatedier/frp/pkg/util/http"
"github.com/fatedier/frp/pkg/util/log"
netpkg "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/wait"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/pkg/vnet"
"kanhole/client/proxy"
"kanhole/pkg/auth"
"kanhole/pkg/config"
"kanhole/pkg/config/source"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/policy/security"
httppkg "kanhole/pkg/util/http"
"kanhole/pkg/util/log"
netpkg "kanhole/pkg/util/net"
"kanhole/pkg/util/wait"
"kanhole/pkg/util/xlog"
"kanhole/pkg/vnet"
)
func init() {
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"github.com/samber/lo"
"github.com/fatedier/frp/pkg/config/source"
v1 "github.com/fatedier/frp/pkg/config/v1"
"kanhole/pkg/config/source"
v1 "kanhole/pkg/config/v1"
)
type failingConnector struct {
+2 -2
View File
@@ -20,8 +20,8 @@ import (
libio "github.com/fatedier/golib/io"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/util/xlog"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/util/xlog"
)
type STCPVisitor struct {
+5 -5
View File
@@ -23,11 +23,11 @@ import (
"github.com/fatedier/golib/errors"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/proto/udp"
netpkg "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/xlog"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/proto/udp"
netpkg "kanhole/pkg/util/net"
"kanhole/pkg/util/xlog"
)
type SUDPVisitor struct {
+9 -9
View File
@@ -24,15 +24,15 @@ import (
libio "github.com/fatedier/golib/io"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/naming"
plugin "github.com/fatedier/frp/pkg/plugin/visitor"
"github.com/fatedier/frp/pkg/transport"
netpkg "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/pkg/vnet"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/naming"
plugin "kanhole/pkg/plugin/visitor"
"kanhole/pkg/transport"
netpkg "kanhole/pkg/util/net"
"kanhole/pkg/util/util"
"kanhole/pkg/util/xlog"
"kanhole/pkg/vnet"
)
// Helper wraps some functions for visitor to use.
+5 -5
View File
@@ -24,11 +24,11 @@ import (
"github.com/samber/lo"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/transport"
"github.com/fatedier/frp/pkg/util/xlog"
"github.com/fatedier/frp/pkg/vnet"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/transport"
"kanhole/pkg/util/xlog"
"kanhole/pkg/vnet"
)
type Manager struct {
+8 -8
View File
@@ -29,14 +29,14 @@ import (
quic "github.com/quic-go/quic-go"
"golang.org/x/time/rate"
v1 "github.com/fatedier/frp/pkg/config/v1"
"github.com/fatedier/frp/pkg/msg"
"github.com/fatedier/frp/pkg/naming"
"github.com/fatedier/frp/pkg/nathole"
"github.com/fatedier/frp/pkg/transport"
netpkg "github.com/fatedier/frp/pkg/util/net"
"github.com/fatedier/frp/pkg/util/util"
"github.com/fatedier/frp/pkg/util/xlog"
v1 "kanhole/pkg/config/v1"
"kanhole/pkg/msg"
"kanhole/pkg/naming"
"kanhole/pkg/nathole"
"kanhole/pkg/transport"
netpkg "kanhole/pkg/util/net"
"kanhole/pkg/util/util"
"kanhole/pkg/util/xlog"
)
var ErrNoTunnelSession = errors.New("no tunnel session")