Skip to content

Commit

Permalink
refactor: use sys and node lib
Browse files Browse the repository at this point in the history
  • Loading branch information
@JiLiZART
JiLiZART committed Feb 2, 2024
1 parent f56616d commit 800f4c0
Show file tree
Hide file tree
Showing 8 changed files with 201 additions and 272 deletions.
8 changes: 0 additions & 8 deletions bncsutil-bindgen/Cargo.toml
View file

This file was deleted.

42 changes: 0 additions & 42 deletions bncsutil-bindgen/src/main.rs
View file

This file was deleted.

2 changes: 0 additions & 2 deletions bncsutil-bindgen/src/wrapper.hpp
View file

This file was deleted.

5 changes: 0 additions & 5 deletions bncsutil-sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ name = "bncsutil-sys"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
libc = "0.2"

[build-dependencies]
bindgen = "0.69.2"
cmake = "0.1"
Expand Down
207 changes: 0 additions & 207 deletions bncsutil-sys/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,210 +3,3 @@
#![allow(non_snake_case)]

include!(concat!(env!("OUT_DIR"), "/bindings.rs"));

extern crate libc;

use std::ffi::CString;
use std::os::raw::c_char;
use std::path::Path;

pub fn version() -> u64 {
unsafe { bncsutil_getVersion() }
}

pub fn version_string() -> String {
unsafe {
let mut exe_info_vec: Vec<i8> = vec![0i8; 1024];
let exe_info_slice = exe_info_vec.as_mut_slice();
let exe_info_ptr = exe_info_slice.as_mut_ptr();
let length = bncsutil_getVersionString(exe_info_ptr);
let exe_info_string =
String::from_utf8(exe_info_slice.iter().map(|&c| c as u8).collect()).unwrap();
let exe_info: String = exe_info_string.chars().take(length as usize).collect();

exe_info
}
}

pub fn get_exe_info(path: &Path) -> (i32, String, u32) {
unsafe {
let path_str = path.to_str().unwrap();

let s = CString::new(path_str).unwrap();
let ptr = s.as_ptr();
let mut exe_version: u32 = 0;
let mut exe_info_vec: Vec<i8> = vec![0i8; 1024];
let exe_info_slice = exe_info_vec.as_mut_slice();
let exe_info_ptr = exe_info_slice.as_mut_ptr();
let length = getExeInfo(ptr, exe_info_ptr, 1024 as usize, &mut exe_version, 1 as i32);
let exe_info_string =
String::from_utf8(exe_info_slice.iter().map(|&c| c as u8).collect()).unwrap();
let exe_info: String = exe_info_string.chars().take(length as usize).collect();

(length, exe_info, exe_version)
}
}

pub fn check_revision(value: String, files: Vec<&Path>, mpq_number: i32) -> u32 {
unsafe {
let files_str = files
.iter()
.map(|val| CString::new(val.to_str().unwrap()).unwrap())
.collect::<Vec<CString>>();
let mut files_ptr = files_str
.iter() // do NOT into_iter()
.map(|arg| arg.as_ptr())
.collect::<Vec<*const c_char>>();

let value_cstr = CString::new(value).unwrap();

let mut result: u64 = 0;

let error_code = checkRevision(
value_cstr.as_ptr(),
files_ptr.as_mut_ptr(),
files_str.len() as i32,
mpq_number,
&mut result,
);

println!("result {:?}", result as u32);

result as u32
}
}

pub fn check_revision_flat(
value: String,
file1: &Path,
file2: &Path,
file3: &Path,
mpq_number: i32,
) -> u32 {
unsafe {
let file1_str = CString::new(file1.to_str().unwrap()).unwrap();
let file2_str = CString::new(file2.to_str().unwrap()).unwrap();
let file3_str = CString::new(file3.to_str().unwrap()).unwrap();

let value_cstr = CString::new(value).unwrap();
let mut result: u64 = 0;

let error_code = checkRevisionFlat(
value_cstr.as_ptr(),
file1_str.as_ptr(),
file2_str.as_ptr(),
file3_str.as_ptr(),
mpq_number,
&mut result,
);

result as u32
}
}

