Mirror/masscanned
1
0
Fork 0
mirror of https://github.com/ivre/masscanned.git synced 2025-10-07 00:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename Packet->MPacket

Browse source
This commit is contained in:
gpotter2 2022-02-14 13:40:50 +01:00
parent cda878bd3c
commit cafef21436
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/proto/smb.rs
View file

@ -84,7 +84,7 @@ impl<T> PacketDissector<T> {
} }
} }
pub trait Packet { pub trait MPacket {
fn new() -> Self; fn new() -> Self;
fn repl(&self) -> Option<Vec<u8>>; fn repl(&self) -> Option<Vec<u8>>;
fn parse(&mut self, byte: &u8); fn parse(&mut self, byte: &u8);
@ -109,7 +109,7 @@ enum NBTSessionState {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct NBTSession<T: Packet> { struct NBTSession<T: MPacket> {
// DISSECTION // DISSECTION
d: PacketDissector<NBTSessionState>, d: PacketDissector<NBTSessionState>,
// STRUCT // STRUCT
@ -118,7 +118,7 @@ struct NBTSession<T: Packet> {
payload: Option<T>, payload: Option<T>,
} }
impl<T: Packet> Packet for NBTSession<T> { impl<T: MPacket> MPacket for NBTSession<T> {
fn new() -> NBTSession<T> { fn new() -> NBTSession<T> {
Self { Self {
d: PacketDissector::new(NBTSessionState::NBType), d: PacketDissector::new(NBTSessionState::NBType),
@ -160,7 +160,7 @@ impl<T: Packet> Packet for NBTSession<T> {
} }
} }
impl<T: Packet> NBTSession<T> { impl<T: MPacket> NBTSession<T> {
fn get_payload(&mut self) -> Option<&mut T> { fn get_payload(&mut self) -> Option<&mut T> {
if self.payload.is_some() { if self.payload.is_some() {
return self.payload.as_mut(); return self.payload.as_mut();
@ -210,7 +210,7 @@ struct SMB1Header {
payload: Option<SMB1Payload>, payload: Option<SMB1Payload>,
} }
impl Packet for SMB1Header { impl MPacket for SMB1Header {
fn new() -> SMB1Header { fn new() -> SMB1Header {
Self { Self {
d: PacketDissector::new(SMB1HeaderState::Start), d: PacketDissector::new(SMB1HeaderState::Start),
@ -356,7 +356,7 @@ struct SMB1NegotiateRequest {
dialects: Vec<SMB1Dialect>, dialects: Vec<SMB1Dialect>,
} }
impl Packet for SMB1NegotiateRequest { impl MPacket for SMB1NegotiateRequest {
fn new() -> SMB1NegotiateRequest { fn new() -> SMB1NegotiateRequest {
Self { Self {
d: PacketDissector::new(SMB1NegotiateRequestState::WordCount), d: PacketDissector::new(SMB1NegotiateRequestState::WordCount),
@ -536,7 +536,7 @@ struct SMB2Header {
payload: Option<SMB2Payload>, payload: Option<SMB2Payload>,
} }
impl Packet for SMB2Header { impl MPacket for SMB2Header {
fn new() -> SMB2Header { fn new() -> SMB2Header {
SMB2Header { SMB2Header {
d: PacketDissector::new(SMB2HeaderState::Start), d: PacketDissector::new(SMB2HeaderState::Start),
@ -699,7 +699,7 @@ struct SMB2NegotiateRequest {
} }
const EPOCH_1601: u64 = 11644473600; const EPOCH_1601: u64 = 11644473600;
impl Packet for SMB2NegotiateRequest { impl MPacket for SMB2NegotiateRequest {
fn new() -> Self { fn new() -> Self {
SMB2NegotiateRequest { SMB2NegotiateRequest {
d: PacketDissector::new(SMB2NegotiateRequestState::StructureSize), d: PacketDissector::new(SMB2NegotiateRequestState::StructureSize),
@ -858,7 +858,7 @@ struct SMB2SetupRequest {
security_len: u16, security_len: u16,
previous_session_id: u64, previous_session_id: u64,
} }
impl Packet for SMB2SetupRequest { impl MPacket for SMB2SetupRequest {
fn new() -> Self { fn new() -> Self {
SMB2SetupRequest { SMB2SetupRequest {
d: PacketDissector::new(SMB2SetupRequestState::StructureSize), d: PacketDissector::new(SMB2SetupRequestState::StructureSize),