3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Initialize ACK tracker correctly

Browse Source
This commit is contained in:
Matias Fontanini
2016-02-17 20:10:22 -08:00
parent da923aa63c
commit 9ef6f7a612
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tcp_ip/flow.cpp
View File

@@ -213,10 +213,17 @@ void Flow::update_state(const TCP& tcp) {
state_ = RST_SENT;
}
else if (state_ == SYN_SENT && (tcp.flags() & TCP::ACK) != 0) {
#ifdef HAVE_ACK_TRACKER
ack_tracker_ = AckTracker(tcp.ack_seq());
#endif // HAVE_ACK_TRACKER
state_ = ESTABLISHED;
seq_number_++;
}
else if (state_ == UNKNOWN && (tcp.flags() & TCP::SYN) != 0) {
// This is the server's state, sending it's first SYN|ACK
#ifdef HAVE_ACK_TRACKER
ack_tracker_ = AckTracker(tcp.ack_seq());
#endif // HAVE_ACK_TRACKER
state_ = SYN_SENT;
seq_number_ = tcp.seq();
const TCP::option* mss_option = tcp.search_option(TCP::MSS);

19
tests/src/tcp_ip.cpp
View File

@@ -688,6 +688,25 @@ TEST_F(AckTrackerTest, AckingTcp_Sack3) {
EXPECT_EQ(5, tracker.acked_intervals().size());
}
TEST_F(FlowTest, AckNumbersAreCorrect) {
using std::placeholders::_1;
vector<EthernetII> packets = three_way_handshake(29, 60, "1.2.3.4", 22, "4.3.2.1", 25);
// Server's ACK number is 9898
packets[1].rfind_pdu<TCP>().ack_seq(9898);
// Client's ACK number is 1717
packets[2].rfind_pdu<TCP>().ack_seq(1717);
StreamFollower follower;
follower.new_stream_callback(bind(&FlowTest::on_new_stream, this, _1));
for (size_t i = 0; i < packets.size(); ++i) {
follower.process_packet(packets[i]);
}
Stream& stream = follower.find_stream(IPv4Address("1.2.3.4"), 22,
IPv4Address("4.3.2.1"), 25);
EXPECT_EQ(1717, stream.client_flow().ack_tracker().ack_number());
EXPECT_EQ(9898, stream.server_flow().ack_tracker().ack_number());
}
#endif // HAVE_ACK_TRACKER
#endif // TINS_IS_CXX11