refactor: split file_info structs into separate files per project con…

…vention Move each MS-FSCC file information struct out of mod.rs into its own file (access.rs, alignment.rs, basic.rs, ea.rs, internal.rs, mode.rs, name.rs, network_open.rs, position.rs, standard.rs). mod.rs now only contains module declarations, re-exports, and the composite FileAllInformation type. All 80 unit tests and 10 integration tests pass.
tmthecoder · tejas-claude-bot · Feb 8, 2026 · Feb 10, 2026 · Feb 10, 2026 · Feb 12, 2026
commit 56eb98e9048f2ead0a832da49bf35c15c084d82c
diff --git a/smb/src/protocol/body/file_info/access.rs b/smb/src/protocol/body/file_info/access.rs
@@ -0,0 +1,12 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+/// FILE_ACCESS_INFORMATION (MS-FSCC 2.4.1) — 4 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileAccessInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub access_flags: u32,
+}
diff --git a/smb/src/protocol/body/file_info/alignment.rs b/smb/src/protocol/body/file_info/alignment.rs
@@ -0,0 +1,12 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+/// FILE_ALIGNMENT_INFORMATION (MS-FSCC 2.4.3) — 4 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileAlignmentInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub alignment_requirement: u32,
+}
diff --git a/smb/src/protocol/body/file_info/basic.rs b/smb/src/protocol/body/file_info/basic.rs
@@ -0,0 +1,25 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+use crate::protocol::body::create::file_attributes::SMBFileAttributes;
+use crate::protocol::body::filetime::FileTime;
+
+/// FILE_BASIC_INFORMATION (MS-FSCC 2.4.7) — 40 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileBasicInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub creation_time: FileTime,
+    #[smb_direct(start(fixed = 8))]
+    pub last_access_time: FileTime,
+    #[smb_direct(start(fixed = 16))]
+    pub last_write_time: FileTime,
+    #[smb_direct(start(fixed = 24))]
+    pub change_time: FileTime,
+    #[smb_direct(start(fixed = 32))]
+    pub file_attributes: SMBFileAttributes,
+    #[smb_direct(start(fixed = 36))]
+    pub reserved: u32,
+}
diff --git a/smb/src/protocol/body/file_info/ea.rs b/smb/src/protocol/body/file_info/ea.rs
@@ -0,0 +1,12 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+/// FILE_EA_INFORMATION (MS-FSCC 2.4.12) — 4 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileEaInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub ea_size: u32,
+}
diff --git a/smb/src/protocol/body/file_info/internal.rs b/smb/src/protocol/body/file_info/internal.rs
@@ -0,0 +1,12 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+/// FILE_INTERNAL_INFORMATION (MS-FSCC 2.4.20) — 8 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileInternalInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub index_number: u64,
+}
diff --git a/smb/src/protocol/body/file_info/mod.rs b/smb/src/protocol/body/file_info/mod.rs
@@ -3,143 +3,27 @@
 //! Typed representations of the file information structures defined in
 //! [MS-FSCC] sections 2.4.x, used in QueryInfo / SetInfo responses.
 
-use serde::{Deserialize, Serialize};
+mod access;
+mod alignment;
+mod basic;
+mod ea;
+mod internal;
+mod mode;
+mod name;
+mod network_open;
+mod position;
+mod standard;
 
-use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
-
-use crate::protocol::body::create::file_attributes::SMBFileAttributes;
-use crate::protocol::body::filetime::FileTime;
-
-/// FILE_BASIC_INFORMATION (MS-FSCC 2.4.7) — 40 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileBasicInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub creation_time: FileTime,
-    #[smb_direct(start(fixed = 8))]
-    pub last_access_time: FileTime,
-    #[smb_direct(start(fixed = 16))]
-    pub last_write_time: FileTime,
-    #[smb_direct(start(fixed = 24))]
-    pub change_time: FileTime,
-    #[smb_direct(start(fixed = 32))]
-    pub file_attributes: SMBFileAttributes,
-    #[smb_direct(start(fixed = 36))]
-    pub reserved: u32,
-}
-
-/// FILE_STANDARD_INFORMATION (MS-FSCC 2.4.41) — 24 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileStandardInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub allocation_size: u64,
-    #[smb_direct(start(fixed = 8))]
-    pub end_of_file: u64,
-    #[smb_direct(start(fixed = 16))]
-    pub number_of_links: u32,
-    #[smb_direct(start(fixed = 20))]
-    pub delete_pending: u8,
-    #[smb_direct(start(fixed = 21))]
-    pub directory: u8,
-    #[smb_direct(start(fixed = 22))]
-    pub reserved: u16,
-}
-
-/// FILE_INTERNAL_INFORMATION (MS-FSCC 2.4.20) — 8 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileInternalInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub index_number: u64,
-}
-
-/// FILE_EA_INFORMATION (MS-FSCC 2.4.12) — 4 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileEaInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub ea_size: u32,
-}
-
-/// FILE_ACCESS_INFORMATION (MS-FSCC 2.4.1) — 4 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileAccessInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub access_flags: u32,
-}
-
-/// FILE_POSITION_INFORMATION (MS-FSCC 2.4.35) — 8 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FilePositionInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub current_byte_offset: u64,
-}
-
-/// FILE_MODE_INFORMATION (MS-FSCC 2.4.26) — 4 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileModeInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub mode: u32,
-}
-
-/// FILE_ALIGNMENT_INFORMATION (MS-FSCC 2.4.3) — 4 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileAlignmentInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub alignment_requirement: u32,
-}
-
-/// FILE_NAME_INFORMATION (MS-FSCC 2.4.28) — variable length
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileNameInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub file_name_length: u32,
-    #[smb_string(
-        order = 0,
-        start(fixed = 4),
-        length(inner(start = 0, num_type = "u32")),
-        underlying = "u16"
-    )]
-    pub file_name: String,
-}
-
-/// FILE_NETWORK_OPEN_INFORMATION (MS-FSCC 2.4.29) — 56 bytes
-#[derive(
-    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
-)]
-pub struct FileNetworkOpenInformation {
-    #[smb_direct(start(fixed = 0))]
-    pub creation_time: FileTime,
-    #[smb_direct(start(fixed = 8))]
-    pub last_access_time: FileTime,
-    #[smb_direct(start(fixed = 16))]
-    pub last_write_time: FileTime,
-    #[smb_direct(start(fixed = 24))]
-    pub change_time: FileTime,
-    #[smb_direct(start(fixed = 32))]
-    pub allocation_size: u64,
-    #[smb_direct(start(fixed = 40))]
-    pub end_of_file: u64,
-    #[smb_direct(start(fixed = 48))]
-    pub file_attributes: SMBFileAttributes,
-    #[smb_direct(start(fixed = 52))]
-    pub reserved: u32,
-}
+pub use access::FileAccessInformation;
+pub use alignment::FileAlignmentInformation;
+pub use basic::FileBasicInformation;
+pub use ea::FileEaInformation;
+pub use internal::FileInternalInformation;
+pub use mode::FileModeInformation;
+pub use name::FileNameInformation;
+pub use network_open::FileNetworkOpenInformation;
+pub use position::FilePositionInformation;
+pub use standard::FileStandardInformation;
 
 /// FILE_ALL_INFORMATION (MS-FSCC 2.4.2) — composite structure
 ///
