refact: rename wireguard to overlay
Lee Yunjin committed
Apr 9, 2026 at 20:33 UTC
7d7a209cf8e279e72099b512c13d1d9ea5251714
4 files changed
+10
-10
cmd/relay-server/main.go
+2
-2
@@ -14,7 +14,7 @@ import (
14
15
"github.com/gosuda/portal-tunnel/v2/portal"
16
"github.com/gosuda/portal-tunnel/v2/portal/acme"
17
- "github.com/gosuda/portal-tunnel/v2/portal/wireguard"
17
+ "github.com/gosuda/portal-tunnel/v2/portal/overlay"
18
"github.com/gosuda/portal-tunnel/v2/types"
19
"github.com/gosuda/portal-tunnel/v2/utils"
20
)
@@ -69,7 +69,7 @@ func runServeCommand(args []string) error {
69
utils.StringFlagEnv(fs, &cfg.IdentityPath, "identity-path", "./.portal-certs", "directory path for relay identity, admin state, and keyless materials", "IDENTITY_PATH")
70
utils.StringFlagEnv(fs, &cfg.Bootstraps, "bootstraps", "", "additional bootstrap relay API URLs used for discovery expansion", "BOOTSTRAPS")
71
utils.BoolFlagEnv(fs, &cfg.DiscoveryEnabled, "discovery", false, "serve relay discovery endpoints and poll discovery peers", "DISCOVERY")
72
- utils.IntFlagEnv(fs, &cfg.WireGuardPort, "wireguard-port", wireguard.DefaultListenPort, utils.ParsePortNumber, "public and listen UDP port for relay overlay", "WIREGUARD_PORT")
72
+ utils.IntFlagEnv(fs, &cfg.WireGuardPort, "wireguard-port", overlay.DefaultListenPort, utils.ParsePortNumber, "public and listen UDP port for relay overlay", "WIREGUARD_PORT")
73
74
utils.IntFlagEnv(fs, &cfg.APIPort, "api-port", 4017, utils.ParsePortNumber, "Admin/API server port", "API_PORT")
75
utils.IntFlagEnv(fs, &cfg.SNIPort, "sni-port", 443, utils.ParsePortNumber, "TCP SNI router port number", "SNI_PORT")
portal/overlay/overlay.go
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package wireguard
1
+package overlay
2
3
import (
4
"context"
portal/overlay/stack.go
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package wireguard
1
+package overlay
2
3
import (
4
"context"
portal/server.go
+6
-6
@@ -21,9 +21,9 @@ import (
21
"github.com/gosuda/portal-tunnel/v2/portal/acme"
22
"github.com/gosuda/portal-tunnel/v2/portal/discovery"
23
"github.com/gosuda/portal-tunnel/v2/portal/keyless"
24
+ "github.com/gosuda/portal-tunnel/v2/portal/overlay"
25
"github.com/gosuda/portal-tunnel/v2/portal/policy"
26
"github.com/gosuda/portal-tunnel/v2/portal/transport"
26
- "github.com/gosuda/portal-tunnel/v2/portal/wireguard"
27
"github.com/gosuda/portal-tunnel/v2/types"
28
"github.com/gosuda/portal-tunnel/v2/utils"
29
)
@@ -117,7 +117,7 @@ type Server struct {
117
apiTLSClose io.Closer
118
quicTunnel *quic.Listener
119
120
- overlay *wireguard.Overlay
120
+ overlay *overlay.Overlay
121
relaySet *discovery.RelaySet
122
registry *leaseRegistry
123
udpPorts *transport.PortAllocator
@@ -171,7 +171,7 @@ func (s *Server) Start(ctx context.Context, apiMux *http.ServeMux) error {
171
var sniListener net.Listener
172
var apiServer *http.Server
173
var apiCloser io.Closer
174
- var overlay *wireguard.Overlay
174
+ var overlay *overlay.Overlay
175
var quicTunnel *quic.Listener
176
defer func() {
177
if started {
@@ -597,7 +597,7 @@ func (s *Server) runQUICTunnelListener() error {
597
}
598
}
599
600
-func (s *Server) startOverlay() (*wireguard.Overlay, error) {
600
+func (s *Server) startOverlay() (*overlay.Overlay, error) {
601
peerMux := http.NewServeMux()
602
peerMux.HandleFunc(types.PathRoot, s.handleRoot)
603
peerMux.HandleFunc(types.PathHealthz, s.handleHealthz)
@@ -605,10 +605,10 @@ func (s *Server) startOverlay() (*wireguard.Overlay, error) {
605
peerMux.HandleFunc(types.PathDiscovery, s.handleRelayDiscovery)
606
}
607
608
- overlay, err := wireguard.NewOverlay(s.identity.Name, wireguard.Config{
608
+ overlay, err := overlay.NewOverlay(s.identity.Name, overlay.Config{
609
PrivateKey: s.identity.WireGuardPrivateKey,
610
PublicKey: s.identity.WireGuardPublicKey,
611
- Endpoint: net.JoinHostPort(s.identity.Name, fmt.Sprintf("%d", utils.IntOrDefault(s.cfg.WireGuardPort, wireguard.DefaultListenPort))),
611
+ Endpoint: net.JoinHostPort(s.identity.Name, fmt.Sprintf("%d", utils.IntOrDefault(s.cfg.WireGuardPort, overlay.DefaultListenPort))),
612
}, peerMux)
613
if err != nil {
614
return nil, fmt.Errorf("start wireguard overlay: %w", err)