Updated to next branch

pull/7/head
ko1N 4 years ago
parent c098181407
commit 2a3f0b9c4d

@ -3,6 +3,7 @@
#![allow(non_camel_case_types)] #![allow(non_camel_case_types)]
#![allow(improper_ctypes)] #![allow(improper_ctypes)]
#![allow(clippy::missing_safety_doc)] #![allow(clippy::missing_safety_doc)]
#![allow(clippy::redundant_static_lifetimes)]
include!(concat!(env!("OUT_DIR"), "/leechcore.rs")); include!(concat!(env!("OUT_DIR"), "/leechcore.rs"));

@ -16,7 +16,7 @@ categories = [ "api-bindings", "memory-management", "os" ]
crate-type = ["lib", "cdylib"] crate-type = ["lib", "cdylib"]
[dependencies] [dependencies]
memflow = { git = "https://github.com/memflow/memflow", branch = "next", features = ["inventory", "serde_derive"] } memflow = { git = "https://github.com/memflow/memflow", branch = "next", features = ["inventory", "memmapfiles"] }
log = { version = "0.4", default-features = false } log = { version = "0.4", default-features = false }
simple_logger = "1.0" simple_logger = "1.0"
leechcore-sys = { path = "../leechcore-sys" } leechcore-sys = { path = "../leechcore-sys" }

@ -3,7 +3,7 @@ use std::time::Instant;
use log::{info, Level}; use log::{info, Level};
use memflow::*; use memflow::prelude::v1::*;
fn main() { fn main() {
simple_logger::SimpleLogger::new() simple_logger::SimpleLogger::new()

@ -9,8 +9,8 @@ use std::sync::{Arc, Mutex};
use log::{error, info}; use log::{error, info};
use memflow::*; use memflow::prelude::v1::*;
use memflow_derive::connector; use memflow::derive::connector;
use leechcore_sys::*; use leechcore_sys::*;
@ -66,6 +66,7 @@ impl Clone for PciLeech {
} }
// TODO: proper drop + free impl -> LcMemFree(pLcErrorInfo); // TODO: proper drop + free impl -> LcMemFree(pLcErrorInfo);
#[allow(clippy::mutex_atomic)]
impl PciLeech { impl PciLeech {
pub fn new(device: &str) -> Result<Self> { pub fn new(device: &str) -> Result<Self> {
Self::with_mapping(device, MemoryMap::new()) Self::with_mapping(device, MemoryMap::new())
@ -337,7 +338,7 @@ impl PhysicalMemory for PciLeech {
} }
/// Creates a new PciLeech Connector instance. /// Creates a new PciLeech Connector instance.
#[connector(name = "pcileech")] #[connector(name = "pcileech", ty = " PciLeech")]
pub fn create_connector(args: &ConnectorArgs) -> Result<PciLeech> { pub fn create_connector(args: &ConnectorArgs) -> Result<PciLeech> {
let device = args let device = args
.get("device") .get("device")

Loading…
Cancel
Save