Commit 66296bc9 authored by Boaz Brickner's avatar Boaz Brickner

Wireshark 1.12.8

parent 99317efd
...@@ -47,24 +47,34 @@ namespace PcapDotNet.Core.Test ...@@ -47,24 +47,34 @@ namespace PcapDotNet.Core.Test
var icmpIpV4PayloadDatagram = icmpDatagram as IcmpIpV4PayloadDatagram; var icmpIpV4PayloadDatagram = icmpDatagram as IcmpIpV4PayloadDatagram;
if (icmpIpV4PayloadDatagram != null) if (icmpIpV4PayloadDatagram != null)
{ {
if (!new[] IpV4Datagram ipV4 = icmpIpV4PayloadDatagram.IpV4;
{ switch (ipV4.Protocol)
IpV4Protocol.IpComp, // TODO: Support IpComp.
IpV4Protocol.Ax25, // TODO: Support Ax25.
IpV4Protocol.FibreChannel, // TODO: Support FibreChannel.
IpV4Protocol.MultiprotocolLabelSwitchingInIp, // TODO: Support MPLS.
IpV4Protocol.EtherIp, // TODO: Support EtherIP.
}.Contains(icmpIpV4PayloadDatagram.IpV4.Protocol))
{ {
if (icmpIpV4PayloadDatagram.IpV4.Protocol == IpV4Protocol.Udp) case IpV4Protocol.Ip:
{ if (ipV4.Payload.Length < IpV4Datagram.HeaderMinimumLength)
field.AssertDataField(ipV4.Payload);
else
field.AssertDataField(ipV4.IpV4.Payload);
break;
case IpV4Protocol.Udp:
// Uncomment this when https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10990 is fixed. // Uncomment this when https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10990 is fixed.
// field.AssertDataField(casted1.IpV4.Udp.Payload); // field.AssertDataField(casted1.IpV4.Udp.Payload);
} break;
else
{ case IpV4Protocol.IpComp: // TODO: Support IpComp.
field.AssertDataField(icmpIpV4PayloadDatagram.IpV4.Payload); case IpV4Protocol.Ax25: // TODO: Support Ax25.
} case IpV4Protocol.FibreChannel: // TODO: Support FibreChannel.
case IpV4Protocol.MultiprotocolLabelSwitchingInIp: // TODO: Support MPLS.
case IpV4Protocol.EtherIp: // TODO: Support EtherIP.
case IpV4Protocol.LayerTwoTunnelingProtocol: // TODO: Support LayerTwoTunnelingProtocol.
case IpV4Protocol.AuthenticationHeader: // TODO: Support Authentication Header over IPv4.
break;
default:
field.AssertDataField(ipV4.Payload);
break;
} }
} }
else else
......
...@@ -72,8 +72,7 @@ namespace PcapDotNet.Core.Test ...@@ -72,8 +72,7 @@ namespace PcapDotNet.Core.Test
case "Data": case "Data":
if (field.Value().Length > 0) if (field.Value().Length > 0)
{ {
// TODO: Change following https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11582 field.AssertValue(igmpDatagram.Skip(1));
field.AssertValue(field.Value().Length / 2 == igmpDatagram.Length - 21 ? igmpDatagram.Skip(21) : igmpDatagram.Skip(1));
} }
break; break;
...@@ -120,7 +119,7 @@ namespace PcapDotNet.Core.Test ...@@ -120,7 +119,7 @@ namespace PcapDotNet.Core.Test
break; break;
case "igmp.reply.pending": case "igmp.reply.pending":
if (igmpDatagram.MessageType != IgmpMessageType.None) if (!new[] {IgmpMessageType.None, (IgmpMessageType)12}.Contains(igmpDatagram.MessageType))
field.AssertShowDecimal(igmpDatagram.RetryInThisManySeconds); field.AssertShowDecimal(igmpDatagram.RetryInThisManySeconds);
break; break;
......
...@@ -194,7 +194,9 @@ namespace PcapDotNet.Core.Test ...@@ -194,7 +194,9 @@ namespace PcapDotNet.Core.Test
{ {
case "tcp.checksum_good": case "tcp.checksum_good":
checksumField.AssertNoFields(); checksumField.AssertNoFields();
checksumField.AssertShowDecimal(tcpDatagram.Checksum != 0 && ipDatagram.IsTransportChecksumCorrect); // TODO: Remove this condition when https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11857 is fixed.
if (!field.Showname().EndsWith(" [unchecked, not all data available]"))
checksumField.AssertShowDecimal(tcpDatagram.Checksum != 0 && ipDatagram.IsTransportChecksumCorrect);
break; break;
case "tcp.checksum_bad": case "tcp.checksum_bad":
......
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