Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/proxyman/inbound/inbound.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
// Manager manages all inbound handlers.
type Manager struct {
access sync.RWMutex
untaggedHandler []inbound.Handler
untaggedHandlers []inbound.Handler
taggedHandlers map[string]inbound.Handler
running bool
}
Expand Down Expand Up @@ -47,7 +47,7 @@ func (m *Manager) AddHandler(ctx context.Context, handler inbound.Handler) error
}
m.taggedHandlers[tag] = handler
} else {
m.untaggedHandler = append(m.untaggedHandler, handler)
m.untaggedHandlers = append(m.untaggedHandlers, handler)
}

if m.running {
Expand Down Expand Up @@ -94,8 +94,8 @@ func (m *Manager) ListHandlers(ctx context.Context) []inbound.Handler {
m.access.RLock()
defer m.access.RUnlock()

var response []inbound.Handler
copy(m.untaggedHandler, response)
response := make([]inbound.Handler, len(m.untaggedHandlers))
copy(response, m.untaggedHandlers)

for _, v := range m.taggedHandlers {
response = append(response, v)
Expand All @@ -117,7 +117,7 @@ func (m *Manager) Start() error {
}
}

for _, handler := range m.untaggedHandler {
for _, handler := range m.untaggedHandlers {
if err := handler.Start(); err != nil {
return err
}
Expand All @@ -138,7 +138,7 @@ func (m *Manager) Close() error {
errs = append(errs, err)
}
}
for _, handler := range m.untaggedHandler {
for _, handler := range m.untaggedHandlers {
if err := handler.Close(); err != nil {
errs = append(errs, err)
}
Expand Down
4 changes: 2 additions & 2 deletions app/proxyman/outbound/outbound.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ func (m *Manager) ListHandlers(ctx context.Context) []outbound.Handler {
m.access.RLock()
defer m.access.RUnlock()

var response []outbound.Handler
copy(m.untaggedHandlers, response)
response := make([]outbound.Handler, len(m.untaggedHandlers))
copy(response, m.untaggedHandlers)

for _, v := range m.taggedHandler {
response = append(response, v)
Expand Down
Loading