feat: hysteria draft #217

eauxxs · 2023-12-16T11:21:59Z

🤔 This is a ...

New feature

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

Doc is updated/provided or not needed
Changelog is provided or not needed

ibigbug · 2023-12-17T10:57:21Z

clash_lib/src/proxy/hysteria2/convert.rs

@@ -0,0 +1,43 @@
+use std::sync::Arc;


you can put this under clash_lib/src/proxy/converters

eauxxs · 2023-12-17T13:39:36Z

At present, hysteria2 can already perform tcp proxy, mainly udp proxy, brutal congestion, ports hopping has not been implemented, port hopping may be just a small problem.
In the process of implementing salamander, I encountered a very confusing problem. The obfuscation can be correctly encrypted and decrypted by both parties, and the quic connection can be established. But when sending h3 authentication, an error will occur. I don’t know if it’s a problem with the h3 library or the obfuscation algorithm itself or something else. I don’t know if you know more about quic and if you have any ideas.
@ibigbug @greenhat616 @xmh0511

greenhat616 · 2023-12-18T18:56:03Z

I'm busy these days. while I am spare, I could take a look.

eauxxs · 2023-12-19T03:17:39Z

I'm busy these days. while I am spare, I could take a look.

thanks, salamander obfs have been fixed, it work now

ibigbug · 2023-12-25T10:21:52Z

Hey thank you guys.

I see that you've fixed the problem, is there anything left to be done for this PR?

ibigbug · 2023-12-25T10:58:36Z

@eauxxs the build is failed on Windows

Signed-off-by: Yuwei Ba <[email protected]>

ibigbug · 2023-12-25T12:19:11Z

clash/tests/data/config/ss.yaml

@@ -60,5 +60,5 @@ proxies:
    udp: true

 rules:
-  - MATCH, ss
+  - MATCH, ss-01


Suggested change

- MATCH, ss-01

- MATCH, ss

ibigbug · 2023-12-25T12:19:32Z

clash/tests/data/config/hysteria2.yaml

+
+proxies:
+  - name: "local"
+    type: Hysteria2


Suggested change

type: Hysteria2

type: hysteria2

ibigbug · 2023-12-25T12:20:05Z

clash_lib/src/app/logging.rs

@@ -6,6 +6,7 @@ use serde::Serialize;
 use tokio::sync::broadcast::Sender;

 use tracing::debug;
+use tracing::Level;


Suggested change

use tracing::Level;

ibigbug · 2023-12-25T12:20:50Z

clash_lib/src/app/logging.rs

@@ -103,6 +104,11 @@ pub fn setup_logging(
        )
        .from_env_lossy();

+    // let trace = tracing_subscriber::filter::targets::Targets::new()


you can do something like this to enable the level RUST_LOG=h2=trace,clash=debug

ibigbug · 2023-12-25T12:21:26Z

clash_lib/src/config/internal/proxy.rs

@@ -53,6 +53,7 @@ pub enum OutboundProxyProtocol {
    Trojan(OutboundTrojan),
    #[serde(rename = "vmess")]
    Vmess(OutboundVmess),
+    Hysteria2(OutboundHysteria2),


Suggested change

Hysteria2(OutboundHysteria2),

#[serde(rename = "hysteria2")]

Hysteria2(OutboundHysteria2),

ibigbug · 2023-12-25T12:23:37Z

clash_lib/src/proxy/hysteria2/udp_hop.rs

+
+use crate::proxy::converters::hysteria2::PortGenrateor;
+
+pub struct UdpHop {


could you please add a short description for this struct, such as what part it plays in the protocol

https://v2.hysteria.network/docs/advanced/Port-Hopping/

ibigbug · 2023-12-25T12:24:04Z

clash_lib/src/proxy/hysteria2/salamander.rs

+    }
+
+    println!("done");
+    // std::thread::sleep(std::time::Duration::from_secs(100000));


Suggested change

// std::thread::sleep(std::time::Duration::from_secs(100000));

ibigbug · 2023-12-25T12:26:18Z

clash_lib/src/config/internal/proxy.rs

@@ -368,3 +371,53 @@ impl TryFrom<HashMap<String, Value>> for OutboundProxyProviderDef {
            .map_err(map_serde_error)
    }
 }
+
+//   #hysteria2


would be great if you can convert these into the standard doc comment https://doc.rust-lang.org/rust-by-example/meta/doc.html

so that we might use them in future to generate the API references

ibigbug · 2023-12-25T12:27:24Z

