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

Merge pull request #2156 from chengxuncc/patch-1

Browse Source 
add network to multiplexer index
This commit is contained in:
Marten Seemann
2019-10-01 09:08:44 +07:00
committed by GitHub
parent 03ab56330b 8388b8ea3a
commit 3fff444db3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
multiplexer.go
View File

@@ -57,8 +57,8 @@ func (m *connMultiplexer) AddConn(
m.mutex.Lock() m.mutex.Lock()
defer m.mutex.Unlock() defer m.mutex.Unlock()
laddr := c.LocalAddr().String() connIndex := c.LocalAddr().Network() + " " + c.LocalAddr().String()
p, ok := m.conns[laddr] p, ok := m.conns[connIndex]
if !ok { if !ok {
manager := m.newPacketHandlerManager(c, connIDLen, statelessResetKey, m.logger) manager := m.newPacketHandlerManager(c, connIDLen, statelessResetKey, m.logger)
p = connManager{ p = connManager{
@@ -66,7 +66,7 @@ func (m *connMultiplexer) AddConn(
statelessResetKey: statelessResetKey, statelessResetKey: statelessResetKey,
manager: manager, manager: manager,
} }
m.conns[laddr] = p m.conns[connIndex] = p
} }
if p.connIDLen != connIDLen { if p.connIDLen != connIDLen {
return nil, fmt.Errorf("cannot use %d byte connection IDs on a connection that is already using %d byte connction IDs", connIDLen, p.connIDLen) return nil, fmt.Errorf("cannot use %d byte connection IDs on a connection that is already using %d byte connction IDs", connIDLen, p.connIDLen)
@@ -81,11 +81,11 @@ func (m *connMultiplexer) RemoveConn(c net.PacketConn) error {
m.mutex.Lock() m.mutex.Lock()
defer m.mutex.Unlock() defer m.mutex.Unlock()
laddr := c.LocalAddr().String() connIndex := c.LocalAddr().Network() + " " + c.LocalAddr().String()
if _, ok := m.conns[laddr]; !ok { if _, ok := m.conns[connIndex]; !ok {
return fmt.Errorf("cannote remove connection, connection is unknown") return fmt.Errorf("cannote remove connection, connection is unknown")
} }
delete(m.conns, laddr) delete(m.conns, connIndex)
return nil return nil
} }