Commit cc5bf2f4 authored by Brickner_cp's avatar Brickner_cp

Refactoring

parent 9842d4a3
......@@ -93,7 +93,6 @@
<Compile Include="IListExtensions.cs" />
<Compile Include="MatchExtensions.cs" />
<Compile Include="PropertyInfoExtensions.cs" />
<Compile Include="StringExtensions.cs" />
<Compile Include="TimeSpanExtensions.cs" />
<Compile Include="TypeExtensions.cs" />
<Compile Include="UInt128.cs" />
......
......@@ -74,6 +74,7 @@
<Compile Include="MarshalingServicesTests.cs" />
<Compile Include="MoreIpV4Option.cs" />
<Compile Include="MoreTcpOption.cs" />
<Compile Include="WiresharkStringExtensions.cs" />
<Compile Include="XElementExtensions.cs" />
<Compile Include="PacketDumpFileTests.cs" />
<Compile Include="PacketHandler.cs" />
......
......@@ -145,8 +145,8 @@ namespace PcapDotNet.Core.Test
IpV4Layer ipV4Layer = random.NextIpV4Layer();
PayloadLayer payloadLayer = random.NextPayloadLayer(random.Next(100));
// switch (random.NextEnum<PacketType>())
switch (PacketType.Http)
switch (random.NextEnum<PacketType>())
// switch (PacketType.Http)
{
case PacketType.Ethernet:
return PacketBuilder.Build(DateTime.Now, ethernetLayer, payloadLayer);
......@@ -821,7 +821,7 @@ namespace PcapDotNet.Core.Test
break;
case "icmp.code":
field.AssertShowHex(icmpDatagram.Code);
field.AssertShowDecimal(icmpDatagram.Code);
break;
case "icmp.checksum_bad":
......@@ -928,6 +928,13 @@ namespace PcapDotNet.Core.Test
field.AssertShowDecimal(((IcmpIdentifiedDatagram)icmpDatagram).SequenceNumber);
break;
case "icmp.seq_le":
byte[] sequenceNumberBuffer = new byte[sizeof(ushort)];
sequenceNumberBuffer.Write(0, ((IcmpIdentifiedDatagram)icmpDatagram).SequenceNumber, Endianity.Big);
ushort lowerEndianSequenceNumber = sequenceNumberBuffer.ReadUShort(0, Endianity.Small);
field.AssertShowDecimal(lowerEndianSequenceNumber);
break;
case "icmp.redir_gw":
field.AssertShow(((IcmpRedirectDatagram)icmpDatagram).GatewayInternetAddress.ToString());
break;
......@@ -1508,12 +1515,12 @@ namespace PcapDotNet.Core.Test
if (fieldShowParametersStart == -1)
Assert.IsFalse(httpDatagram.Header.ContentType.Parameters.Any());
else
Assert.AreEqual(httpDatagram.Header.ContentType.Parameters.Select(pair => pair.Key + '=' + pair.Value.ToLiteral()).SequenceToString(';'), fieldShow.Substring(fieldShowParametersStart + 1));
Assert.AreEqual(httpDatagram.Header.ContentType.Parameters.Select(pair => pair.Key + '=' + pair.Value.ToWiresharkLiteral()).SequenceToString(';'), fieldShow.Substring(fieldShowParametersStart + 1));
break;
case "http.transfer_encoding":
data.Append(field.Value());
Assert.AreEqual(httpDatagram.Header.TransferEncoding.TransferCodings.SequenceToString(',').ToLiteral(), fieldShow.ToLowerLiteral());
Assert.AreEqual(httpDatagram.Header.TransferEncoding.TransferCodings.SequenceToString(',').ToWiresharkLiteral(), fieldShow.ToWiresharkLowerLiteral());
break;
default:
......@@ -1535,7 +1542,7 @@ namespace PcapDotNet.Core.Test
case "http.request.uri":
Assert.IsTrue(httpDatagram.IsRequest, field.Name() + " IsRequest");
field.AssertShow(((HttpRequestDatagram)httpDatagram).Uri.ToLiteral());
field.AssertShow(((HttpRequestDatagram)httpDatagram).Uri.ToWiresharkLiteral());
break;
case "http.request.version":
......
using System.CodeDom;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using Microsoft.CSharp;
namespace PcapDotNet.Base
namespace PcapDotNet.Core.Test
{
public static class StringExtensions
public static class WiresharkStringExtensions
{
public static string ToLiteral(this string value)
public static string ToWiresharkLiteral(this string value)
{
StringBuilder result = new StringBuilder();
for (int i = 0; i != value.Length; ++i)
......@@ -23,11 +19,6 @@ namespace PcapDotNet.Base
result.Append(currentChar);
break;
case '\t':
// result.Append(@"\t");
result.Append(@"\x9");
break;
case '\r':
result.Append(@"\r");
break;
......@@ -52,7 +43,7 @@ namespace PcapDotNet.Base
return result.ToString();
}
public static string ToLowerLiteral(this string literalString)
public static string ToWiresharkLowerLiteral(this string literalString)
{
literalString = literalString.ToLowerInvariant();
foreach (byte charValue in Enumerable.Range(0xC0, 0xD7 - 0xC0).Concat(Enumerable.Range(0xD8, 0xDF - 0xD8)))
......
......@@ -25,11 +25,6 @@ namespace PcapDotNet.Packets.Transport
/// </summary>
WindowScale = 3,
/// <summary>
/// Denote Packet Mood (RFC5841)
/// </summary>
Mood = 25,
/// <summary>
/// SACK Permitted (RFC2018)
/// </summary>
......@@ -96,6 +91,11 @@ namespace PcapDotNet.Packets.Transport
/// </summary>
Md5Signature = 19,
/// <summary>
/// Denote Packet Mood (RFC5841)
/// </summary>
Mood = 25,
/// <summary>
/// Quick-Start Response (RFC4782)
/// </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