black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-09-19 18:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse source
This commit is contained in:
世界 2024-06-25 13:10:25 +08:00
parent 8a2d3fbb28
commit b0aaa86806
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
box.go
View file

@ -203,7 +203,7 @@ func (s *Box) PreStart() error {
defer func() { defer func() {
v := recover() v := recover()
if v != nil { if v != nil {
log.Error(E.Cause(err, "origin error")) println(err.Error())
debug.PrintStack() debug.PrintStack()
panic("panic on early close: " + fmt.Sprint(v)) panic("panic on early close: " + fmt.Sprint(v))
} }
@ -222,9 +222,9 @@ func (s *Box) Start() error {
defer func() { defer func() {
v := recover() v := recover()
if v != nil { if v != nil {
log.Error(E.Cause(err, "origin error")) println(err.Error())
debug.PrintStack() debug.PrintStack()
panic("panic on early close: " + fmt.Sprint(v)) println("panic on early start: " + fmt.Sprint(v))
} }
}() }()
s.Close() s.Close()

5
inbound/tun.go
View file

@ -174,7 +174,7 @@ func (t *Tun) Start() error {
forwarderBindInterface = true forwarderBindInterface = true
includeAllNetworks = t.platformInterface.IncludeAllNetworks() includeAllNetworks = t.platformInterface.IncludeAllNetworks()
} }
t.tunStack, err = tun.NewStack(t.stack, tun.StackOptions{ tunStack, err := tun.NewStack(t.stack, tun.StackOptions{
Context: t.ctx, Context: t.ctx,
Tun: tunInterface, Tun: tunInterface,
TunOptions: t.tunOptions, TunOptions: t.tunOptions,
@ -190,8 +190,9 @@ func (t *Tun) Start() error {
return err return err
} }
monitor.Start("initiating tun stack") monitor.Start("initiating tun stack")
err = t.tunStack.Start() err = tunStack.Start()
monitor.Finish() monitor.Finish()
t.tunStack = tunStack
if err != nil { if err != nil {
return err return err
} }

4
outbound/urltest.go
View file

@ -385,9 +385,9 @@ func (g *URLTestGroup) urlTest(ctx context.Context, force bool) (map[string]uint
continue continue
} }
b.Go(realTag, func() (any, error) { b.Go(realTag, func() (any, error) {
ctx, cancel := context.WithTimeout(context.Background(), C.TCPTimeout) testCtx, cancel := context.WithTimeout(g.ctx, C.TCPTimeout)
defer cancel() defer cancel()
t, err := urltest.URLTest(ctx, g.link, p) t, err := urltest.URLTest(testCtx, g.link, p)
if err != nil { if err != nil {
g.logger.Debug("outbound ", tag, " unavailable: ", err) g.logger.Debug("outbound ", tag, " unavailable: ", err)
g.history.DeleteURLTestHistory(realTag) g.history.DeleteURLTestHistory(realTag)