Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Pcap-Net
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Pcap-Net
Commits
cc5bf2f4
Commit
cc5bf2f4
authored
Sep 08, 2010
by
Brickner_cp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactoring
parent
9842d4a3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
25 deletions
+23
-25
PcapDotNet.Base.csproj
PcapDotNet/src/PcapDotNet.Base/PcapDotNet.Base.csproj
+0
-1
PcapDotNet.Core.Test.csproj
...tNet/src/PcapDotNet.Core.Test/PcapDotNet.Core.Test.csproj
+1
-0
WiresharkCompareTests.cs
PcapDotNet/src/PcapDotNet.Core.Test/WiresharkCompareTests.cs
+13
-6
WiresharkStringExtensions.cs
...Net/src/PcapDotNet.Core.Test/WiresharkStringExtensions.cs
+4
-13
TcpOptionType.cs
PcapDotNet/src/PcapDotNet.Packets/Transport/TcpOptionType.cs
+5
-5
No files found.
PcapDotNet/src/PcapDotNet.Base/PcapDotNet.Base.csproj
View file @
cc5bf2f4
...
...
@@ -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"
/>
...
...
PcapDotNet/src/PcapDotNet.Core.Test/PcapDotNet.Core.Test.csproj
View file @
cc5bf2f4
...
...
@@ -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"
/>
...
...
PcapDotNet/src/PcapDotNet.Core.Test/WiresharkCompareTests.cs
View file @
cc5bf2f4
...
...
@@ -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
.
AssertShow
Hex
(
icmpDatagram
.
Code
);
field
.
AssertShow
Decimal
(
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
.
To
Wireshark
Literal
()).
SequenceToString
(
';'
),
fieldShow
.
Substring
(
fieldShowParametersStart
+
1
));
break
;
case
"http.transfer_encoding"
:
data
.
Append
(
field
.
Value
());
Assert
.
AreEqual
(
httpDatagram
.
Header
.
TransferEncoding
.
TransferCodings
.
SequenceToString
(
','
).
To
Literal
(),
fieldShow
.
To
LowerLiteral
());
Assert
.
AreEqual
(
httpDatagram
.
Header
.
TransferEncoding
.
TransferCodings
.
SequenceToString
(
','
).
To
WiresharkLiteral
(),
fieldShow
.
ToWireshark
LowerLiteral
());
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
.
To
Wireshark
Literal
());
break
;
case
"http.request.version"
:
...
...
PcapDotNet/src/PcapDotNet.
Base/
StringExtensions.cs
→
PcapDotNet/src/PcapDotNet.
Core.Test/Wireshark
StringExtensions.cs
View file @
cc5bf2f4
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
Wireshark
StringExtensions
{
public
static
string
ToLiteral
(
this
string
value
)
public
static
string
To
Wireshark
Literal
(
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
To
Wireshark
LowerLiteral
(
this
string
literalString
)
{
literalString
=
literalString
.
ToLowerInvariant
();
foreach
(
byte
charValue
in
Enumerable
.
Range
(
0xC0
,
0xD7
-
0xC0
).
Concat
(
Enumerable
.
Range
(
0xD8
,
0xDF
-
0xD8
)))
...
...
PcapDotNet/src/PcapDotNet.Packets/Transport/TcpOptionType.cs
View file @
cc5bf2f4
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment