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

close the aeadChanged chan when the handshake completes

Browse Source 
This allows us to remove HandshakeComplete() from the CryptoSetup
interface. It also provides a signal to the session when the handshake
completes.
This commit is contained in:
Marten Seemann
2017-05-07 22:00:57 +08:00
parent 2e0f5473a0
commit 0a6a9551f8
8 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
session_test.go
View File

@@ -1251,7 +1251,7 @@ var _ = Describe("Session", func() {
})
It("ignores undecryptable packets after the handshake is complete", func() {
sess.cryptoSetup.(*mockCryptoSetup).handshakeComplete = true
close(sess.aeadChanged)
go sess.run()
sendUndecryptablePackets()
Consistently(sess.undecryptablePackets).Should(BeEmpty())
@@ -1297,8 +1297,8 @@ var _ = Describe("Session", func() {
callbackCalledWith = p
}
sess.cryptoChangeCallback = cb
sess.cryptoSetup = &mockCryptoSetup{handshakeComplete: true}
sess.aeadChanged <- protocol.EncryptionForwardSecure
close(sess.aeadChanged)
go sess.run()
defer sess.Close(nil)
Eventually(func() bool { return callbackCalledWith }).Should(BeTrue())
@@ -1334,9 +1334,7 @@ var _ = Describe("Session", func() {
})
It("uses ICSL after handshake", func(done Done) {
// sess.lastNetworkActivityTime = time.Now().Add(-time.Minute)
*(*bool)(unsafe.Pointer(reflect.ValueOf(sess.cryptoSetup).Elem().FieldByName("receivedForwardSecurePacket").UnsafeAddr())) = true
*(*crypto.AEAD)(unsafe.Pointer(reflect.ValueOf(sess.cryptoSetup).Elem().FieldByName("forwardSecureAEAD").UnsafeAddr())) = crypto.NewNullAEAD(protocol.PerspectiveServer, protocol.VersionWhatever)
close(sess.aeadChanged)
cpm.idleTime = 0 * time.Millisecond
sess.packer.connectionParameters = sess.connectionParameters
sess.run() // Would normally not return