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
8dbd2073
Commit
8dbd2073
authored
Feb 04, 2011
by
Brickner_cp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix: IpV4Datagram's Payload is Datagram and not TcpDatagram.
parent
0ef62882
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
1 deletion
+29
-1
IpV4Tests.cs
PcapDotNet/src/PcapDotNet.Packets.Test/IpV4Tests.cs
+22
-0
IpV4Datagram.cs
PcapDotNet/src/PcapDotNet.Packets/IpV4/IpV4Datagram.cs
+7
-1
No files found.
PcapDotNet/src/PcapDotNet.Packets.Test/IpV4Tests.cs
View file @
8dbd2073
...
@@ -559,6 +559,28 @@ namespace PcapDotNet.Packets.Test
...
@@ -559,6 +559,28 @@ namespace PcapDotNet.Packets.Test
Assert
.
IsNotNull
(
layer
.
GetHashCode
());
Assert
.
IsNotNull
(
layer
.
GetHashCode
());
}
}
[
TestMethod
]
public
void
IpV4PayloadNotTcp
()
{
Packet
packet
=
PacketBuilder
.
Build
(
DateTime
.
Now
,
new
EthernetLayer
(),
new
IpV4Layer
()
{
Protocol
=
IpV4Protocol
.
InternetControlMessageProtocol
},
new
PayloadLayer
()
{
Data
=
new
Datagram
(
new
byte
[
5
])
});
packet
=
PacketBuilder
.
Build
(
DateTime
.
Now
,
packet
.
Ethernet
.
ExtractLayer
(),
packet
.
Ethernet
.
IpV4
.
ExtractLayer
(),
packet
.
Ethernet
.
IpV4
.
Payload
.
ExtractLayer
());
Assert
.
IsNotNull
(
packet
);
}
private
static
Packet
HexToPacket
(
string
hexString
,
DataLinkKind
dataLinkKind
)
private
static
Packet
HexToPacket
(
string
hexString
,
DataLinkKind
dataLinkKind
)
{
{
return
Packet
.
FromHexadecimalString
(
hexString
,
DateTime
.
MinValue
,
dataLinkKind
);
return
Packet
.
FromHexadecimalString
(
hexString
,
DateTime
.
MinValue
,
dataLinkKind
);
...
...
PcapDotNet/src/PcapDotNet.Packets/IpV4/IpV4Datagram.cs
View file @
8dbd2073
...
@@ -224,7 +224,12 @@ namespace PcapDotNet.Packets.IpV4
...
@@ -224,7 +224,12 @@ namespace PcapDotNet.Packets.IpV4
/// </summary>
/// </summary>
public
Datagram
Payload
public
Datagram
Payload
{
{
get
{
return
Tcp
;
}
get
{
if
(
_payload
==
null
&&
Length
>=
HeaderLength
)
_payload
=
new
Datagram
(
Buffer
,
StartOffset
+
HeaderLength
,
Length
-
HeaderLength
);
return
_payload
;
}
}
}
/// <summary>
/// <summary>
...
@@ -449,6 +454,7 @@ namespace PcapDotNet.Packets.IpV4
...
@@ -449,6 +454,7 @@ namespace PcapDotNet.Packets.IpV4
private
bool
?
_isHeaderChecksumCorrect
;
private
bool
?
_isHeaderChecksumCorrect
;
private
bool
?
_isTransportChecksumCorrect
;
private
bool
?
_isTransportChecksumCorrect
;
private
IpV4Options
_options
;
private
IpV4Options
_options
;
private
Datagram
_payload
;
private
IpV4Datagram
_ipV4
;
private
IpV4Datagram
_ipV4
;
private
IcmpDatagram
_icmp
;
private
IcmpDatagram
_icmp
;
private
IgmpDatagram
_igmp
;
private
IgmpDatagram
_igmp
;
...
...
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