Skip to content

GitLab

Commit 71877e01 authored by Brian Tiger Chow's avatar Brian Tiger Chow
Browse files

fix(mux) hold lock when reading default handler field

parent 6b1de9b8
Show whitespace changes
Inline Side-by-side
protocol/mux.go
View file @ 71877e01
...@@ -24,11 +24,11 @@ type streamHandlerMap map[ID]inet.StreamHandler ...@@ -24,11 +24,11 @@ type streamHandlerMap map[ID]inet.StreamHandler
// It contains the handlers for each protocol accepted. // It contains the handlers for each protocol accepted.
// It dispatches handlers for streams opened by remote peers. // It dispatches handlers for streams opened by remote peers.
type Mux struct { type Mux struct {
// defaultHandler handles unknown protocols. Callers modify at your own risk.
defaultHandler inet.StreamHandler
lock sync.RWMutex lock sync.RWMutex
handlers streamHandlerMap handlers streamHandlerMap
// defaultHandler handles unknown protocols. Callers modify at your own risk.
defaultHandler inet.StreamHandler
} }
func NewMux() *Mux { func NewMux() *Mux {
...@@ -59,8 +59,8 @@ func (m *Mux) readHeader(s io.Reader) (ID, inet.StreamHandler, error) { ...@@ -59,8 +59,8 @@ func (m *Mux) readHeader(s io.Reader) (ID, inet.StreamHandler, error) {
// log.Debug("readHeader got:", p) // log.Debug("readHeader got:", p)
m.lock.RLock() m.lock.RLock()
defer m.lock.RUnlock()
h, found := m.handlers[p] h, found := m.handlers[p]
m.lock.RUnlock()
switch { switch {
case !found && m.defaultHandler != nil: case !found && m.defaultHandler != nil:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment