Go back to upstream webtransport-go (#655)

Doridian · Dec 6, 2024 · 821cffe · 821cffe
1 parent 0aef106
commit 821cffe
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/client/connectors/webtransport.go b/client/connectors/webtransport.go
@@ -6,9 +6,9 @@ import (
 	"errors"
 	"net"
 
-	"github.com/Doridian/webtransport-go"
 	"github.com/Doridian/wsvpn/shared/sockets/adapters"
 	"github.com/quic-go/quic-go"
+	"github.com/quic-go/webtransport-go"
 )
 
 type WebTransportConnector struct {

diff --git a/go.mod b/go.mod
@@ -6,13 +6,13 @@ toolchain go1.23.4
 
 require (
 	github.com/Doridian/water v1.6.1
-	github.com/Doridian/webtransport-go v0.9.0
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/gobwas/ws v1.4.0
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/uuid v1.6.0
 	github.com/magisterquis/connectproxy v0.0.0-20200725203833-3582e84f0c9b
 	github.com/quic-go/quic-go v0.48.2
+	github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66
 	github.com/tg123/go-htpasswd v1.2.3
 	gopkg.in/yaml.v3 v3.0.1
 	layeh.com/radius v0.0.0-20231213012653-1006025d24f8

diff --git a/go.sum b/go.sum
@@ -2,8 +2,6 @@ github.com/Doridian/gopacket v1.3.4 h1:pX8h8pkUTHSpYEKAwLtUK8+N9wdEdMJvYrSwaHZgz
 github.com/Doridian/gopacket v1.3.4/go.mod h1:16EwY3JsEHp3TFeSRcmSC9yOdG8GkFAWImZaL13kOGc=
 github.com/Doridian/water v1.6.1 h1:cszUUfRlk9duYwv1bE5mFluhaHJK0TAIdPLJk2DV0cI=
 github.com/Doridian/water v1.6.1/go.mod h1:bjQW67+p0YKqdrjoDWpJ+bcRvrrHphxwZOC6OTfBuf8=
-github.com/Doridian/webtransport-go v0.9.0 h1:psoiRhu0qIcXwNjBiljz0SXXY853OPz1MuD1Me2ckDw=
-github.com/Doridian/webtransport-go v0.9.0/go.mod h1:Q7ymTeaeNuO+2ifGWz6fw/7h0i1yCLnLsTHNgaPkUMA=
 github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 h1:IEjq88XO4PuBDcvmjQJcQGg+w+UaafSy8G5Kcb5tBhI=
 github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5/go.mod h1:exZ0C/1emQJAw5tHOaUDyY1ycttqBAPcxuzf7QbY6ec=
 github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU=
@@ -51,6 +49,8 @@ github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
 github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
 github.com/quic-go/quic-go v0.48.2 h1:wsKXZPeGWpMpCGSWqOcqpW2wZYic/8T3aqiOID0/KWE=
 github.com/quic-go/quic-go v0.48.2/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs=
+github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 h1:4WFk6u3sOT6pLa1kQ50ZVdm8BQFgJNA117cepZxtLIg=
+github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66/go.mod h1:Vp72IJajgeOL6ddqrAhmp7IM9zbTcgkQxD/YdxrVwMw=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=

diff --git a/server/upgraders/webtransport.go b/server/upgraders/webtransport.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Doridian/webtransport-go"
 	"github.com/Doridian/wsvpn/shared/sockets/adapters"
 	"github.com/quic-go/quic-go"
 	"github.com/quic-go/quic-go/http3"
+	"github.com/quic-go/webtransport-go"
 )
 
 type WebTransportUpgrader struct {

diff --git a/shared/sockets/adapters/webtransport.go b/shared/sockets/adapters/webtransport.go
@@ -10,9 +10,9 @@ import (
 	"net"
 	"sync"
 
-	"github.com/Doridian/webtransport-go"
 	"github.com/Doridian/wsvpn/shared"
 	"github.com/Doridian/wsvpn/shared/commands"
+	"github.com/quic-go/webtransport-go"
 )
 
 type StreamMessageType = byte