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

call the ConnStateCallback in the client for encryption level changes

Browse Source 
fixes #439
This commit is contained in:
Marten Seemann
2017-02-24 09:02:33 +07:00
parent 820eb2e6ee
commit 7109883a95
2 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
client.go
View File

@@ -65,6 +65,25 @@ func Dial(pconn net.PacketConn, remoteAddr net.Addr, host string, config *Config
utils.Infof("Starting new connection to %s (%s), connectionID %x, version %d", hostname, c.conn.RemoteAddr().String(), c.connectionID, c.version)
return c.establishConnection()
}
// DialAddr establishes a new QUIC connection to a server
func DialAddr(hostname string, config *Config) (Session, error) {
udpAddr, err := net.ResolveUDPAddr("udp", hostname)
if err != nil {
return nil, err
}
udpConn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: 0})
if err != nil {
return nil, err
}
return Dial(udpConn, udpAddr, hostname, config)
}
func (c *client) establishConnection() (Session, error) {
go c.listen()
c.mutex.Lock()
@@ -86,21 +105,6 @@ func Dial(pconn net.PacketConn, remoteAddr net.Addr, host string, config *Config
return c.session, nil
}
// DialAddr establishes a new QUIC connection to a server
func DialAddr(hostname string, config *Config) (Session, error) {
udpAddr, err := net.ResolveUDPAddr("udp", hostname)
if err != nil {
return nil, err
}
udpConn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: 0})
if err != nil {
return nil, err
}
return Dial(udpConn, udpAddr, hostname, config)
}
// Listen listens
func (c *client) listen() {
var err error
@@ -228,6 +232,11 @@ func (c *client) cryptoChangeCallback(_ Session, isForwardSecure bool) {
state = ConnStateSecure
}
c.mutex.Lock()
c.connState = state
c.connStateChangeOrErrCond.Signal()
c.mutex.Unlock()
if c.config.ConnState != nil {
go c.config.ConnState(c.session, state)
}