Skip to content

Config: Rename network/address/port in Tunnel inbound and DNS outbound#6084

Merged
RPRX merged 8 commits intomainfrom
tunnel-and-dns
May 7, 2026
Merged

Config: Rename network/address/port in Tunnel inbound and DNS outbound#6084
RPRX merged 8 commits intomainfrom
tunnel-and-dns

Conversation

@Meo597
Copy link
Copy Markdown
Collaborator

@Meo597 Meo597 commented May 6, 2026

@Meo597
Copy link
Copy Markdown
Collaborator Author

Meo597 commented May 6, 2026

同样的 test 里的字段没改,删兼容代码的时候哪里炸了改哪里
pb 也没做兼容直接改的字段名

@Meo597
Copy link
Copy Markdown
Collaborator Author

Meo597 commented May 6, 2026

文档没改呢,因为 #6083 (comment)

@RPRX
Copy link
Copy Markdown
Member

RPRX commented May 6, 2026

我想了下用 to 的话确实在哪都有一种“直接发到”的感觉,而 Xray 是一层层的可能还有下一层来处理,都改成 rewrite

Freedom 基本在最后所以直接 redirect 还行,其实那个也可以分为两个 rewrite,但 portMap 又是 redirect 语法,所以

@RPRX
Copy link
Copy Markdown
Member

RPRX commented May 6, 2026

@Meo597 在线不,这个 PR 改成 rewrite 后可以直接改文档了,顺便 Tunnel 代码和文档里把 allowedNetwork 放最上面

@RPRX
Copy link
Copy Markdown
Member

RPRX commented May 7, 2026

Tunnel 的 config struct 和 DNS 的风格没对齐好难受

errors.PrintDeprecatedFeatureWarning 是不自带 ctx 的,这个先别输出了吧,Xray 的 alias 都没输出过这个,只是改了文档

@Meo597
Copy link
Copy Markdown
Collaborator Author

Meo597 commented May 7, 2026

那这些我就加注释标记以后删除,暂时不 warn 了?
以后真要删的时候用户反映不过来啊

@Meo597
Copy link
Copy Markdown
Collaborator Author

Meo597 commented May 7, 2026

Tunnel 的 config struct 和 DNS 的风格没对齐好难受

别较这个真了,好多地方连结构体的命名都没能统一风格

Comment thread infra/conf/dokodemo.go Outdated
@RPRX
Copy link
Copy Markdown
Member

RPRX commented May 7, 2026

那这些我就加注释标记以后删除,暂时不 warn 了? 以后真要删的时候用户反映不过来啊

注释也暂时不用加,改个文档就行了

@Meo597
Copy link
Copy Markdown
Collaborator Author

Meo597 commented May 7, 2026

那样就得做冲突检查了,不然静默替换会有诡异错误,万一有人同时写了俩

@Meo597
Copy link
Copy Markdown
Collaborator Author

Meo597 commented May 7, 2026

要不新开一个 helper 不带 ctx 光输出建议你现在用的是 alias 建议改用规范命名 xxx

@RPRX
Copy link
Copy Markdown
Member

RPRX commented May 7, 2026

不用冲突检查,不要搞复杂了

要不新开一个 helper 不带 ctx 光输出建议你现在用的是 alias 建议改用规范命名 xxx

我也是这么想的,alias 已经积累很多了,等合并了这些 PR 再说吧

@RPRX
Copy link
Copy Markdown
Member

RPRX commented May 7, 2026

或者弄一个公用函数,new、old、赋值对象、提示字符串,这四个参数

@Meo597
Copy link
Copy Markdown
Collaborator Author

Meo597 commented May 7, 2026

先给删了下此再批量把所有的都改了吧,自动赋值警告

@RPRX RPRX changed the title Infra/conf: Rename Tunnel and DNS outbound target fields Config: Rename netwwork/address/port in Tunnel inbound and DNS outbound May 7, 2026
@RPRX RPRX changed the title Config: Rename netwwork/address/port in Tunnel inbound and DNS outbound Config: Rename network/address/port in Tunnel inbound and DNS outbound May 7, 2026
@RPRX RPRX merged commit 50f8a36 into main May 7, 2026
78 checks passed
@Meo597 Meo597 deleted the tunnel-and-dns branch May 7, 2026 11:31
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