Batyka/zaprett
1
0
Fork 0
mirror of https://github.com/egor-white/zaprett.git synced 2026-03-22 00:18:13 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

static link some libs + fix run nfqws function

Browse Source
This commit is contained in:
CherretGit
2026-03-16 23:15:38 +07:00
parent c050ee22b8
commit 15b15f4932
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rust/crates/libnfqws/CMakeLists.txt
View File

@@ -25,10 +25,11 @@ if(ANDROID)
endif()
target_link_libraries(nfqws PRIVATE
$ENV{NETFILTER_LIBS}/lib/libnetfilter_queue.a
$ENV{NETFILTER_LIBS}/lib/libnfnetlink.a
$ENV{NETFILTER_LIBS}/lib/libmnl.a
z
netfilter_queue
nfnetlink
mnl
unwind
)
install(TARGETS nfqws

10
rust/crates/libnfqws2/CMakeLists.txt
View File

@@ -23,12 +23,12 @@ if(ANDROID)
endif()
target_link_libraries(nfqws2 PRIVATE
z
netfilter_queue
nfnetlink
mnl
unwind
$ENV{NETFILTER_LIBS}/lib/libnetfilter_queue.a
$ENV{NETFILTER_LIBS}/lib/libnfnetlink.a
$ENV{NETFILTER_LIBS}/lib/libmnl.a
$ENV{LUAJIT_LIBS}/lib/libluajit-5.1.a
z
unwind
)
install(TARGETS nfqws2

18
rust/crates/zaprett/src/lib.rs
View File

@@ -137,10 +137,15 @@ fn run_nfqws(args_str: &str) -> anyhow::Result<()> {
.map(|arg| CString::new(arg).unwrap())
.collect();
let mut ptrs: Vec<*const c_char> = c_args.iter().map(|arg| arg.as_ptr()).collect();
let mut ptrs: Vec<*mut c_char> = c_args
.iter()
.map(|arg| arg.as_ptr() as *mut c_char)
.collect();
ptrs.push(std::ptr::null_mut());
unsafe {
nfqws_main(c_args.len() as libc::c_int, ptrs.as_mut_ptr() as *mut _);
nfqws_main(c_args.len() as libc::c_int, ptrs.as_mut_ptr());
}
Ok(())
@@ -165,10 +170,15 @@ fn run_nfqws2(args_str: &str) -> anyhow::Result<()> {
.map(|arg| CString::new(arg).unwrap())
.collect();
let mut ptrs: Vec<*const c_char> = c_args.iter().map(|arg| arg.as_ptr()).collect();
let mut ptrs: Vec<*mut c_char> = c_args
.iter()
.map(|arg| arg.as_ptr() as *mut c_char)
.collect();
ptrs.push(std::ptr::null_mut());
unsafe {
nfqws2_main(c_args.len() as libc::c_int, ptrs.as_mut_ptr() as *mut _);
nfqws2_main(c_args.len() as libc::c_int, ptrs.as_mut_ptr());
}
Ok(())