@@ -180,6 +64,8 @@ impl FileAllInformation {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::protocol::body::create::file_attributes::SMBFileAttributes;
+    use crate::protocol::body::filetime::FileTime;
     use smb_core::{SMBByteSize, SMBFromBytes, SMBToBytes};
 
     #[test]

diff --git a/smb/src/protocol/body/file_info/mode.rs b/smb/src/protocol/body/file_info/mode.rs
@@ -0,0 +1,12 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+/// FILE_MODE_INFORMATION (MS-FSCC 2.4.26) — 4 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileModeInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub mode: u32,
+}
diff --git a/smb/src/protocol/body/file_info/name.rs b/smb/src/protocol/body/file_info/name.rs
@@ -0,0 +1,19 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+/// FILE_NAME_INFORMATION (MS-FSCC 2.4.28) — variable length
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileNameInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub file_name_length: u32,
+    #[smb_string(
+        order = 0,
+        start(fixed = 4),
+        length(inner(start = 0, num_type = "u32")),
+        underlying = "u16"
+    )]
+    pub file_name: String,
+}
diff --git a/smb/src/protocol/body/file_info/network_open.rs b/smb/src/protocol/body/file_info/network_open.rs
@@ -0,0 +1,29 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+use crate::protocol::body::create::file_attributes::SMBFileAttributes;
+use crate::protocol::body::filetime::FileTime;
+
+/// FILE_NETWORK_OPEN_INFORMATION (MS-FSCC 2.4.29) — 56 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileNetworkOpenInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub creation_time: FileTime,
+    #[smb_direct(start(fixed = 8))]
+    pub last_access_time: FileTime,
+    #[smb_direct(start(fixed = 16))]
+    pub last_write_time: FileTime,
+    #[smb_direct(start(fixed = 24))]
+    pub change_time: FileTime,
+    #[smb_direct(start(fixed = 32))]
+    pub allocation_size: u64,
+    #[smb_direct(start(fixed = 40))]
+    pub end_of_file: u64,
+    #[smb_direct(start(fixed = 48))]
+    pub file_attributes: SMBFileAttributes,
+    #[smb_direct(start(fixed = 52))]
+    pub reserved: u32,
+}
diff --git a/smb/src/protocol/body/file_info/position.rs b/smb/src/protocol/body/file_info/position.rs
@@ -0,0 +1,12 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+/// FILE_POSITION_INFORMATION (MS-FSCC 2.4.35) — 8 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FilePositionInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub current_byte_offset: u64,
+}
diff --git a/smb/src/protocol/body/file_info/standard.rs b/smb/src/protocol/body/file_info/standard.rs
@@ -0,0 +1,22 @@
+use serde::{Deserialize, Serialize};
+
+use smb_derive::{SMBByteSize, SMBFromBytes, SMBToBytes};
+
+/// FILE_STANDARD_INFORMATION (MS-FSCC 2.4.41) — 24 bytes
+#[derive(
+    Debug, PartialEq, Eq, Clone, Serialize, Deserialize, SMBByteSize, SMBFromBytes, SMBToBytes,
+)]
+pub struct FileStandardInformation {
+    #[smb_direct(start(fixed = 0))]
+    pub allocation_size: u64,
+    #[smb_direct(start(fixed = 8))]
+    pub end_of_file: u64,
+    #[smb_direct(start(fixed = 16))]
+    pub number_of_links: u32,
+    #[smb_direct(start(fixed = 20))]
+    pub delete_pending: u8,
+    #[smb_direct(start(fixed = 21))]
+    pub directory: u8,
+    #[smb_direct(start(fixed = 22))]
+    pub reserved: u16,
+}