zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-07-25 10:28:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMB1: Corrected implementation of SMB_COM_TRANSACTION subcommand requests

Browse source
This commit is contained in:
Tal Aloni 2017-09-09 02:20:15 +03:00
parent 62556a1bdc
commit 144f5c1cbd
10 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SMBLibrary/SMB1/TransactionSubcommands/TransactionCallNamedPipeRequest.cs
View file

@ -23,7 +23,6 @@ namespace SMBLibrary.SMB1
public TransactionCallNamedPipeRequest() : base()
{
}
public TransactionCallNamedPipeRequest(byte[] setup, byte[] data) : base()
@ -38,7 +37,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, Priority);
return base.GetSetup();
return setup;
}
public override byte[] GetData()

7
SMBLibrary/SMB1/TransactionSubcommands/TransactionPeekNamedPipeRequest.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
*
* You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation,
@ -20,7 +20,8 @@ namespace SMBLibrary.SMB1
public ushort FID;
public TransactionPeekNamedPipeRequest() : base()
{}
{
}
public TransactionPeekNamedPipeRequest(byte[] setup) : base()
{
@ -32,7 +33,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, FID);
return base.GetSetup();
return setup;
}
public override TransactionSubcommandName SubcommandName

4
SMBLibrary/SMB1/TransactionSubcommands/TransactionQueryNamedPipeInfoRequest.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
*
* You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation,
@ -37,7 +37,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, FID);
return base.GetSetup();
return setup;
}
public override byte[] GetParameters(bool isUnicode)

4
SMBLibrary/SMB1/TransactionSubcommands/TransactionRawReadNamedPipeRequest.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
*
* You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation,
@ -33,7 +33,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, FID);
return base.GetSetup();
return setup;
}
public override TransactionSubcommandName SubcommandName

5
SMBLibrary/SMB1/TransactionSubcommands/TransactionRawWriteNamedPipeRequest.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
*
* You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation,
@ -24,6 +24,7 @@ namespace SMBLibrary.SMB1
public TransactionRawWriteNamedPipeRequest() : base()
{
}
public TransactionRawWriteNamedPipeRequest(byte[] setup, byte[] data) : base()
{
FID = LittleEndianConverter.ToUInt16(setup, 2);
@ -36,7 +37,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, FID);
return base.GetSetup();
return setup;
}
public override byte[] GetData()

7
SMBLibrary/SMB1/TransactionSubcommands/TransactionReadNamedPipeRequest.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
*
* You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation,
@ -20,7 +20,8 @@ namespace SMBLibrary.SMB1
public ushort FID;
public TransactionReadNamedPipeRequest() : base()
{}
{
}
public TransactionReadNamedPipeRequest(byte[] setup): base()
{
@ -32,7 +33,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, FID);
return base.GetSetup();
return setup;
}
public override TransactionSubcommandName SubcommandName

4
SMBLibrary/SMB1/TransactionSubcommands/TransactionSetNamedPipeStateRequest.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
*
* You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation,
@ -37,7 +37,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, FID);
return base.GetSetup();
return setup;
}
public override byte[] GetParameters(bool isUnicode)

2
SMBLibrary/SMB1/TransactionSubcommands/TransactionTransactNamedPipeRequest.cs
View file

@ -36,7 +36,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, FID);
return base.GetSetup();
return setup;
}
public override byte[] GetData()

2
SMBLibrary/SMB1/TransactionSubcommands/TransactionWaitNamedPipeRequest.cs
View file

@ -33,7 +33,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, Priority);
return base.GetSetup();
return setup;
}
public override TransactionSubcommandName SubcommandName

5
SMBLibrary/SMB1/TransactionSubcommands/TransactionWriteNamedPipeRequest.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
*
* You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation,
@ -28,6 +28,7 @@ namespace SMBLibrary.SMB1
public TransactionWriteNamedPipeRequest(byte[] setup, byte[] data): base()
{
FID = LittleEndianConverter.ToUInt16(setup, 2);
WriteData = data;
}
@ -36,7 +37,7 @@ namespace SMBLibrary.SMB1
byte[] setup = new byte[4];
LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
LittleEndianWriter.WriteUInt16(setup, 2, FID);
return base.GetSetup();
return setup;
}
public override byte[] GetData()