Skip to content

Comments

Log config: More flexible maskAddress#5570

Merged
RPRX merged 1 commit intomainfrom
maskaddr
Jan 23, 2026
Merged

Log config: More flexible maskAddress#5570
RPRX merged 1 commit intomainfrom
maskaddr

Conversation

@Fangliding
Copy link
Member

@Fangliding Fangliding commented Jan 19, 2026

#5566 (comment)
因为要改test就重新开了
新写法 /16+/64
前者 ipv4 后者 ipv6
范围 /0-32 /0-128
/0 = 之前的 [masked ipv4/ipv6]
/32 or /128 就是这种就不mask
ipv4部分需要可以被8整除(因为 1.2.*.* 这种格式要求)

@Fangliding
Copy link
Member Author

之前的三个写法以语法糖的形式存在

@RPRX
Copy link
Member

RPRX commented Jan 22, 2026

这个如果确定不会有 bug 的话就合了

@Fangliding
Copy link
Member Author

我就是怕有bug特意写了test

@RPRX
Copy link
Member

RPRX commented Jan 23, 2026

这个是需要写配置文件里吗

@RPRX
Copy link
Member

RPRX commented Jan 23, 2026

看了下,原来的配置会被自动转义,可以合并

@RPRX RPRX changed the title Log: More flexible mask addr Log config: More flexible maskAddress Jan 23, 2026
@RPRX RPRX merged commit 5846f94 into main Jan 23, 2026
81 of 82 checks passed
nebulabox added a commit to nebulabox/Xray-core that referenced this pull request Jan 28, 2026
* commit 'f6a7e939231e5ec6b167628bf730dc70a3c36707': (90 commits)
  VMess inbound: Optimize replay filter (XTLS#5562)
  Bump github.com/pires/go-proxyproto from 0.9.1 to 0.9.2 (XTLS#5614)
  TUN inbound: Add iOS support (XTLS#5612)
  Geodat: Reduce peak memory usage (XTLS#5581)
  Bump github.com/pires/go-proxyproto from 0.9.0 to 0.9.1 (XTLS#5608)
  Hysteria transport: Support range & random for `interval` in `udphop` as well (XTLS#5603)
  TUN inbound: Enhance Darwin interface support (XTLS#5598)
  XUDP client: Initialize Global ID's BaseKey correctly (XTLS#5602)
  TUN inbound: Disable RACK/TLP recovery to fix connection stalls (XTLS#5600)
  v26.1.23
  common/errors/feature_errors.go: Add PrintNonRemovalDeprecatedFeatureWarning() (XTLS#5567)
  API: Add ListRule() for routing (XTLS#5569)
  Log config: More flexible `maskAddress` (XTLS#5570)
  Bump github.com/miekg/dns from 1.1.70 to 1.1.72 (XTLS#5590)
  Bump github.com/cloudflare/circl from 1.6.2 to 1.6.3 (XTLS#5589)
  Hysteria transport: Fix speedtest issue (XTLS#5587)
  README.md: Add fancyss to Asuswrt-Merlin Clients
  Router: Fix panic in ProcessNameMatcher when source IPs are empty (XTLS#5574)
  README.md: Update links for PassWall & PassWall 2 (XTLS#5572)
  Tests: Reduce RAM usage (XTLS#5577)
  ...

# Conflicts:
#	core/core.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants