TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-24 01:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp/derpserver: clean up extraction of derp.Server (#17264)

Browse Source 
PR #17258 extracted `derp.Server` into `derp/derpserver.Server`.

This followup patch adds the following cleanups:
1. Rename `derp_server*.go` files to `derpserver*.go` to match
   the package name.
2. Rename the `derpserver.NewServer` constructor to `derpserver.New`
   to reduce stuttering.
3. Remove the unnecessary `derpserver.Conn` type alias.

Updates #17257
Updates #cleanup

Signed-off-by: Simon Law <sfllaw@tailscale.com>
This commit is contained in:
Simon Law
2025-09-24 10:38:30 -07:00
committed by GitHub
parent db02a46645
commit 34242df51b
12 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
derp/derp_test.go
View File

@@ -83,7 +83,7 @@ func TestClientInfoUnmarshal(t *testing.T) {
func TestSendRecv(t *testing.T) {
serverPrivateKey := key.NewNode()
s := derpserver.NewServer(serverPrivateKey, t.Logf)
s := derpserver.New(serverPrivateKey, t.Logf)
defer s.Close()
const numClients = 3
@@ -305,7 +305,7 @@ func TestSendRecv(t *testing.T) {
func TestSendFreeze(t *testing.T) {
serverPrivateKey := key.NewNode()
s := derpserver.NewServer(serverPrivateKey, t.Logf)
s := derpserver.New(serverPrivateKey, t.Logf)
defer s.Close()
s.WriteTimeout = 100 * time.Millisecond
@@ -549,7 +549,7 @@ const testMeshKey = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789a
func newTestServer(t *testing.T, ctx context.Context) *testServer {
t.Helper()
logf := logger.WithPrefix(t.Logf, "derp-server: ")
s := derpserver.NewServer(key.NewNode(), logf)
s := derpserver.New(key.NewNode(), logf)
s.SetMeshKey(testMeshKey)
ln, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {