mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki 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
No known key found for this signature in database
GPG key ID: 3603F40B121FCDEA
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)
}

23
client_test.go
View file

@ -72,9 +72,8 @@ var _ = Describe("Client", func() {
Expect(err).To(MatchError(testErr))
})
// TODO: actually test this
// now we're only testing that Dial doesn't return directly after version negotiation
It("only returns once a forward-secure connection is established if no ConnState is defined", func() {
It("doesn't return after version negotiation is established if no ConnState is defined", func() {
packetConn.dataToRead = []byte{0x0, 0x1, 0x0}
config.ConnState = nil
var dialReturned bool
@ -86,6 +85,26 @@ var _ = Describe("Client", func() {
}()
Consistently(func() bool { return dialReturned }).Should(BeFalse())
})
It("only establishes a connection once it is forward-secure if no ConnState is defined", func() {
config.ConnState = nil
client := &client{conn: &conn{pconn: packetConn, currentAddr: addr}, config: config}
client.connStateChangeOrErrCond.L = &client.mutex
var returned bool
go func() {
defer GinkgoRecover()
_, err := client.establishConnection()
Expect(err).ToNot(HaveOccurred())
returned = true
}()
Consistently(func() bool { return returned }).Should(BeFalse())
// switch to a secure connection
client.cryptoChangeCallback(nil, false)
Consistently(func() bool { return returned }).Should(BeFalse())
// switch to a forward-secure connection
client.cryptoChangeCallback(nil, true)
Eventually(func() bool { return returned }).Should(BeFalse())
})
})
It("errors on invalid public header", func() {