Skip to content

Add Dhcp-Support #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Add Dhcp-Support #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
49164e4
add extension to create a random c-strings
vbBerni Nov 27, 2016
d2faae8
add dhcp support
vbBerni Nov 27, 2016
69ea914
finish dhcp-support with documentation and fixes
vbBerni Dec 17, 2016
0e40921
don't use a random invalid port
vbBerni Jan 14, 2017
7971a20
TransactionId type int --> uint
vbBerni Jan 14, 2017
df7dcd2
rename pos --> offset
vbBerni Jan 14, 2017
2912854
Avoid using "this." explicitly.
vbBerni Jan 14, 2017
5170fe1
change method order public, internal, private
vbBerni Jan 14, 2017
3ccd7fc
remove useless overwrite
vbBerni Jan 14, 2017
7e1df41
End comments with periods.
vbBerni Jan 15, 2017
ae3f79c
Replace "true if" with "Whether"
vbBerni Jan 15, 2017
c1550dd
DHCP_MAGIC_COOKIE int --> uint
vbBerni Jan 15, 2017
41bc492
Be consistent with the name - either "op" or "messageType".
vbBerni Jan 15, 2017
a0d8c6d
fix compilation
vbBerni Jan 15, 2017
8b2f118
Consider also writing the null termination.
vbBerni Jan 15, 2017
f10975f
Replace "RFCs" with "RFC".
vbBerni Jan 15, 2017
8a31f33
Instead of having a field for "flags", split it to the different flag…
vbBerni Jan 15, 2017
6d0b4dd
using registration mechanism for the options
vbBerni Jan 18, 2017
cda7273
set HardwareAddressLength when setting setting ClientMacAddress
vbBerni Jan 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 48 additions & 18 deletions PcapDotNet/src/PcapDotNet.Core.Test/WiresharkCompareTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Xml.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using PcapDotNet.Packets;
using PcapDotNet.Packets.Dhcp;
using PcapDotNet.Packets.Dns;
using PcapDotNet.Packets.Ethernet;
using PcapDotNet.Packets.Gre;
Expand Down Expand Up @@ -390,24 +391,53 @@ private static void CreateRandomIpPayload(Random random, Layer ipLayer, List<ILa
}
}

private static void CreateRandomUdpPayload(Random random, UdpLayer udpLayer, List<ILayer> layers)
{
if (random.NextBool(20))
{
// Finish with payload.
PayloadLayer payloadLayer = random.NextPayloadLayer(random.Next(100));
layers.Add(payloadLayer);
return;
}

DnsLayer dnsLayer = random.NextDnsLayer();
layers.Add(dnsLayer);

ushort specialPort = (ushort)(random.NextBool() ? 53 : 5355);
if (dnsLayer.IsQuery)
udpLayer.DestinationPort = specialPort;
else
udpLayer.SourcePort = specialPort;
private static void CreateRandomUdpPayload(Random random, UdpLayer udpLayer, List<ILayer> layers)
{
if (random.NextBool(20))
{
// Finish with payload.
PayloadLayer payloadLayer = random.NextPayloadLayer(random.Next(100));
layers.Add(payloadLayer);
return;
}

switch (random.Next(0, 2))
Copy link
Contributor

@bricknerb bricknerb Jan 14, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make this random.NextBool() instead?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would keep it because there may be more than two possible payloads in the future

{
case 0:
{
DnsLayer dnsLayer = random.NextDnsLayer();
layers.Add(dnsLayer);

ushort specialPort = (ushort)(random.NextBool() ? 53 : 5355);
if (dnsLayer.IsQuery)
udpLayer.DestinationPort = specialPort;
else
udpLayer.SourcePort = specialPort;
break;
}

case 1:
{
DhcpLayer dhcpLayer = random.NextDhcpLayer();
layers.Add(dhcpLayer);

if (random.NextBool())
{
udpLayer.SourcePort = 67 ;
udpLayer.DestinationPort = 68;
}
else
{
udpLayer.SourcePort = 68;
udpLayer.DestinationPort = 67;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lines 432-439 seem to repeat lines 424-431.


break;
}

default:
throw new InvalidOperationException("Invalid value.");
}
}

private static void CreateRandomTcpPayload(Random random, TcpLayer tcpLayer, List<ILayer> layers)
Expand Down
Loading