mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-07-05 11:18:37 +00:00
fix: split browser dialer configure and listener startup phases
Agent-Logs-Url: https://github.com/XTLS/Xray-core/sessions/bd037532-6fba-48d4-bf72-77fbb3bf8fc4 Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
286a702bfa
commit
c423317305
@@ -632,6 +632,9 @@ func (c *Config) Build() (*core.Config, error) {
|
|||||||
if err := browser_dialer.ConfigureCollectedDialerProxyURLs(); err != nil {
|
if err := browser_dialer.ConfigureCollectedDialerProxyURLs(); err != nil {
|
||||||
return nil, errors.New("failed to configure browser dialer").Base(err)
|
return nil, errors.New("failed to configure browser dialer").Base(err)
|
||||||
}
|
}
|
||||||
|
if err := browser_dialer.StartCollectedDialerProxyURLs(); err != nil {
|
||||||
|
return nil, errors.New("failed to start browser dialer listeners").Base(err)
|
||||||
|
}
|
||||||
|
|
||||||
return config, nil
|
return config, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,6 +104,13 @@ func ConfigureCollectedDialerProxyURLs() error {
|
|||||||
return errors.New("failed to initialize browser dialer listener for url ", browserDialerURL).Base(err)
|
return errors.New("failed to initialize browser dialer listener for url ", browserDialerURL).Base(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func StartCollectedDialerProxyURLs() error {
|
||||||
|
if initialized {
|
||||||
|
return errors.New("browser dialer does not support dynamic add/remove; restart is required after changing configuration")
|
||||||
|
}
|
||||||
for listenAddr, server := range serversByListenAddr {
|
for listenAddr, server := range serversByListenAddr {
|
||||||
if err := server.start(); err != nil {
|
if err := server.start(); err != nil {
|
||||||
return errors.New("failed to start browser dialer listener on ", listenAddr).Base(err)
|
return errors.New("failed to start browser dialer listener on ", listenAddr).Base(err)
|
||||||
|
|||||||
Reference in New Issue
Block a user