fix ffi subscription format mismatch

YtFlow · Mar 15, 2024 · 54c8cc2 · 54c8cc2
1 parent b10b311
commit 54c8cc2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ytflow-app-util/src/ffi/subscription.rs b/ytflow-app-util/src/ffi/subscription.rs
@@ -44,7 +44,7 @@ pub unsafe extern "C" fn ytflow_app_subscription_decode_with_format(
 ) -> ytflow_result {
     ytflow_result::catch_result_unwind(AssertUnwindSafe(move || {
         let subscription = std::slice::from_raw_parts(subscription, subscription_len);
-        let format = SubscriptionFormat(CStr::from_ptr(format).to_bytes());
+        let format = SubscriptionFormat(CStr::from_ptr(format).to_bytes_with_nul());
         decode_subscription_with_format(subscription, format).map(|s| serialize_buffer(&s))
     }))
 }
diff --git a/ytflow-app-util/src/proxy/data/compose_v1.rs b/ytflow-app-util/src/proxy/data/compose_v1.rs
@@ -114,7 +114,7 @@ fn encode_protocol(
             plugin: "shadowsocks-client".into(),
             plugin_version: 0,
             param: to_cbor(cbor!({
-                "cipher" => ss.cipher,
+                "method" => ss.cipher,
                 "password" => &ss.password,
                 "tcp_next" => tcp_next,
                 "udp_next" => udp_next,

diff --git a/ytflow-app-util/src/proxy/data/v1/analyzer.rs b/ytflow-app-util/src/proxy/data/v1/analyzer.rs
@@ -209,15 +209,15 @@ impl<'p> Analyzer<'p> {
             "shadowsocks-client" => {
                 #[derive(Deserialize)]
                 struct ShadowsocksConfig<'a> {
-                    cipher: SupportedCipher,
+                    method: SupportedCipher,
                     password: ByteBuf,
                     tcp_next: &'a str,
                     udp_next: &'a str,
                 }
                 let ss: ShadowsocksConfig = deserialize_plugin_param(plugin)?;
                 (
                     ProxyProtocolType::Shadowsocks(ShadowsocksProxy {
-                        cipher: ss.cipher,
+                        cipher: ss.method,
                         password: ss.password,
                     }),
                     ss.tcp_next,
@@ -623,7 +623,7 @@ mod tests {
                 plugin: "shadowsocks-client".into(),
                 plugin_version: 0,
                 param: to_cbor(cbor!({
-                    "cipher" => SupportedCipher::Aes128Gcm,
+                    "method" => SupportedCipher::Aes128Gcm,
                     "password" => ByteBuf::new(),
                     "tcp_next" => "b.tcp",
                     "udp_next" => "c.udp",
@@ -696,7 +696,7 @@ mod tests {
                     plugin: "shadowsocks-client".into(),
                     plugin_version: 0,
                     param: to_cbor(cbor!({
-                        "cipher" => SupportedCipher::Aes128Gcm,
+                        "method" => SupportedCipher::Aes128Gcm,
                         "password" => ByteBuf::new(),
                         "tcp_next" => "b.tcp",
                         "udp_next" => "b.udp",
@@ -720,7 +720,7 @@ mod tests {
                     plugin: "shadowsocks-client".into(),
                     plugin_version: 0,
                     param: to_cbor(cbor!({
-                        "cipher" => SupportedCipher::Aes128Gcm,
+                        "method" => SupportedCipher::Aes128Gcm,
                         "password" => ByteBuf::new(),
                         "tcp_next" => "d.tcp",
                         "udp_next" => "d.udp",
@@ -760,7 +760,7 @@ mod tests {
                     plugin: "shadowsocks-client".into(),
                     plugin_version: 0,
                     param: to_cbor(cbor!({
-                        "cipher" => SupportedCipher::Aes128Gcm,
+                        "method" => SupportedCipher::Aes128Gcm,
                         "password" => ByteBuf::new(),
                         "tcp_next" => "b.tcp",
                         "udp_next" => "b.udp",
@@ -784,7 +784,7 @@ mod tests {
                     plugin: "shadowsocks-client".into(),
                     plugin_version: 0,
                     param: to_cbor(cbor!({
-                        "cipher" => SupportedCipher::Aes128Gcm,
+                        "method" => SupportedCipher::Aes128Gcm,
                         "password" => ByteBuf::new(),
                         "tcp_next" => "$out.tcp",
                         "udp_next" => "$out.udp",