cadey
/
route
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd/routed: alt-svc fix again

This commit is contained in:
Cadey Ratio 2018-01-03 11:12:21 -08:00
parent d63c627669
commit 7ea63913b9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/routed/main.go
View File

@ -87,6 +87,8 @@ func setupQuic(s *Server, scfg Config) {
}, },
} }
s.QuicServer = qs
for { for {
ln.FatalErr(context.Background(), qs.ListenAndServe()) ln.FatalErr(context.Background(), qs.ListenAndServe())
} }

6
cmd/routed/server.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"crypto/tls" "crypto/tls"
"errors" "errors"
"fmt"
"net" "net"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
@ -13,6 +12,7 @@ import (
"git.xeserv.us/xena/route/internal/tun2" "git.xeserv.us/xena/route/internal/tun2"
proto "git.xeserv.us/xena/route/proto" proto "git.xeserv.us/xena/route/proto"
"github.com/Xe/ln" "github.com/Xe/ln"
"github.com/lucas-clemente/quic-go/h2quic"
"github.com/mtneug/pkg/ulid" "github.com/mtneug/pkg/ulid"
kcp "github.com/xtaci/kcp-go" kcp "github.com/xtaci/kcp-go"
"golang.org/x/crypto/acme/autocert" "golang.org/x/crypto/acme/autocert"
@ -32,6 +32,8 @@ type Server struct {
db database.Storage db database.Storage
ts *tun2.Server ts *tun2.Server
QuicServer *h2quic.Server
*autocert.Manager *autocert.Manager
} }
@ -185,7 +187,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
rid := ulid.New().String() rid := ulid.New().String()
r.Header.Set("X-Request-Id", rid) r.Header.Set("X-Request-Id", rid)
w.Header().Set("X-Request-Id", rid) w.Header().Set("X-Request-Id", rid)
w.Header().Add("Alt-Svc", fmt.Sprintf(`hq="%s"; ma=2592000`, s.cfg.QuicAddr)) s.QuicServer.SetQuicHeaders(w.Header())
// http://www.gnuterrypratchett.com/ // http://www.gnuterrypratchett.com/
w.Header().Set("X-Clacks-Overhead", "GNU Ashlynn") w.Header().Set("X-Clacks-Overhead", "GNU Ashlynn")