build bugfix

Author: afiffon

crates/smb-msg/src/message.rs

@@ -1,22 +1,33 @@
-use super::compressed::*;
-use super::encrypted::*;
-use super::plain::*;
 use binrw::prelude::*;
 
 macro_rules! make_message {
-    ($name:ident, $derive_attr:ty, $plain_type:ty) => {
-        #[derive($derive_attr, Debug)]
+    ($name:ident, $binrw_type:ident, $plain_type:ty) => {
+        #[binrw::$binrw_type]
+        #[derive(Debug)]
         #[brw(little)]
         pub enum $name {
             Plain($plain_type),
-            Encrypted(EncryptedMessage),
-            Compressed(CompressedMessage),
+            Encrypted($crate::EncryptedMessage),
+            Compressed($crate::CompressedMessage),
         }
     };
 }
 
-make_message!(Request, BinWrite, PlainRequest);
-make_message!(Response, BinRead, PlainResponse);
+macro_rules! make_messages {
+    ($req_type:ident, $res_type:ident) => {
+        make_message!(Request, $req_type, $crate::PlainRequest);
+        make_message!(Response, $res_type, $crate::PlainResponse);
+    };
+}
+
+#[cfg(all(feature = "client", not(feature = "server")))]
+make_messages!(binwrite, binread);
+
+#[cfg(all(feature = "server", not(feature = "client")))]
+make_messages!(binread, binwrite);
+
+#[cfg(all(feature = "server", feature = "client"))]
+make_messages!(binrw, binrw);
 
 impl TryFrom<&[u8]> for Response {
     type Error = binrw::Error;

crates/smb-msg/src/plain.rs

@@ -320,7 +320,7 @@ macro_rules! gen_req_resp {
 
 #[cfg(all(feature = "server", feature = "client"))]
 gen_req_resp!(binrw::binrw, binrw::binrw);
-#[cfg(all(not(feature = "server"), feature = "client"))]
-gen_req_resp!(binrw::binread, binrw::binwrite);
-#[cfg(all(feature = "server", not(feature = "client")))]
+#[cfg(all(feature = "client", not(feature = "server")))]
 gen_req_resp!(binrw::binwrite, binrw::binread);
+#[cfg(all(feature = "server", not(feature = "client")))]
+gen_req_resp!(binrw::binread, binrw::binwrite);

crates/smb-transport/src/tcp/msg.rs

@@ -1,7 +1,7 @@
 use binrw::prelude::*;
 
 #[binrw::binrw]
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq)]
 #[brw(big, magic(b"\x00"))]
 pub struct SmbTcpMessageHeader {
     #[br(parse_with = binrw::helpers::read_u24)]