Merge pull request #39 from AvivNaaman/34-add-support-for-smb-specific-ioctls

34 add support for smb specific ioctls

Author: afiffon

smb-cli/src/info.rs

@@ -1,10 +1,7 @@
 use crate::{path::*, Cli};
 use clap::Parser;
 use maybe_async::*;
-use smb::{
-    packets::smb2::{FileBasicInformation, FileIdBothDirectoryInformation},
-    resource::Resource,
-};
+use smb::{packets::fscc::*, resource::Resource};
 use std::error::Error;
 #[derive(Parser, Debug)]
 pub struct InfoCmd {

smb-cli/src/path.rs

@@ -2,7 +2,7 @@ use crate::cli::Cli;
 use maybe_async::*;
 use smb::{
     connection::{Connection, EncryptionMode},
-    packets::smb2::*,
+    packets::{fscc::*, smb2::*},
     resource::Resource,
     session::Session,
     tree::Tree,

smb/src/packets.rs

@@ -1,5 +1,7 @@
 pub mod binrw_util;
+pub mod fscc;
 pub mod guid;
 pub mod netbios;
+pub mod security;
 pub mod smb1;
 pub mod smb2;

smb/src/packets/binrw_util/pos_marker.rs

@@ -287,6 +287,28 @@ where
         )
     }
 
+    /// Writer for value
+    /// * fill absolute offset to offset location.
+    /// * with value args.
+    #[binrw::writer(writer, endian)]
+    pub fn write_aoff_a<U>(
+        value: &U,
+        write_offset_to: &Self,
+        value_args: U::Args<'_>,
+    ) -> BinResult<()>
+    where
+        U: BinWrite,
+    {
+        let no_size: Option<&PosMarker<T>> = None;
+        let no_base: Option<&PosMarker<T>> = None;
+        Self::write_hero(
+            value,
+            writer,
+            endian,
+            (no_size, Some(write_offset_to), no_base, value_args),
+        )
+    }
+
     #[binrw::writer(writer, endian)]
     pub fn write_roff_size<U, S>(
         value: &U,

smb/src/packets/smb2/fscc.rs smb/src/packets/fscc.rssmb/src/packets/smb2/fscc.rs renamed to smb/src/packets/fscc.rs

@@ -5,7 +5,7 @@ use crate::access_mask;
 use binrw::{io::TakeSeekExt, meta::ReadEndian, prelude::*};
 use modular_bitfield::prelude::*;
 
-use super::{super::binrw_util::prelude::*, SID};
+use super::{binrw_util::prelude::*, security::SID};
 pub mod chained_item;
 pub mod common_info;
 pub mod directory_info;
@@ -198,7 +198,7 @@ macro_rules! file_info_classes {
                 }
             }
 
-            impl crate::packets::smb2::fscc::FileInfoType for $name {
+            impl crate::packets::fscc::FileInfoType for $name {
                 type Class = [<$name Class>];
                 fn class(&self) -> Self::Class {
                     match self {
@@ -220,7 +220,7 @@ macro_rules! file_info_classes {
                     type Error = crate::Error;
 
                     fn try_from(value: $name) -> Result<Self, Self::Error> {
-                        pub use crate::packets::smb2::fscc::FileInfoType;
+                        pub use crate::packets::fscc::FileInfoType;
                         match value {
                             $name::[<$field_name Information>](v) => Ok(v),
                             _ => Err(crate::Error::UnexpectedInformationType(<Self as [<$name Value>]>::CLASS_ID as u8, value.class() as u8)),

smb/src/packets/smb2/fscc/chained_item.rs smb/src/packets/fscc/chained_item.rssmb/src/packets/smb2/fscc/chained_item.rs renamed to smb/src/packets/fscc/chained_item.rs

@@ -6,7 +6,7 @@
 //!
 use std::ops::Deref;
 
-use super::super::super::binrw_util::prelude::*;
+use crate::packets::binrw_util::prelude::*;
 use binrw::prelude::*;
 
 #[binrw::binrw]