Commit 0cd9a9c3 authored by Boaz's avatar Boaz

Use ReadBool() in GreDatagram.

Improve Wireshark tests.
parent 79e65a56
......@@ -46,7 +46,9 @@ namespace PcapDotNet.Core.Test
case "eth.padding":
field.AssertNoFields();
field.AssertValue(ethernetDatagram.Padding);
// TODO: Support RARP.
if (ethernetDatagram.EtherType != EthernetType.ReverseArp)
field.AssertValue(ethernetDatagram.Padding);
break;
default:
......
......@@ -71,6 +71,7 @@ namespace PcapDotNet.Core.Test
case IpV4Protocol.EtherIp: // TODO: Support EtherIP.
case IpV4Protocol.LayerTwoTunnelingProtocol: // TODO: Support LayerTwoTunnelingProtocol.
case IpV4Protocol.AuthenticationHeader: // TODO: Support Authentication Header over IPv4.
case IpV4Protocol.UdpLite: // TODO: Support UdpLite.
break;
default:
......
......@@ -94,7 +94,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary>
public bool ChecksumPresent
{
get { return (this[Offset.ChecksumPresent] & Mask.ChecksumPresent) == Mask.ChecksumPresent; }
get { return ReadBool(Offset.ChecksumPresent, Mask.ChecksumPresent); }
}
/// <summary>
......@@ -103,7 +103,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary>
public bool RoutingPresent
{
get { return (this[Offset.RoutingPresent] & Mask.RoutingPresent) == Mask.RoutingPresent; }
get { return ReadBool(Offset.RoutingPresent, Mask.RoutingPresent); }
}
/// <summary>
......@@ -112,7 +112,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary>
public bool KeyPresent
{
get { return (this[Offset.KeyPresent] & Mask.KeyPresent) == Mask.KeyPresent; }
get { return ReadBool(Offset.KeyPresent, Mask.KeyPresent); }
}
/// <summary>
......@@ -121,7 +121,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary>
public bool SequenceNumberPresent
{
get { return (this[Offset.SequenceNumberPresent] & Mask.SequenceNumberPresent) == Mask.SequenceNumberPresent; }
get { return ReadBool(Offset.SequenceNumberPresent, Mask.SequenceNumberPresent); }
}
/// <summary>
......@@ -130,7 +130,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary>
public bool StrictSourceRoute
{
get { return (this[Offset.StrictSourceRoute] & Mask.StrictSourceRoute) == Mask.StrictSourceRoute; }
get { return ReadBool(Offset.StrictSourceRoute, Mask.StrictSourceRoute); }
}
/// <summary>
......@@ -147,7 +147,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary>
public bool AcknowledgmentSequenceNumberPresent
{
get { return (this[Offset.AcknowledgmentSequenceNumberPresent] & Mask.AcknowledgmentSequenceNumberPresent) == Mask.AcknowledgmentSequenceNumberPresent; }
get { return ReadBool(Offset.AcknowledgmentSequenceNumberPresent, Mask.AcknowledgmentSequenceNumberPresent); }
}
/// <summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment