setting manager's method from configuration

fixes #542
shadowsocks · May 29, 2021 · 6c2a173 · 6c2a173
1 parent b23bbf2
commit 6c2a173
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/crates/shadowsocks-service/src/config.rs b/crates/shadowsocks-service/src/config.rs
@@ -1147,7 +1147,7 @@ impl Config {
 
         // Standard config
         // Server
-        match (config.server, config.server_port, config.password, config.method) {
+        match (config.server, config.server_port, config.password, &config.method) {
             (Some(address), Some(port), Some(pwd), Some(m)) => {
                 let addr = match address.parse::<Ipv4Addr>() {
                     Ok(v4) => ServerAddr::SocketAddr(SocketAddr::V4(SocketAddrV4::new(v4, port))),
@@ -1191,6 +1191,9 @@ impl Config {
 
                 nconfig.server.push(nsvr);
             }
+            (None, None, None, Some(_)) if config_type.is_manager() => {
+                // Set the default method for manager
+            }
             (None, None, None, None) => (),
             _ => {
                 let err = Error::new(
@@ -1326,6 +1329,21 @@ impl Config {
 
             let mut manager_config = ManagerConfig::new(manager);
             manager_config.mode = global_mode;
+
+            if let Some(ref m) = config.method {
+                match m.parse::<CipherKind>() {
+                    Ok(method) => manager_config.method = Some(method),
+                    Err(..) => {
+                        let err = Error::new(
+                            ErrorKind::Invalid,
+                            "unsupported method",
+                            Some(format!("`{}` is not a supported method", m)),
+                        );
+                        return Err(err);
+                    }
+                }
+            }
+
             nconfig.manager = Some(manager_config);
         }