mirror of
https://github.com/SagerNet/sing-box.git
synced 2025-09-10 21:34:07 +08:00
Compare commits
3 Commits
97f0dc8a60
...
b40f642fa4
Author | SHA1 | Date | |
---|---|---|---|
![]() |
b40f642fa4 | ||
![]() |
22782ca6fc | ||
![]() |
1468d83895 |
@ -56,6 +56,14 @@ func (m *Manager) Start(stage adapter.StartStage) error {
|
|||||||
m.started = true
|
m.started = true
|
||||||
m.stage = stage
|
m.stage = stage
|
||||||
if stage == adapter.StartStateStart {
|
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 {
|
if m.defaultOutbound == nil {
|
||||||
directOutbound, err := m.defaultOutboundFallback()
|
directOutbound, err := m.defaultOutboundFallback()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -66,14 +74,6 @@ func (m *Manager) Start(stage adapter.StartStage) error {
|
|||||||
m.outboundByTag[directOutbound.Tag()] = directOutbound
|
m.outboundByTag[directOutbound.Tag()] = directOutbound
|
||||||
m.defaultOutbound = 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
|
outbounds := m.outbounds
|
||||||
m.access.Unlock()
|
m.access.Unlock()
|
||||||
return m.startOutbounds(append(outbounds, common.Map(m.endpoint.Endpoints(), func(it adapter.Endpoint) adapter.Outbound { return it })...))
|
return m.startOutbounds(append(outbounds, common.Map(m.endpoint.Endpoints(), func(it adapter.Endpoint) adapter.Outbound { return it })...))
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 597c18482f6edc44e0c94b7cc849dd03b2121c45
|
Subproject commit 24b26130071bd96c660deeecc4931a3e31339681
|
@ -307,3 +307,11 @@ func (c *realityClientConnWrapper) Upstream() any {
|
|||||||
func (c *realityClientConnWrapper) CloseWrite() error {
|
func (c *realityClientConnWrapper) CloseWrite() error {
|
||||||
return c.Close()
|
return c.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *realityClientConnWrapper) ReaderReplaceable() bool {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *realityClientConnWrapper) WriterReplaceable() bool {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
@ -2,6 +2,10 @@
|
|||||||
icon: material/alert-decagram
|
icon: material/alert-decagram
|
||||||
---
|
---
|
||||||
|
|
||||||
|
#### 1.12.3
|
||||||
|
|
||||||
|
* Fixes and improvements
|
||||||
|
|
||||||
#### 1.12.2
|
#### 1.12.2
|
||||||
|
|
||||||
* Fixes and improvements
|
* Fixes and improvements
|
||||||
|
Loading…
x
Reference in New Issue
Block a user