starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-04-23 09:08:44 +02:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

derp: migrate to derpserver package API

Browse Source 
tailscale.com v1.94.0 moved derp.Server to the derpserver subpackage.
Update imports and type references accordingly.
This commit is contained in:
Kristoffer Dalby
2026-01-21 16:50:28 +00:00
parent 0565e01c2f
commit aa29fd95a3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hscontrol/derp/server/derp_server.go
View File

@@ -20,6 +20,7 @@ import (
"github.com/juanfont/headscale/hscontrol/util" "github.com/juanfont/headscale/hscontrol/util"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"tailscale.com/derp" "tailscale.com/derp"
"tailscale.com/derp/derpserver"
"tailscale.com/envknob" "tailscale.com/envknob"
"tailscale.com/net/stun" "tailscale.com/net/stun"
"tailscale.com/net/wsconn" "tailscale.com/net/wsconn"
@@ -45,7 +46,7 @@ type DERPServer struct {
serverURL string serverURL string
key key.NodePrivate key key.NodePrivate
cfg *types.DERPConfig cfg *types.DERPConfig
tailscaleDERP *derp.Server tailscaleDERP *derpserver.Server
} }
func NewDERPServer( func NewDERPServer(
@@ -54,7 +55,7 @@ func NewDERPServer(
cfg *types.DERPConfig, cfg *types.DERPConfig,
) (*DERPServer, error) { ) (*DERPServer, error) {
log.Trace().Caller().Msg("Creating new embedded DERP server") log.Trace().Caller().Msg("Creating new embedded DERP server")
server := derp.NewServer(derpKey, util.TSLogfWrapper()) // nolint // zerolinter complains server := derpserver.New(derpKey, util.TSLogfWrapper()) // nolint // zerolinter complains
if cfg.ServerVerifyClients { if cfg.ServerVerifyClients {
server.SetVerifyClientURL(DerpVerifyScheme + "://verify") server.SetVerifyClientURL(DerpVerifyScheme + "://verify")