From 9ee8c33fc4b1849ec99fe7abf9710aabc604058f Mon Sep 17 00:00:00 2001
From: ko1N <ko1N1337@gmail.com>
Date: Fri, 24 Dec 2021 14:49:08 +0100
Subject: [PATCH] Updated to latest memflow/next

---
 memflow-pcileech/src/lib.rs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/memflow-pcileech/src/lib.rs b/memflow-pcileech/src/lib.rs
index a6cbd37..9ba851d 100644
--- a/memflow-pcileech/src/lib.rs
+++ b/memflow-pcileech/src/lib.rs
@@ -119,12 +119,11 @@ impl PhysicalMemory for PciLeech {
     fn phys_read_raw_iter<'a>(
         &mut self,
         data: CIterator<PhysicalReadData<'a>>,
-        out_fail: &mut PhysicalReadFailCallback<'_, 'a>,
+        out_fail: &mut ReadFailCallback<'_, 'a>,
     ) -> Result<()> {
         let vec = if let Some(mem_map) = &self.mem_map {
-            let mut callback = &mut |(a, b): (Address, _)| out_fail.call(MemData(a.into(), b));
             mem_map
-                .map_iter(data.map(|MemData(addr, buf)| (addr, buf)), &mut callback)
+                .map_iter(data, out_fail)
                 .map(|d| (d.0 .0.into(), d.1))
                 .collect::<Vec<_>>()
         } else {
@@ -246,12 +245,11 @@ impl PhysicalMemory for PciLeech {
     fn phys_write_raw_iter<'a>(
         &mut self,
         data: CIterator<PhysicalWriteData<'a>>,
-        out_fail: &mut PhysicalWriteFailCallback<'_, 'a>,
+        out_fail: &mut WriteFailCallback<'_, 'a>,
     ) -> Result<()> {
         let vec = if let Some(mem_map) = &self.mem_map {
-            let mut callback = &mut |(a, b): (Address, _)| out_fail.call(MemData(a.into(), b));
             mem_map
-                .map_iter(data.map(|MemData(addr, buf)| (addr, buf)), &mut callback)
+                .map_iter(data, out_fail)
                 .map(|d| (d.0 .0.into(), d.1))
                 .collect::<Vec<_>>()
         } else {
@@ -416,26 +414,24 @@ impl PhysicalMemory for PciLeech {
 
 fn validator() -> ArgsValidator {
     ArgsValidator::new()
-        .arg(ArgDescriptor::new("default").description("the target device to be used by LeechCore"))
         .arg(ArgDescriptor::new("device").description("the target device to be used by LeechCore"))
         .arg(ArgDescriptor::new("memmap").description("the memory map file of the target machine"))
 }
 
 /// Creates a new PciLeech Connector instance.
 #[connector(name = "pcileech", help_fn = "help", target_list_fn = "target_list")]
-pub fn create_connector(args: &Args) -> Result<PciLeech> {
+pub fn create_connector(args: &ConnectorArgs) -> Result<PciLeech> {
     let validator = validator();
-    match validator.validate(args) {
+    match validator.validate(&args.extra_args) {
         Ok(_) => {
-            let device = args
+            let device = args.extra_args
                 .get("device")
-                .or_else(|| args.get_default())
                 .ok_or_else(|| {
                     Error(ErrorOrigin::Connector, ErrorKind::ArgValidation)
                         .log_error("'device' argument is missing")
                 })?;
 
-            if let Some(memmap) = args.get("memmap") {
+            if let Some(memmap) = args.extra_args.get("memmap") {
                 PciLeech::with_mem_map_file(device, memmap)
             } else {
                 PciLeech::new(device)