@ -79,7 +79,7 @@ type transport struct {
noise * noise . Transport
connMx sync . Mutex
conns map [ uint64 ] * conn // using quic-go's ConnectionTracingKey as map key
conns map [ quic . ConnectionTracingID ] * conn // using quic-go's ConnectionTracingKey as map key
}
var _ tpt . Transport = & transport { }
@ -105,7 +105,7 @@ func New(key ic.PrivKey, psk pnet.PSK, connManager *quicreuse.ConnManager, gater
gater : gater ,
clock : clock . New ( ) ,
connManager : connManager ,
conns : map [ uint64 ] * conn { } ,
conns : map [ quic . ConnectionTracingID ] * conn { } ,
}
for _ , opt := range opts {
if err := opt ( t ) ; err != nil {
@ -203,12 +203,10 @@ func (t *transport) dial(ctx context.Context, addr ma.Multiaddr, url, sni string
return nil , err
}
dialer := webtransport . Dialer {
RoundTripper : & http3 . RoundTripper {
Dial : func ( ctx context . Context , addr string , tlsCfg * tls . Config , cfg * quic . Config ) ( quic . EarlyConnection , error ) {
return conn . ( quic . EarlyConnection ) , nil
} ,
QuicConfig : t . connManager . ClientConfig ( ) . Clone ( ) ,
DialAddr : func ( ctx context . Context , addr string , tlsCfg * tls . Config , cfg * quic . Config ) ( quic . EarlyConnection , error ) {
return conn . ( quic . EarlyConnection ) , nil
} ,
QUICConfig : t . connManager . ClientConfig ( ) . Clone ( ) ,
}
rsp , sess , err := dialer . Dial ( ctx , url , nil )
if err != nil {
@ -349,7 +347,7 @@ func (t *transport) allowWindowIncrease(conn quic.Connection, size uint64) bool
t . connMx . Lock ( )
defer t . connMx . Unlock ( )
c , ok := t . conns [ conn . Context ( ) . Value ( quic . ConnectionTracingKey ) . ( uint64 ) ]
c , ok := t . conns [ conn . Context ( ) . Value ( quic . ConnectionTracingKey ) . ( quic . ConnectionTracingID ) ]
if ! ok {
return false
}
@ -358,13 +356,13 @@ func (t *transport) allowWindowIncrease(conn quic.Connection, size uint64) bool
func ( t * transport ) addConn ( sess * webtransport . Session , c * conn ) {
t . connMx . Lock ( )
t . conns [ sess . Context ( ) . Value ( quic . ConnectionTracingKey ) . ( uint64 ) ] = c
t . conns [ sess . Context ( ) . Value ( quic . ConnectionTracingKey ) . ( quic . ConnectionTracingID ) ] = c
t . connMx . Unlock ( )
}
func ( t * transport ) removeConn ( sess * webtransport . Session ) {
t . connMx . Lock ( )
delete ( t . conns , sess . Context ( ) . Value ( quic . ConnectionTracingKey ) . ( uint64 ) )
delete ( t . conns , sess . Context ( ) . Value ( quic . ConnectionTracingKey ) . ( quic . ConnectionTracingID ) )
t . connMx . Unlock ( )
}
Matthias Fasching
6 months ago
GitHub