chore: upgrade deps and attempt to enable using go1.19 (#869)
* upgrade to our go.mod enabled of psiphon-tunnel-core such that we're now using v2.0.24 of the tunnel-core; * upgrade to the latest lucas-clemente/quic-go release; * upgrade to the latest ooni/oohttp release (which is based on go1.19 but the diff seems good enough to continue using go1.18.x as well); * upgrade to the latest ooni/oocrypto release (for which we can make the same remarks regarding using go1.18.x); * deal with changes in lucas-clemente/quic-go API as well as changes in what a go1.19 *tls.Conn compatible type should look like. Unfortunately, we cannot switch to go1.19 because psiphon forks quic-go and their fork's still not building using such a version of go. Part of ooni/probe#2211.
This commit is contained in:
@@ -93,7 +93,7 @@ func dialQUIC(ctx context.Context, address string,
|
||||
config *tls.Config) (quic.EarlyConnection, tls.ConnectionState, error) {
|
||||
ql := netxlite.NewQUICListener()
|
||||
d := netxlite.NewQUICDialerWithoutResolver(ql, log.Log)
|
||||
qconn, err := d.DialContext(ctx, "udp", address, config, &quic.Config{})
|
||||
qconn, err := d.DialContext(ctx, address, config, &quic.Config{})
|
||||
if err != nil {
|
||||
return nil, tls.ConnectionState{}, err
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ func dialQUIC(ctx context.Context, address string,
|
||||
config *tls.Config) (quic.EarlyConnection, tls.ConnectionState, error) {
|
||||
ql := netxlite.NewQUICListener()
|
||||
d := netxlite.NewQUICDialerWithoutResolver(ql, log.Log)
|
||||
qconn, err := d.DialContext(ctx, "udp", address, config, &quic.Config{})
|
||||
qconn, err := d.DialContext(ctx, address, config, &quic.Config{})
|
||||
if err != nil {
|
||||
return nil, tls.ConnectionState{}, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user