clash_lib/src/proxy/hysteria2/congestion.rs

+
+struct Burtal;
+
+impl Controller for Burtal {


is this used any where?

ibigbug · 2023-12-25T12:28:08Z

clash_lib/src/proxy/hysteria2/congestion.rs

+
+use quinn_proto::congestion::{Bbr, BbrConfig, Controller, ControllerFactory};
+
+pub struct DynCongestion;


is this file used at all?

The current protocol still needs to implement the congestion algorithm and udp proxy. I will fix this part of the code next week.

can not wait it

can not wait it

哥们尽快吧，主要是最近比较忙，还生病了。
另外rust的quinn拥塞算法接口和go的那边还不一样，go这边有现成的，rust没有，工作还比较多。

身体要紧。
如果有什么问题可以分享出来大家一起看。

谢谢关心。目前就是拥塞算法，对照着go版本hysteria的brutal拥塞算法，它那里是计算丢包个数再进行调整发送速率，quinn接口只有丢包字节数，我问一下这个issue，目前还在看，不知道是否有更好的方法

我看有回复，如果他的说法可行，提个PR？

can not wait it

eauxxs · 2023-12-28T09:49:53Z

@eauxxs the build is failed on Windows

It looks like the problem is with borrowing-ssl, can we remove deps directory, and use boring crate directly, why it is necessary?

ibigbug · 2023-12-31T16:02:05Z

@eauxxs the build is failed on Windows

It looks like the problem is with borrowing-ssl, can we remove deps directory, and use boring crate directly, why it is necessary?

the forked boring added aes and this #240 removes it

hysteria draft

0f31780

ibigbug reviewed Dec 17, 2023

View reviewed changes

add hysteria2 salamander

876b2bf

eauxxs mentioned this pull request Dec 18, 2023

hysteria2有在支持的计划内吗 #218

Open

fix salamander obfs recv packet

2446d80

add hysteria2 port hopping

6b3cc61

Merge branch 'master' into hysteria2-draft

70ad8da

Signed-off-by: Yuwei Ba <[email protected]>

ibigbug requested changes Dec 25, 2023

View reviewed changes

update

45abf2a

ibigbug mentioned this pull request Dec 31, 2023

known transports/protocols (unimplemented) #190

Open

update

42bd7f2

ibigbug changed the title ~~hysteria draft~~ feat: hysteria draft May 10, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: hysteria draft #217

feat: hysteria draft #217

eauxxs commented Dec 16, 2023

ibigbug Dec 17, 2023

eauxxs Dec 17, 2023

eauxxs commented Dec 17, 2023

greenhat616 commented Dec 18, 2023

eauxxs commented Dec 19, 2023

ibigbug commented Dec 25, 2023

ibigbug commented Dec 25, 2023

ibigbug Dec 25, 2023

ibigbug Dec 25, 2023

ibigbug Dec 25, 2023

ibigbug Dec 25, 2023

ibigbug Dec 25, 2023

ibigbug Dec 25, 2023

eauxxs Dec 26, 2023

ibigbug Dec 25, 2023

ibigbug Dec 25, 2023

ibigbug Dec 25, 2023

ibigbug Dec 25, 2023

eauxxs Dec 26, 2023

captainnx Dec 28, 2023

eauxxs Dec 29, 2023

ibigbug Dec 29, 2023

eauxxs Dec 30, 2023

ibigbug Dec 30, 2023

ghost Mar 13, 2024

eauxxs commented Dec 28, 2023

ibigbug commented Dec 31, 2023 •

edited

Loading

	Hysteria2(OutboundHysteria2),
	#[serde(rename = "hysteria2")]
	Hysteria2(OutboundHysteria2),


		use crate::proxy::converters::hysteria2::PortGenrateor;

		pub struct UdpHop {


		use quinn_proto::congestion::{Bbr, BbrConfig, Controller, ControllerFactory};

		pub struct DynCongestion;

feat: hysteria draft #217

Are you sure you want to change the base?

feat: hysteria draft #217

Conversation

eauxxs commented Dec 16, 2023

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self-Check before Merge

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eauxxs commented Dec 17, 2023

greenhat616 commented Dec 18, 2023

eauxxs commented Dec 19, 2023

ibigbug commented Dec 25, 2023

ibigbug commented Dec 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eauxxs commented Dec 28, 2023

ibigbug commented Dec 31, 2023 • edited Loading

ibigbug commented Dec 31, 2023 •

edited

Loading