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

Merge pull request #1445 from lucas-clemente/fix-1444

Browse Source 
fix race condition when adding packet handlers to the multiplexer
This commit is contained in:
Marten Seemann
2018-07-06 15:29:34 +07:00
committed by GitHub
parent 17a1d7ce5d 8b9662924f
commit 2bc5b7f532
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client_multiplexer.go
View File

@@ -56,6 +56,7 @@ func getClientMultiplexer() multiplexer {
func (m *clientMultiplexer) AddConn(c net.PacketConn, connIDLen int) (packetHandlerManager, error) {
m.mutex.Lock()
defer m.mutex.Unlock()
p, ok := m.conns[c]
if !ok {
manager := m.newPacketHandlerManager()
@@ -72,6 +73,9 @@ func (m *clientMultiplexer) AddConn(c net.PacketConn, connIDLen int) (packetHand
}
func (m *clientMultiplexer) AddHandler(c net.PacketConn, connID protocol.ConnectionID, handler packetHandler) error {
m.mutex.Lock()
defer m.mutex.Unlock()
p, ok := m.conns[c]
if !ok {
return errors.New("unknown packet conn %s")