From 8388b8ea3a48bbec0cad25624295965c9d7c62bf Mon Sep 17 00:00:00 2001
From: chengxuncc <chengxuncc@gmail.com>
Date: Tue, 1 Oct 2019 09:33:05 +0800
Subject: [PATCH] add network to multiplexer index

only use laddr for multiplexer index could conflict with other protocols that not UDP
---
 multiplexer.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/multiplexer.go b/multiplexer.go
index 1ba8892d1..824cb84ea 100644
--- a/multiplexer.go
+++ b/multiplexer.go
@@ -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
 }