Conversation
congestion, etc. to Finalmask's quicParams
congestion, etc. to Finalmask's quicParamsquicParams to set congestion, etc.
quicParams to set congestion, etc.quicParams to set congestion, etc.
|
@LjhAUMEM 解决一下 conflict |
done |
|
Ready 了吗 |
|
有点唐突不过 ready 还是没问题， |
|
不对 test 还是失败， |
|
|
done， |
|
|
|
|
|
该来的终究还是会来，把 Hy2 传输层的 udphop 改成 Finalmask 的 porthop 吧，支持 TCP 与 UDP，或许另开一个 PR？
|
|
我没记错的话这个hy udp hop还是魔改过quic库的连接迁移机制才让它好使的 |
|
|
|
|
|
udphop 也移了， 顺便在这里 bump 了 quic |
|
好消息，udphop 移植成功了，坏消息，congestion 实际并没有生效，似乎是和客户端使用的不是 stream 有关 |
|
奇怪，OnPacketSent 打印又都触发了，但是速度为什么相差这么大 |
|
先这样吧，congestion 谁想 debug 再配置 测试 udphop 的配置 {
"log": { "loglevel": "debug" },
"inbounds": [
{
// "listen": "127.0.0.1",
"port": 1081,
"protocol": "hysteria",
"settings": {
"version": 2,
"clients": [
{
"auth": "5783a3e7-e373-51cd-8642-c83782b807c5"
}
]
},
"streamSettings": {
"network": "hysteria",
"hysteriaSettings": {
"version": 2
},
"security": "tls",
"tlsSettings": {
"alpn": ["h3"],
"certificates": [
{
"certificateFile": "ca.crt",
"keyFile": "ca.key"
}
]
},
"finalmask": {
"quicParams": {
"congestion": "force-brutal",
"debug": true,
"brutalUp": "100mbps"
}
}
}
},
{
// "listen": "127.0.0.1",
"port": 1082,
"protocol": "hysteria",
"settings": {
"version": 2
},
"streamSettings": {
"network": "xhttp",
"security": "tls",
"tlsSettings": {
"alpn": ["h3"],
"certificates": [
{
"certificateFile": "ca.crt",
"keyFile": "ca.key"
}
]
},
"finalmask": {
"quicParams": {
"congestion": "force-brutal",
"debug": true,
"brutalUp": "100mbps"
}
}
}
}
],
"outbounds": [
{
"tag": "direct",
"protocol": "freedom"
}
]
}
/*
iptables -t nat -L -n -v --line-numbers
iptables -t nat -A PREROUTING -i eth0 -p udp --dport 20000:21000 -j REDIRECT --to-ports 1081
iptables -t nat -A PREROUTING -i eth0 -p udp --dport 21000:22000 -j REDIRECT --to-ports 1082
iptables -t nat -D PREROUTING 1
iptables -t nat -F
*/{
"log": { "loglevel": "debug" },
"inbounds": [
{
"listen": "127.0.0.1",
"port": 1080,
"protocol": "socks",
"settings": {
"auth": "noauth",
"udp": true
}
}
],
"outbounds": [
{
"protocol": "hysteria",
"settings": {
"version": 2,
"address": "127.0.0.1",
"port": 1081
},
"streamSettings": {
"network": "hysteria",
"hysteriaSettings": {
"version": 2,
"auth": "5783a3e7-e373-51cd-8642-c83782b807c5"
},
"security": "tls",
"tlsSettings": {
"serverName": "example.com",
"alpn": ["h3"],
"pinnedPeerCertSha256": "f91e9cf7e75e42b020eb974e44302430157bd665a2c402e6dc3c7fd9fb7d7e1b"
}
,"finalmask": {
"quicParams": {
"congestion": "reno",
"udpHop": {
"ports": "20000-21000",
"interval": "5-10"
}
}
}
}
}
]
}{
"log": { "loglevel": "debug" },
"inbounds": [
{
"listen": "127.0.0.1",
"port": 1080,
"protocol": "socks",
"settings": {
"auth": "noauth",
"udp": true
}
}
],
"outbounds": [
{
"protocol": "hysteria",
"settings": {
"version": 2,
"address": "127.0.0.1",
"port": 1082
},
"streamSettings": {
"network": "xhttp",
"security": "tls",
"tlsSettings": {
"serverName": "example.com",
"alpn": ["h3"],
"pinnedPeerCertSha256": "f91e9cf7e75e42b020eb974e44302430157bd665a2c402e6dc3c7fd9fb7d7e1b"
}
,"finalmask": {
"quicParams": {
"congestion": "reno",
"udpHop": {
"ports": "21000-22000",
"interval": "5-10"
}
}
}
}
}
]
} |
|
啊这放 quicParam 里吗， |
|
kcp 好像还不能直接用，服务端好像会把不同端口来源当作不同 session |
这么说吧 源端口跳跃基于 QUIC 连接迁移特性 但是它会重置阻塞控制状态（链路都变了肯定重新计算宽带） 但是 udp hop 肯定不是期望的 十几秒重置一次要重新探测宽带这谁受得了 所谓魔改就是让它不重置状态 |
|
|
quicParams to set congestion, etc.quicParams to set congestion, brutalUp, udpHop, etc.
quicParams to set congestion, brutalUp, udpHop, etc.quicParams to set congestion, brutalUp, brutalDown, udpHop, etc.
quicParams to set congestion, brutalUp, brutalDown, udpHop, etc.quicParams to set congestion, brutalUp, brutalDown, udpHop (ports & interval), etc.
|
先这样吧，
|
This comment was marked as resolved.
This comment was marked as resolved.
1 similar comment
|
加了brutalUp/Down: ""，没加congestion或者为空，无法正常使用。🌚 |
提供下配置 |
…on`, `brutalUp`, `brutalDown`, `udpHop` (`ports` & `interval`), etc. (XTLS#5772) XTLS#5772 (comment)
|
（使用XHTTP（ALPN=HTTP/3）时，指定 |
|
xp3 只有 force-brutal |
No description provided.