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
1d6bf681
Commit
1d6bf681
authored
Mar 06, 2010
by
Brickner_cp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed ARP over Ethernet invalidity due to Ethernet's trailer
parent
8450970e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
LivePacketDeviceTests.cs
PcapDotNet/src/PcapDotNet.Core.Test/LivePacketDeviceTests.cs
+2
-2
ArpDatagram.cs
PcapDotNet/src/PcapDotNet.Packets/Arp/ArpDatagram.cs
+11
-2
EthernetDatagram.cs
...otNet/src/PcapDotNet.Packets/Ethernet/EthernetDatagram.cs
+1
-1
No files found.
PcapDotNet/src/PcapDotNet.Core.Test/LivePacketDeviceTests.cs
View file @
1d6bf681
...
...
@@ -123,7 +123,7 @@ namespace PcapDotNet.Core.Test
const
int
PacketSize
=
100
;
// Normal
TestReceivePackets
(
NumPacketsToSend
,
NumPacketsToSend
,
int
.
MaxValue
,
2
,
PacketSize
,
PacketCommunicatorReceiveResult
.
Ok
,
NumPacketsToSend
,
0
,
0.0
2
1
);
TestReceivePackets
(
NumPacketsToSend
,
NumPacketsToSend
,
int
.
MaxValue
,
2
,
PacketSize
,
PacketCommunicatorReceiveResult
.
Ok
,
NumPacketsToSend
,
0
,
0.0
4
1
);
// Wait for less packets
TestReceivePackets
(
NumPacketsToSend
,
NumPacketsToSend
/
2
,
int
.
MaxValue
,
2
,
PacketSize
,
PacketCommunicatorReceiveResult
.
Ok
,
NumPacketsToSend
/
2
,
0
,
0.02
);
...
...
@@ -131,7 +131,7 @@ namespace PcapDotNet.Core.Test
// Wait for more packets
TestReceivePackets
(
NumPacketsToSend
,
0
,
int
.
MaxValue
,
2
,
PacketSize
,
PacketCommunicatorReceiveResult
.
None
,
NumPacketsToSend
,
2
,
2.043
);
TestReceivePackets
(
NumPacketsToSend
,
-
1
,
int
.
MaxValue
,
2
,
PacketSize
,
PacketCommunicatorReceiveResult
.
None
,
NumPacketsToSend
,
2
,
2.3
);
TestReceivePackets
(
NumPacketsToSend
,
NumPacketsToSend
+
1
,
int
.
MaxValue
,
2
,
PacketSize
,
PacketCommunicatorReceiveResult
.
None
,
NumPacketsToSend
,
2
,
2.03
);
TestReceivePackets
(
NumPacketsToSend
,
NumPacketsToSend
+
1
,
int
.
MaxValue
,
2
,
PacketSize
,
PacketCommunicatorReceiveResult
.
None
,
NumPacketsToSend
,
2
,
2.03
5
);
// Break loop
TestReceivePackets
(
NumPacketsToSend
,
NumPacketsToSend
,
0
,
2
,
PacketSize
,
PacketCommunicatorReceiveResult
.
BreakLoop
,
0
,
0
,
0.02
);
...
...
PcapDotNet/src/PcapDotNet.Packets/Arp/ArpDatagram.cs
View file @
1d6bf681
...
...
@@ -169,9 +169,13 @@ namespace PcapDotNet.Packets.Arp
return
Length
>=
HeaderBaseLength
&&
Length
==
HeaderLength
;
}
internal
ArpDatagram
(
byte
[]
buffer
,
int
offset
,
int
length
)
:
base
(
buffer
,
offset
,
length
)
internal
static
ArpDatagram
CreateInstance
(
byte
[]
buffer
,
int
offset
,
int
length
)
{
if
(
length
<=
HeaderBaseLength
)
return
new
ArpDatagram
(
buffer
,
offset
,
length
);
int
headerLength
=
GetHeaderLength
(
buffer
[
offset
+
Offset
.
HardwareLength
],
buffer
[
offset
+
Offset
.
ProtocolLength
]);
return
new
ArpDatagram
(
buffer
,
offset
,
Math
.
Min
(
length
,
headerLength
));
}
internal
static
int
GetHeaderLength
(
int
hardwareLength
,
int
protocolLength
)
...
...
@@ -195,6 +199,11 @@ namespace PcapDotNet.Packets.Arp
buffer
.
Write
(
ref
offset
,
targetProtocolAddress
);
}
private
ArpDatagram
(
byte
[]
buffer
,
int
offset
,
int
length
)
:
base
(
buffer
,
offset
,
length
)
{
}
private
int
OffsetSenderProtocolAddress
{
get
{
return
Offset
.
SenderHardwareAddress
+
HardwareLength
;
}
...
...
PcapDotNet/src/PcapDotNet.Packets/Ethernet/EthernetDatagram.cs
View file @
1d6bf681
...
...
@@ -121,7 +121,7 @@ namespace PcapDotNet.Packets.Ethernet
get
{
if
(
_arp
==
null
&&
Length
>=
HeaderLength
)
_arp
=
new
ArpDatagram
(
Buffer
,
StartOffset
+
HeaderLength
,
Length
-
HeaderLength
);
_arp
=
ArpDatagram
.
CreateInstance
(
Buffer
,
StartOffset
+
HeaderLength
,
Length
-
HeaderLength
);
return
_arp
;
}
}
...
...
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