Compare commits

..

No commits in common. "b40f642fa4ae25633426f136aa2e5d25f985c991" and "97f0dc8a6060f8993388cb36d357668731475f38" have entirely different histories.

4 changed files with 9 additions and 21 deletions

View File

@ -56,14 +56,6 @@ func (m *Manager) Start(stage adapter.StartStage) error {
m.started = true
m.stage = stage
if stage == adapter.StartStateStart {
if m.defaultTag != "" && m.defaultOutbound == nil {
defaultEndpoint, loaded := m.endpoint.Get(m.defaultTag)
if !loaded {
m.access.Unlock()
return E.New("default outbound not found: ", m.defaultTag)
}
m.defaultOutbound = defaultEndpoint
}
if m.defaultOutbound == nil {
directOutbound, err := m.defaultOutboundFallback()
if err != nil {
@ -74,6 +66,14 @@ func (m *Manager) Start(stage adapter.StartStage) error {
m.outboundByTag[directOutbound.Tag()] = directOutbound
m.defaultOutbound = directOutbound
}
if m.defaultTag != "" && m.defaultOutbound == nil {
defaultEndpoint, loaded := m.endpoint.Get(m.defaultTag)
if !loaded {
m.access.Unlock()
return E.New("default outbound not found: ", m.defaultTag)
}
m.defaultOutbound = defaultEndpoint
}
outbounds := m.outbounds
m.access.Unlock()
return m.startOutbounds(append(outbounds, common.Map(m.endpoint.Endpoints(), func(it adapter.Endpoint) adapter.Outbound { return it })...))

@ -1 +1 @@
Subproject commit 24b26130071bd96c660deeecc4931a3e31339681
Subproject commit 597c18482f6edc44e0c94b7cc849dd03b2121c45

View File

@ -307,11 +307,3 @@ func (c *realityClientConnWrapper) Upstream() any {
func (c *realityClientConnWrapper) CloseWrite() error {
return c.Close()
}
func (c *realityClientConnWrapper) ReaderReplaceable() bool {
return true
}
func (c *realityClientConnWrapper) WriterReplaceable() bool {
return true
}

View File

@ -2,10 +2,6 @@
icon: material/alert-decagram
---
#### 1.12.3
* Fixes and improvements
#### 1.12.2
* Fixes and improvements