// { CDKey: 'FFFFFFFFFFFFFFFFFFFFFFFFFF', clientToken: 130744796, serverToken: 1655005115 } { publicValue: 10992493, product: 5650, hash: '0 0 0 0 0 0 0 0' }
pub fn keydecode_quick(
cd_key: String,
client_token: u32,
server_token: u32,
) -> (u32, u32, Vec<u8>) {
unsafe {
let cd_key_str = CString::new(cd_key).unwrap();
let mut public_value: u32 = 0;
let mut product: u32 = 0;
let mut hash_buffer_vec: Vec<i8> = vec![0i8; 20];
let hash_buffer_slice = hash_buffer_vec.as_mut_slice();
let hash_buffer_ptr = hash_buffer_slice.as_mut_ptr();

let status = kd_quick(
cd_key_str.as_ptr(),
client_token,
server_token,
&mut public_value,
&mut product,
hash_buffer_ptr,
20 as usize,
);

if status == 0 {
panic!("Failed to kd_quick")
}

let hash_buffer_char_vec: Vec<u8> = hash_buffer_slice.iter().map(|&c| c as u8).collect();

// let hash_buffer_string = String::from_utf8(hash_buffer_char_vec).expect("Failed to convert hash to string");

(public_value, product, hash_buffer_char_vec)
}
}

#[cfg(test)]
mod bncs_tests {
use super::*;

#[test]
fn test_version() {
assert_eq!(version(), 10300);
}

#[test]
fn test_version_string() {
assert_eq!(version_string(), "1.3.0");
}

#[test]
fn test_get_exe_info() {
let path = Path::new("../mock/war3.exe");
let info = String::from("war3.exe 12/09/16 06:05:09 515048");

assert_eq!(get_exe_info(path), (33 as i32, info, 18547117 as u32));
}

#[test]
fn test_check_revision_flat() {
let value = String::from("B=454282227 C=2370009462 A=2264812340 4 A=A^S B=B-C C=C-A A=A+B");
let file1 = Path::new("../mock/war3.exe");
let file2 = Path::new("../mock/Storm.dll");
let file3 = Path::new("../mock/game.dll");

assert_eq!(
check_revision_flat(value, file1, file2, file3, 1),
1076278704 as u32
)
}

#[test]
fn test_check_revision() {
let value = String::from("B=454282227 C=2370009462 A=2264812340 4 A=A^S B=B-C C=C-A A=A+B");
let file1 = Path::new("../mock/war3.exe");
let files = vec![file1];

assert_eq!(check_revision(value, files, 1), 3796461076 as u32)
}

// {
// CDKey: 'FFFFFFFFFFFFFFFFFFFFFFFFFF',
// clientToken: 130744796,
// serverToken: 2115470359 } {
// publicValue: 10992493,
// product: 5650, hash: '81 78 135 115 190 107 211 30 62 86 64 112 162 230 136 132 198 76 8 165
#[test]
fn test_keydecode_quick() {
let cd_key = String::from("FFFFFFFFFFFFFFFFFFFFFFFFFF");
let client_token: u32 = 130744796;
let server_token: u32 = 2115470359;
let result_vec: Vec<u8> = vec![
81, 78, 135, 115, 190, 107, 211, 30, 62, 86, 64, 112, 162, 230, 136, 132, 198, 76, 8,
165,
];
// let result_hash = String::from("0 0 0 0 0 0 0 0");
let (public_value, product, hash) = keydecode_quick(cd_key, client_token, server_token);

println!("jkeycode qucik {:?} {:?} {:?}", public_value, product, hash);

assert_eq!(
(public_value, product, hash),
(10992493 as u32, 5650 as u32, result_vec)
)
}
}
2 changes: 0 additions & 2 deletions bncsutil-sys/src/wrapper.hpp
View file

This file was deleted.

2 changes: 2 additions & 0 deletions bncsutil/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bncsutil-sys = { path = "../bncsutil-sys" }
libc = "0.2"
Loading

0 comments on commit 800f4c0

Please sign in to comment.