3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-29 13:04:28 +01:00
Code Issues Releases Wiki Activity

Fixed bug in TCP serialize/constructor from buffer.

Browse Source
This commit is contained in:
Matias Fontanini
2012-08-02 10:57:22 -03:00
parent 9fd3b77796
commit 50ce6e0a04
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/tcp.cpp
View File

@@ -20,6 +20,7 @@
*/
#include <stdexcept>
#include <iostream> //borrame
#include <cstring>
#include <cassert>
#include "tcp.h"
@@ -64,10 +65,13 @@ Tins::TCP::TCP(const uint8_t *buffer, uint32_t total_sz) : PDU(Constants::IP::PR
if(total_sz >= header_end) {
uint8_t args[2] = {0};
while(index < header_end) {
for(unsigned i(0); i < 2 && args[0] != NOP; ++i) {
for(unsigned i(0); i < 2; ++i) {
if(index == header_end)
throw std::runtime_error("Not enough size for a TCP header in the buffer.");
args[i] = buffer[index++];
// NOP and EOL contain no length field
if(args[0] == NOP || args[0] == EOL)
break;
}
// We don't want to store NOPs and EOLs
if(args[0] != NOP && args[0] != EOL) {
@@ -81,13 +85,16 @@ Tins::TCP::TCP(const uint8_t *buffer, uint32_t total_sz) : PDU(Constants::IP::PR
add_option((Option)args[0], args[1], 0);
index += args[1];
}
else if(args[0] == EOL)
index = header_end;
else
add_option((Option)args[0], 0, 0);
/*else if(args[0] == EOL)
//index = header_end;
add_option(EOL, 0, 0);
else {
add_option((Option)args[0], 0, 0);
// Skip the NOP
args[0] = 0;
}
}*/
}
buffer += index;
total_sz -= index;
@@ -291,11 +298,13 @@ void Tins::TCP::add_option(Option tcp_option, uint8_t length, const uint8_t *dat
_options.push_back(TCPOption(tcp_option, length, new_data));
_options_size += sizeof(uint8_t);
if(length)
// SACK_OK contains length but not data....
if(length || tcp_option == SACK_OK)
_options_size += sizeof(uint8_t);
if(data)
_options_size += length;
padding = _options_size & 3;
_total_options_size = (padding) ? _options_size - padding + 4 : _options_size;
}
@@ -343,7 +352,7 @@ const Tins::TCP::TCPOption *Tins::TCP::search_option(Option opt) const {
/* TCPOptions */
uint8_t *Tins::TCP::TCPOption::write(uint8_t *buffer) {
if(option == 1) {
if(option == 0 || option == 1) {
*buffer = option;
return buffer + 1;
}

13
tests/src/tcp.cpp
View File

@@ -1,6 +1,7 @@
#include <gtest/gtest.h>
#include <cstring>
#include <string>
#include <algorithm>
#include <stdint.h>
#include "tcp.h"
#include "utils.h"
@@ -172,7 +173,7 @@ void TCPTest::test_equals(const TCP &tcp1, const TCP &tcp2) {
}
// This is not working, but i don't want to fix it right now.
/*TEST_F(TCPTest, ConstructorFromBuffer) {
TEST_F(TCPTest, ConstructorFromBuffer) {
TCP tcp1(expected_packet, sizeof(expected_packet));
uint32_t value32, ovalue32;
uint16_t value16;
@@ -210,5 +211,13 @@ void TCPTest::test_equals(const TCP &tcp1, const TCP &tcp2) {
TCP tcp2(buffer, size);
test_equals(tcp1, tcp2);
delete[] buffer;
}*/
}
TEST_F(TCPTest, Serialize) {
TCP tcp1(expected_packet, sizeof(expected_packet));
uint32_t size;
uint8_t *buffer = tcp1.serialize(size);
ASSERT_EQ(size, sizeof(expected_packet));
ASSERT_TRUE(std::equal(buffer, buffer + size, expected_packet));
delete[] buffer;
}