From 52381a3c038b374469fceb9dbaf12d3d09c91b04 Mon Sep 17 00:00:00 2001 From: RPRX <63339210+RPRX@users.noreply.github.com> Date: Tue, 18 Feb 2025 11:55:07 +0000 Subject: [PATCH] v25.2.18 Announcement of NFTs by Project X: https://github.com/XTLS/Xray-core/discussions/3633 Project X NFT: https://opensea.io/assets/ethereum/0x5ee362866001613093361eb8569d59c4141b76d1/1 XHTTP: Beyond REALITY: https://github.com/XTLS/Xray-core/discussions/4113 REALITY NFT: https://opensea.io/assets/ethereum/0x5ee362866001613093361eb8569d59c4141b76d1/2 --- app/observatory/burst/healthping.go | 6 +++--- app/observatory/observer.go | 8 ++++---- core/core.go | 4 ++-- core/xray.go | 2 +- transport/internet/splithttp/hub.go | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/observatory/burst/healthping.go b/app/observatory/burst/healthping.go index f0842602..0d8cab9f 100644 --- a/app/observatory/burst/healthping.go +++ b/app/observatory/burst/healthping.go @@ -66,10 +66,10 @@ func NewHealthPing(ctx context.Context, dispatcher routing.Dispatcher, config *H settings.Timeout = time.Duration(5) * time.Second } return &HealthPing{ - ctx: ctx, + ctx: ctx, dispatcher: dispatcher, - Settings: settings, - Results: nil, + Settings: settings, + Results: nil, } } diff --git a/app/observatory/observer.go b/app/observatory/observer.go index 657396f6..a6fba3ad 100644 --- a/app/observatory/observer.go +++ b/app/observatory/observer.go @@ -32,7 +32,7 @@ type Observer struct { finished *done.Instance - ohm outbound.Manager + ohm outbound.Manager dispatcher routing.Dispatcher } @@ -226,9 +226,9 @@ func New(ctx context.Context, config *Config) (*Observer, error) { return nil, errors.New("Cannot get depended features").Base(err) } return &Observer{ - config: config, - ctx: ctx, - ohm: outboundManager, + config: config, + ctx: ctx, + ohm: outboundManager, dispatcher: dispatcher, }, nil } diff --git a/core/core.go b/core/core.go index 5a52683e..5db6fd45 100644 --- a/core/core.go +++ b/core/core.go @@ -18,8 +18,8 @@ import ( var ( Version_x byte = 25 - Version_y byte = 1 - Version_z byte = 30 + Version_y byte = 2 + Version_z byte = 18 ) var ( diff --git a/core/xray.go b/core/xray.go index f6ccc27d..0cc56daa 100644 --- a/core/xray.go +++ b/core/xray.go @@ -359,7 +359,7 @@ func (s *Instance) AddFeature(feature features.Feature) error { } s.pendingOptionalResolutions = pendingOptional s.resolveLock.Unlock() - + var err error for _, r := range availableResolution { err = r.callbackResolution(s.features) // only return the last error for now diff --git a/transport/internet/splithttp/hub.go b/transport/internet/splithttp/hub.go index e205ce8d..86a750f7 100644 --- a/transport/internet/splithttp/hub.go +++ b/transport/internet/splithttp/hub.go @@ -425,7 +425,7 @@ func ListenXH(ctx context.Context, address net.Address, port net.Port, streamSet } go func() { if err := l.h3server.ServeListener(l.h3listener); err != nil { - errors.LogWarningInner(ctx, err, "failed to serve HTTP/3 for XHTTP/3") + errors.LogErrorInner(ctx, err, "failed to serve HTTP/3 for XHTTP/3") } }() } else { // tcp @@ -460,7 +460,7 @@ func ListenXH(ctx context.Context, address net.Address, port net.Port, streamSet } go func() { if err := l.server.Serve(l.listener); err != nil { - errors.LogWarningInner(ctx, err, "failed to serve HTTP for XHTTP") + errors.LogErrorInner(ctx, err, "failed to serve HTTP for XHTTP") } }() }