From cafef21436cf3713d447eb4b21a74d5cd4939e5b Mon Sep 17 00:00:00 2001 From: gpotter2 Date: Mon, 14 Feb 2022 13:40:50 +0100 Subject: [PATCH] Rename Packet->MPacket --- src/proto/smb.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/proto/smb.rs b/src/proto/smb.rs index 4d0b44c..0e1ad4b 100644 --- a/src/proto/smb.rs +++ b/src/proto/smb.rs @@ -84,7 +84,7 @@ impl PacketDissector { } } -pub trait Packet { +pub trait MPacket { fn new() -> Self; fn repl(&self) -> Option>; fn parse(&mut self, byte: &u8); @@ -109,7 +109,7 @@ enum NBTSessionState { } #[derive(Debug, Clone)] -struct NBTSession { +struct NBTSession { // DISSECTION d: PacketDissector, // STRUCT @@ -118,7 +118,7 @@ struct NBTSession { payload: Option, } -impl Packet for NBTSession { +impl MPacket for NBTSession { fn new() -> NBTSession { Self { d: PacketDissector::new(NBTSessionState::NBType), @@ -160,7 +160,7 @@ impl Packet for NBTSession { } } -impl NBTSession { +impl NBTSession { fn get_payload(&mut self) -> Option<&mut T> { if self.payload.is_some() { return self.payload.as_mut(); @@ -210,7 +210,7 @@ struct SMB1Header { payload: Option, } -impl Packet for SMB1Header { +impl MPacket for SMB1Header { fn new() -> SMB1Header { Self { d: PacketDissector::new(SMB1HeaderState::Start), @@ -356,7 +356,7 @@ struct SMB1NegotiateRequest { dialects: Vec, } -impl Packet for SMB1NegotiateRequest { +impl MPacket for SMB1NegotiateRequest { fn new() -> SMB1NegotiateRequest { Self { d: PacketDissector::new(SMB1NegotiateRequestState::WordCount), @@ -536,7 +536,7 @@ struct SMB2Header { payload: Option, } -impl Packet for SMB2Header { +impl MPacket for SMB2Header { fn new() -> SMB2Header { SMB2Header { d: PacketDissector::new(SMB2HeaderState::Start), @@ -699,7 +699,7 @@ struct SMB2NegotiateRequest { } const EPOCH_1601: u64 = 11644473600; -impl Packet for SMB2NegotiateRequest { +impl MPacket for SMB2NegotiateRequest { fn new() -> Self { SMB2NegotiateRequest { d: PacketDissector::new(SMB2NegotiateRequestState::StructureSize), @@ -858,7 +858,7 @@ struct SMB2SetupRequest { security_len: u16, previous_session_id: u64, } -impl Packet for SMB2SetupRequest { +impl MPacket for SMB2SetupRequest { fn new() -> Self { SMB2SetupRequest { d: PacketDissector::new(SMB2SetupRequestState::StructureSize),