update dependencies

Author: yaa110

.github/workflows/build.yml

@@ -10,12 +10,10 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
           components: rustfmt, clippy
-      - run: sudo -E `which cargo` test -j`nproc` -- --test-threads 1
-      - run: sudo -E `which cargo` test -j`nproc` -- --ignored --test-threads 1
+      - run: sudo -E `which cargo` test -- --test-threads 1
+      - run: sudo -E `which cargo` test -- --ignored --test-threads 1
       - run: sudo -E `which cargo` fmt -- --check
-      - run: sudo -E `which cargo` clippy -j`nproc`

.github/workflows/publish.yml

@@ -0,0 +1,26 @@
+name: Publish to Crates.io
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - run: cargo login ${{ secrets.CRATES_IO_TOKEN }}
+      - run: cargo package
+      - run: cargo publish
+  release:
+    runs-on: ubuntu-latest
+    needs: [publish]
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: create release
+        run: gh release create "${{ github.ref_name }}" -t "${{ github.ref_name }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -10,12 +10,11 @@ license = "MIT"
 name = "iptables"
 readme = "README.md"
 repository = "https://github.com/yaa110/rust-iptables"
-version = "0.5.3"
+version = "0.6.0"
 
 [lib]
 name = "iptables"
 
 [dependencies]
 lazy_static = "1"
-nix = {version = "0.29", features = ["fs"]}
 regex = "1"

src/lib.rs

@@ -18,13 +18,10 @@ pub mod error;
 
 use error::IptablesError;
 use lazy_static::lazy_static;
-use nix::fcntl::{FlockArg, flock};
 use regex::{Match, Regex};
 use std::convert::From;
 use std::error::Error;
 use std::ffi::OsStr;
-use std::fs::File;
-use std::os::unix::io::AsRawFd;
 use std::process::{Command, Output};
 use std::vec::Vec;
 
@@ -407,38 +404,15 @@ impl IPTables {
     }
 
     fn run<S: AsRef<OsStr>>(&self, args: &[S]) -> Result<Output, Box<dyn Error>> {
-        let mut file_lock = None;
-
         let mut output_cmd = Command::new(self.cmd);
         let output;
 
         if self.has_wait {
             output = output_cmd.args(args).arg("--wait").output()?;
         } else {
-            file_lock = Some(File::create("/var/run/xtables_old.lock")?);
-
-            let mut need_retry = true;
-            while need_retry {
-                match flock(
-                    file_lock.as_ref().unwrap().as_raw_fd(),
-                    FlockArg::LockExclusiveNonblock,
-                ) {
-                    Ok(_) => need_retry = false,
-                    Err(e) if e == nix::errno::Errno::EAGAIN => {
-                        // FIXME: may cause infinite loop
-                        need_retry = true;
-                    }
-                    Err(e) => {
-                        return Err(Box::new(e));
-                    }
-                }
-            }
             output = output_cmd.args(args).output()?;
         }
 
-        if let Some(f) = file_lock {
-            drop(f)
-        }
         Ok(output)
     }
 }