Commit 1ec323a5 authored by Boaz Brickner's avatar Boaz Brickner

Wireshark 1.12.8

parent 2b2d06b7
...@@ -170,6 +170,7 @@ namespace PcapDotNet.Core.Test ...@@ -170,6 +170,7 @@ namespace PcapDotNet.Core.Test
ResetRecordFields(); ResetRecordFields();
var resourceRecordField = resourceRecordFieldsArray[i]; var resourceRecordField = resourceRecordFieldsArray[i];
var resourceRecord = resourceRecordsArray[i]; var resourceRecord = resourceRecordsArray[i];
int dnsResponseTypeIndex = 0;
foreach (var resourceRecordAttributeField in resourceRecordField.Fields()) foreach (var resourceRecordAttributeField in resourceRecordField.Fields())
{ {
switch (resourceRecordAttributeField.Name()) switch (resourceRecordAttributeField.Name())
...@@ -191,11 +192,25 @@ namespace PcapDotNet.Core.Test ...@@ -191,11 +192,25 @@ namespace PcapDotNet.Core.Test
break; break;
case "dns.qry.type": case "dns.qry.type":
case "dns.resp.type":
resourceRecordAttributeField.AssertShowDecimal((ushort)resourceRecord.DnsType); resourceRecordAttributeField.AssertShowDecimal((ushort)resourceRecord.DnsType);
resourceRecordAttributeField.AssertNoFields(); resourceRecordAttributeField.AssertNoFields();
break; break;
case "dns.resp.type":
DnsType expectedDnsType;
if (dnsResponseTypeIndex == 0)
{
expectedDnsType = resourceRecord.DnsType;
}
else
{
expectedDnsType = ((DnsResourceDataNextDomain)resourceRecord.Data).TypesExist.Skip(dnsResponseTypeIndex - 1).First();
}
resourceRecordAttributeField.AssertShowDecimal((ushort)expectedDnsType);
resourceRecordAttributeField.AssertNoFields();
++dnsResponseTypeIndex;
break;
case "dns.qry.class": case "dns.qry.class":
case "dns.resp.class": case "dns.resp.class":
resourceRecordAttributeField.AssertShowDecimal((ushort)resourceRecord.DnsClass); resourceRecordAttributeField.AssertShowDecimal((ushort)resourceRecord.DnsClass);
...@@ -833,19 +848,19 @@ namespace PcapDotNet.Core.Test ...@@ -833,19 +848,19 @@ namespace PcapDotNet.Core.Test
case "dns.loc.size": case "dns.loc.size":
Assert.AreEqual(0, locData.Version); Assert.AreEqual(0, locData.Version);
string sizeValue = dataField.Showname().Split(new[] {'(', ')'})[1]; string sizeValue = dataField.Showname().Split('(', ')')[1];
Assert.AreEqual(GetPrecisionValueString(locData.Size) + " m", sizeValue); Assert.AreEqual(GetPrecisionValueString(locData.Size), sizeValue);
break; break;
case "dns.loc.horizontal_precision": case "dns.loc.horizontal_precision":
Assert.AreEqual(0, locData.Version); Assert.AreEqual(0, locData.Version);
string horizontalPrecisionValue = dataField.Showname().Split(new[] {'(', ')'})[1]; string horizontalPrecisionValue = dataField.Showname().Split('(', ')')[1];
Assert.AreEqual(GetPrecisionValueString(locData.HorizontalPrecision), horizontalPrecisionValue); Assert.AreEqual(GetPrecisionValueString(locData.HorizontalPrecision), horizontalPrecisionValue);
break; break;
case "dns.loc.vertial_precision": case "dns.loc.vertial_precision":
Assert.AreEqual(0, locData.Version); Assert.AreEqual(0, locData.Version);
string verticalPrecisionValue = dataField.Showname().Split(new[] {'(', ')'})[1]; string verticalPrecisionValue = dataField.Showname().Split('(', ')')[1];
Assert.AreEqual(GetPrecisionValueString(locData.VerticalPrecision), verticalPrecisionValue); Assert.AreEqual(GetPrecisionValueString(locData.VerticalPrecision), verticalPrecisionValue);
break; break;
...@@ -1840,7 +1855,7 @@ namespace PcapDotNet.Core.Test ...@@ -1840,7 +1855,7 @@ namespace PcapDotNet.Core.Test
double resultValue = value / 100.0; double resultValue = value / 100.0;
if (resultValue < 1000000) if (resultValue < 1000000)
return resultValue.ToString(); return resultValue + " m";
int log = (int)Math.Log10(resultValue); int log = (int)Math.Log10(resultValue);
resultValue /= Math.Pow(10, log); resultValue /= Math.Pow(10, log);
......
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