Merge pull request #128 from AvivNaaman/refactor/crates

Author: afiffon

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["smb", "smb-cli"]
+members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
@@ -13,6 +13,24 @@ authors = ["Aviv Naaman <[email protected]>"]
 keywords = ["smb", "network", "file-sharing", "windows"]
 categories = ["network-programming", "parsing", "filesystem"]
 readme = "README.md"
+version = "0.9.0"
+
+[workspace.dependencies]
+# Binary encoding/decoding
+binrw = "0.15.0"
+modular-bitfield = "0.11.2"
+
+# Utilities
+thiserror = "2.0"
+paste = "1.0"
+time = { version = "0.3.37", features = ["macros"] }
+rand = "0.8.5"
+log = "0.4.22"
+
+# Async
+tokio = { version = "1.43", features = ["full"] }
+maybe-async = "0.2"
+futures-util = { version = "0.3" }
 
 # Profiling: release (optimized) with debug info
 [profile.profiling]

Cargo.toml

@@ -1,19 +1,20 @@
 [package]
 name = "smb-cli"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
 smb = { path = "../smb", default-features = false }
-maybe-async = "0.2"
-tokio = { version = "1.43", optional = true, features = ["full"] }
-futures-util = { version = "0.3", optional = true }
+
+maybe-async = { workspace = true }
+tokio = { workspace = true, optional = true }
+futures-util = { workspace = true, optional = true }
 
 # CLI & logging
 clap = { version = "4.5.27", features = ["derive"] }
 env_logger = "0.11.6"
-log = "0.4.22"
+log = { workspace = true }
 
 [features]
 default = ["async", "smb/default"]

smb-cli/Cargo.toml crates/smb-cli/Cargo.tomlsmb-cli/Cargo.toml renamed to crates/smb-cli/Cargo.toml

@@ -1,11 +1,11 @@
 use crate::{copy::CopyCmd, info::InfoCmd, security::SecurityCmd};
 use clap::{Parser, Subcommand, ValueEnum};
+use smb::Dialect;
 use smb::{
     ClientConfig, ConnectionConfig,
     connection::{
         AuthMethodsConfig, EncryptionMode, QuicCertValidationOptions, QuicConfig, TransportConfig,
     },
-    packets::smb2::Dialect,
 };
 
 #[derive(Parser)]

smb-cli/README.md crates/smb-cli/README.mdsmb-cli/README.md renamed to crates/smb-cli/README.md

@@ -2,14 +2,7 @@ use crate::{Cli, path::*};
 use clap::Parser;
 use maybe_async::*;
 use smb::sync_helpers::*;
-use smb::{
-    Client,
-    packets::{
-        fscc::{FileAccessMask, FileAttributes},
-        smb2::CreateOptions,
-    },
-    resource::*,
-};
+use smb::{Client, CreateOptions, FileAccessMask, FileAttributes, resource::*};
 use std::error::Error;
 #[cfg(not(feature = "async"))]
 use std::fs;

smb-cli/src/cli.rs crates/smb-cli/src/cli.rssmb-cli/src/cli.rs renamed to crates/smb-cli/src/cli.rs

@@ -4,9 +4,8 @@ use clap::{Parser, ValueEnum};
 use futures_util::StreamExt;
 use maybe_async::*;
 use smb::{
-    Client, FileCreateArgs, UncPath,
-    packets::fscc::*,
-    resource::{Directory, GetLen, Resource},
+    Client, FileAccessMask, FileBasicInformation, FileIdBothDirectoryInformation, UncPath,
+    resource::*,
 };
 use std::collections::VecDeque;
 use std::fmt::Display;