stop_service command, fix

rust/Cargo.lock

@@ -157,6 +157,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.42"
@@ -550,6 +556,18 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -1188,6 +1206,7 @@ dependencies = [
  "libc",
  "libnfqws",
  "log",
+ "nix",
  "once_cell",
  "pretty_env_logger",
  "procfs",

rust/Cargo.toml

@@ -23,3 +23,4 @@ once_cell = "1.21.3"
 daemonize = "0.5.0"
 log = "0.4.28"
 pretty_env_logger = "0.5.0"
+nix = { version = "0.30.1", features = ["signal"] }

rust/crates/zaprett/Cargo.toml

@@ -21,3 +21,4 @@ libnfqws = { path = "../libnfqws" }
 daemonize = { workspace = true }
 pretty_env_logger = { workspace = true }
 log = { workspace = true }
+nix = { workspace = true }

rust/crates/zaprett/src/main.rs

@@ -1,11 +1,11 @@
-// mod libnfqws;
-
 use anyhow::bail;
 use clap::{ArgAction, Parser, Subcommand, builder::BoolishValueParser};
 use daemonize::Daemonize;
 use ini::Ini;
 use libnfqws::nfqws_main;
 use log::{error, info};
+use nix::sys::signal::{Signal, kill};
+use nix::unistd::Pid;
 use procfs::process::all_processes;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
@@ -15,9 +15,8 @@ use std::io::BufReader;
 use std::io::{Read, Write};
 use std::os::raw::c_char;
 use std::sync::LazyLock;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::{fs, path::Path};
-use sysctl::{CtlValue, Sysctl};
+use sysctl::Sysctl;
 use tokio::task;
 
 #[derive(Parser)]
@@ -86,8 +85,17 @@ async fn main() {
     match &cli.cmd {
         Some(Commands::Start) => start_service().await,
         Some(Commands::Stop) => stop_service(),
-        Some(Commands::Restart) => restart_service(),
+        Some(Commands::Restart) => restart_service().await,
-        Some(Commands::Status) => service_status(),
+        Some(Commands::Status) => {
+            println!(
+                "zaprett is {}",
+                if service_status() {
+                    "working"
+                } else {
+                    "stopped"
+                }
+            )
+        }
         Some(Commands::SetAutostart { autostart }) => set_autostart(autostart),
         Some(Commands::GetAutostart) => get_autostart(),
         Some(Commands::ModuleVer) => module_version(),
@@ -117,11 +125,13 @@ async fn start_service() {
 
     let tmp_dir = MODULE_PATH.join("tmp");
     if tmp_dir.exists() {
-        fs::remove_dir_all(&tmp_dir).unwrap()
+        fs::remove_dir_all(&tmp_dir).unwrap();
+        fs::create_dir_all(&tmp_dir).unwrap();
     }
 
-    let reader =
+    let reader = BufReader::new(
-        BufReader::new(File::open("/sdcard/zaprett/config.json").expect("cannot open config.json"));
+        File::open(ZAPRETT_DIR_PATH.join("config.json")).expect("cannot open config.json"),
+    );
     let config: Config = serde_json::from_reader(reader).expect("invalid json");
 
     let list_type: &String = &config.list_type;
@@ -207,7 +217,7 @@ async fn start_service() {
     }
 
     let ctl = sysctl::Ctl::new("net.netfilter.nf_conntrack_tcp_be_liberal").unwrap();
-    ctl.set_value(CtlValue::Int(1)).unwrap();
+    ctl.set_value(sysctl::CtlValue::String("1".into())).unwrap();
 
     setup_iptables_rules();
     daemonize_nfqws(&strat_modified).await;
@@ -216,12 +226,25 @@ async fn start_service() {
 
 fn stop_service() {
     clear_iptables_rules();
-    todo!()
+    for proc in all_processes().unwrap() {
+        if let Ok(p) = proc {
+            if let Ok(stat) = p.stat() {
+                if stat.comm == "zaprett" {
+                    let pid = Pid::from_raw(p.pid as i32);
+                    if let Err(_) = kill(pid, Signal::SIGTERM) {
+                        println!("failed to stop zaprett service")
+                    } else {
+                        println!("zaprett service stopped!")
+                    }
+                }
+            }
+        }
+    }
 }
 
-fn restart_service() {
+async fn restart_service() {
     stop_service();
-    start_service();
+    start_service().await;
     println!("zaprett service restarted!")
 }
 
@@ -240,16 +263,14 @@ fn get_autostart() {
     println!("{}", file.exists());
 }
 
-fn service_status() {
+fn service_status() -> bool {
-    let running = match all_processes() {
+    match all_processes() {
         Ok(iter) => iter
             .filter_map(|rp| rp.ok())
             .filter_map(|p| p.stat().ok())
-            .any(|st| st.comm == "nfqws"),
+            .any(|st| st.comm == "zaprett"),
         Err(_) => false,
-    };
+    }
-
-    println!("zaprett is {}", if running { "working" } else { "stopped" });
 }
 
 fn module_version() {
@@ -347,9 +368,7 @@ fn clear_iptables_rules() {
 }
 
 async fn run_nfqws(args_str: &String) -> anyhow::Result<()> {
-    static RUNNING: AtomicBool = AtomicBool::new(false);
+    if service_status() {
-
-    if RUNNING.swap(true, Ordering::SeqCst) {
         bail!("nfqws already started!");
     }
 
@@ -373,8 +392,6 @@ async fn run_nfqws(args_str: &String) -> anyhow::Result<()> {
         unsafe {
             nfqws_main(c_args.len() as libc::c_int, ptrs.as_mut_ptr() as *mut _);
         }
-
-        RUNNING.store(false, Ordering::SeqCst);
     })
     .await?;