derp/derpserver: split off derp.Server out of derp into its own package
This exports a number of things from the derp (generic + client) package to be used by the new derpserver package, as now used by cmd/derper. And then enough other misc changes to lock in that cmd/tailscaled can be configured to not bring in tailscale.com/client/local. (The webclient in particular, even when disabled, was bringing it in, so that's now fixed) Fixes #17257 Change-Id: I88b6c7958643fb54f386dd900bddf73d2d4d96d5 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
df747f1c1b
commit
21dc5f4e21
+2
-2
@@ -12,12 +12,12 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"tailscale.com/derp"
|
||||
"tailscale.com/derp/derpserver"
|
||||
"tailscale.com/net/connectproxy"
|
||||
)
|
||||
|
||||
// serveConnect handles a CONNECT request for ACE support.
|
||||
func serveConnect(s *derp.Server, w http.ResponseWriter, r *http.Request) {
|
||||
func serveConnect(s *derpserver.Server, w http.ResponseWriter, r *http.Request) {
|
||||
if !*flagACEEnabled {
|
||||
http.Error(w, "CONNECT not enabled", http.StatusForbidden)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user