mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-07-02 17:58:46 +00:00
Do not start tun in init
This commit is contained in:
@@ -170,6 +170,12 @@ func NewAlwaysOnInboundHandler(ctx context.Context, tag string, receiverConfig *
|
|||||||
|
|
||||||
// Start implements common.Runnable.
|
// Start implements common.Runnable.
|
||||||
func (h *AlwaysOnInboundHandler) Start() error {
|
func (h *AlwaysOnInboundHandler) Start() error {
|
||||||
|
// for inbound without worker (TUN)
|
||||||
|
if run, ok := h.proxy.(common.Runnable); ok {
|
||||||
|
if err := run.Start(); err != nil {
|
||||||
|
return errors.New("failed to start proxy").Base(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
for _, worker := range h.workers {
|
for _, worker := range h.workers {
|
||||||
if err := worker.Start(); err != nil {
|
if err := worker.Start(); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -40,10 +40,11 @@ type ConnectionHandler interface {
|
|||||||
// Handler implements ConnectionHandler
|
// Handler implements ConnectionHandler
|
||||||
var _ ConnectionHandler = (*Handler)(nil)
|
var _ ConnectionHandler = (*Handler)(nil)
|
||||||
|
|
||||||
|
// Handler implements common.Runnable
|
||||||
|
var _ common.Runnable = (*Handler)(nil)
|
||||||
|
|
||||||
// Init the Handler instance with necessary parameters
|
// Init the Handler instance with necessary parameters
|
||||||
func (t *Handler) Init(ctx context.Context, pm policy.Manager, dispatcher routing.Dispatcher) error {
|
func (t *Handler) Init(ctx context.Context, pm policy.Manager, dispatcher routing.Dispatcher) error {
|
||||||
var err error
|
|
||||||
|
|
||||||
// Retrieve tag and sniffing config from context (set by AlwaysOnInboundHandler)
|
// Retrieve tag and sniffing config from context (set by AlwaysOnInboundHandler)
|
||||||
if inbound := session.InboundFromContext(ctx); inbound != nil {
|
if inbound := session.InboundFromContext(ctx); inbound != nil {
|
||||||
t.tag = inbound.Tag
|
t.tag = inbound.Tag
|
||||||
@@ -56,6 +57,10 @@ func (t *Handler) Init(ctx context.Context, pm policy.Manager, dispatcher routin
|
|||||||
t.policyManager = pm
|
t.policyManager = pm
|
||||||
t.dispatcher = dispatcher
|
t.dispatcher = dispatcher
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Handler) Start() error {
|
||||||
tunName := t.config.Name
|
tunName := t.config.Name
|
||||||
tunInterface, err := NewTun(t.config)
|
tunInterface, err := NewTun(t.config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -92,7 +97,7 @@ func (t *Handler) Init(ctx context.Context, pm policy.Manager, dispatcher routin
|
|||||||
|
|
||||||
tunStackOptions := StackOptions{
|
tunStackOptions := StackOptions{
|
||||||
Tun: tunInterface,
|
Tun: tunInterface,
|
||||||
IdleTimeout: pm.ForLevel(t.config.UserLevel).Timeouts.ConnectionIdle,
|
IdleTimeout: t.policyManager.ForLevel(t.config.UserLevel).Timeouts.ConnectionIdle,
|
||||||
}
|
}
|
||||||
tunStack, err := NewStack(t.ctx, tunStackOptions, t)
|
tunStack, err := NewStack(t.ctx, tunStackOptions, t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -167,7 +172,7 @@ func (t *Handler) HandleConnection(conn net.Conn, destination net.Destination) {
|
|||||||
|
|
||||||
// Close implements common.Closable.
|
// Close implements common.Closable.
|
||||||
func (t *Handler) Close() error {
|
func (t *Handler) Close() error {
|
||||||
return errors.Combine(t.stack.Close(), t.tun.Close())
|
return errors.Combine(common.CloseIfExists(t.stack), common.CloseIfExists(t.tun))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Network implements proxy.Inbound
|
// Network implements proxy.Inbound
|
||||||
|
|||||||
Reference in New Issue
Block a user