gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1061 from lucas-clemente/fix-1051

Browse Source 
fix race when dialing a new connection
This commit is contained in:
Marten Seemann
2017-12-21 17:44:28 +07:00
committed by GitHub
parent 820551bf22 2a0b71c66b
commit 8c0d8bb568
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client.go
View File

@@ -115,7 +115,6 @@ func DialNonFWSecure(
} }
utils.Infof("Starting new connection to %s (%s -> %s), connectionID %x, version %s", hostname, c.conn.LocalAddr().String(), c.conn.RemoteAddr().String(), c.connectionID, c.version) utils.Infof("Starting new connection to %s (%s -> %s), connectionID %x, version %s", hostname, c.conn.LocalAddr().String(), c.conn.RemoteAddr().String(), c.connectionID, c.version)
go c.listen()
if err := c.dial(); err != nil { if err := c.dial(); err != nil {
return nil, err return nil, err
@@ -199,6 +198,7 @@ func (c *client) dialGQUIC() error {
if err := c.createNewGQUICSession(); err != nil { if err := c.createNewGQUICSession(); err != nil {
return err return err
} }
go c.listen()
return c.establishSecureConnection() return c.establishSecureConnection()
} }
@@ -224,6 +224,7 @@ func (c *client) dialTLS() error {
if err := c.createNewTLSSession(eh.GetPeerParams(), c.version); err != nil { if err := c.createNewTLSSession(eh.GetPeerParams(), c.version); err != nil {
return err return err
} }
go c.listen()
if err := c.establishSecureConnection(); err != nil { if err := c.establishSecureConnection(); err != nil {
if err != handshake.ErrCloseSessionForRetry { if err != handshake.ErrCloseSessionForRetry {
return err return err