Commit 0cd9a9c3 authored by Boaz's avatar Boaz

Use ReadBool() in GreDatagram.

Improve Wireshark tests.
parent 79e65a56
...@@ -46,6 +46,8 @@ namespace PcapDotNet.Core.Test ...@@ -46,6 +46,8 @@ namespace PcapDotNet.Core.Test
case "eth.padding": case "eth.padding":
field.AssertNoFields(); field.AssertNoFields();
// TODO: Support RARP.
if (ethernetDatagram.EtherType != EthernetType.ReverseArp)
field.AssertValue(ethernetDatagram.Padding); field.AssertValue(ethernetDatagram.Padding);
break; break;
......
...@@ -71,6 +71,7 @@ namespace PcapDotNet.Core.Test ...@@ -71,6 +71,7 @@ namespace PcapDotNet.Core.Test
case IpV4Protocol.EtherIp: // TODO: Support EtherIP. case IpV4Protocol.EtherIp: // TODO: Support EtherIP.
case IpV4Protocol.LayerTwoTunnelingProtocol: // TODO: Support LayerTwoTunnelingProtocol. case IpV4Protocol.LayerTwoTunnelingProtocol: // TODO: Support LayerTwoTunnelingProtocol.
case IpV4Protocol.AuthenticationHeader: // TODO: Support Authentication Header over IPv4. case IpV4Protocol.AuthenticationHeader: // TODO: Support Authentication Header over IPv4.
case IpV4Protocol.UdpLite: // TODO: Support UdpLite.
break; break;
default: default:
......
...@@ -94,7 +94,7 @@ namespace PcapDotNet.Packets.Gre ...@@ -94,7 +94,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary> /// </summary>
public bool ChecksumPresent public bool ChecksumPresent
{ {
get { return (this[Offset.ChecksumPresent] & Mask.ChecksumPresent) == Mask.ChecksumPresent; } get { return ReadBool(Offset.ChecksumPresent, Mask.ChecksumPresent); }
} }
/// <summary> /// <summary>
...@@ -103,7 +103,7 @@ namespace PcapDotNet.Packets.Gre ...@@ -103,7 +103,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary> /// </summary>
public bool RoutingPresent public bool RoutingPresent
{ {
get { return (this[Offset.RoutingPresent] & Mask.RoutingPresent) == Mask.RoutingPresent; } get { return ReadBool(Offset.RoutingPresent, Mask.RoutingPresent); }
} }
/// <summary> /// <summary>
...@@ -112,7 +112,7 @@ namespace PcapDotNet.Packets.Gre ...@@ -112,7 +112,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary> /// </summary>
public bool KeyPresent public bool KeyPresent
{ {
get { return (this[Offset.KeyPresent] & Mask.KeyPresent) == Mask.KeyPresent; } get { return ReadBool(Offset.KeyPresent, Mask.KeyPresent); }
} }
/// <summary> /// <summary>
...@@ -121,7 +121,7 @@ namespace PcapDotNet.Packets.Gre ...@@ -121,7 +121,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary> /// </summary>
public bool SequenceNumberPresent public bool SequenceNumberPresent
{ {
get { return (this[Offset.SequenceNumberPresent] & Mask.SequenceNumberPresent) == Mask.SequenceNumberPresent; } get { return ReadBool(Offset.SequenceNumberPresent, Mask.SequenceNumberPresent); }
} }
/// <summary> /// <summary>
...@@ -130,7 +130,7 @@ namespace PcapDotNet.Packets.Gre ...@@ -130,7 +130,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary> /// </summary>
public bool StrictSourceRoute public bool StrictSourceRoute
{ {
get { return (this[Offset.StrictSourceRoute] & Mask.StrictSourceRoute) == Mask.StrictSourceRoute; } get { return ReadBool(Offset.StrictSourceRoute, Mask.StrictSourceRoute); }
} }
/// <summary> /// <summary>
...@@ -147,7 +147,7 @@ namespace PcapDotNet.Packets.Gre ...@@ -147,7 +147,7 @@ namespace PcapDotNet.Packets.Gre
/// </summary> /// </summary>
public bool AcknowledgmentSequenceNumberPresent public bool AcknowledgmentSequenceNumberPresent
{ {
get { return (this[Offset.AcknowledgmentSequenceNumberPresent] & Mask.AcknowledgmentSequenceNumberPresent) == Mask.AcknowledgmentSequenceNumberPresent; } get { return ReadBool(Offset.AcknowledgmentSequenceNumberPresent, Mask.AcknowledgmentSequenceNumberPresent); }
} }
/// <summary> /// <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