mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 04:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

add network to multiplexer index

Browse source 
only use laddr for multiplexer index could conflict with other protocols that not UDP
This commit is contained in:
chengxuncc 2019-10-01 09:33:05 +08:00 • committed by GitHub
parent 03ab56330b
commit 8388b8ea3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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()
defer m.mutex.Unlock()
laddr := c.LocalAddr().String()
p, ok := m.conns[laddr]
connIndex := c.LocalAddr().Network() + " " + c.LocalAddr().String()
p, ok := m.conns[connIndex]
if !ok {
manager := m.newPacketHandlerManager(c, connIDLen, statelessResetKey, m.logger)
p = connManager{
@ -66,7 +66,7 @@ func (m *connMultiplexer) AddConn(
statelessResetKey: statelessResetKey,
manager: manager,
}
m.conns[laddr] = p
m.conns[connIndex] = p
}
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)
@ -81,11 +81,11 @@ func (m *connMultiplexer) RemoveConn(c net.PacketConn) error {
m.mutex.Lock()
defer m.mutex.Unlock()
laddr := c.LocalAddr().String()
if _, ok := m.conns[laddr]; !ok {
connIndex := c.LocalAddr().Network() + " " + c.LocalAddr().String()
if _, ok := m.conns[connIndex]; !ok {
return fmt.Errorf("cannote remove connection, connection is unknown")
}
delete(m.conns, laddr)
delete(m.conns, connIndex)
return nil
}