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

DHCP is working. Fixed ip checksum problem.

Browse Source
This commit is contained in:
Matias Fontanini
2011-08-17 15:12:29 -03:00
parent 729a0296ac
commit 4dfa4d70eb
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ip.cpp
View File

@@ -28,7 +28,6 @@
#include "rawpdu.h"
#include "utils.h"
#include <iostream>
using namespace std;
@@ -200,16 +199,13 @@ void Tins::IP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU
_ip.protocol = new_flag;
_ip.tot_len = Utils::net_to_host_s(total_sz);
_ip.ihl = my_sz / sizeof(uint32_t);
if (parent && (_ip.check == 0)) {
uint32_t checksum = PDU::do_checksum((uint8_t*)&_ip, ((uint8_t*)&_ip) + sizeof(iphdr));
checksum += PDU::do_checksum(buffer + sizeof(iphdr), buffer + total_sz);
memcpy(buffer, &_ip, sizeof(iphdr));
if (parent && !_ip.check) {
uint32_t checksum = PDU::do_checksum(buffer, buffer + sizeof(iphdr));
while (checksum >> 16)
checksum = (checksum & 0xffff) + (checksum >> 16);
_ip.check = Utils::net_to_host_s(~checksum);
((iphdr*)buffer)->check = Utils::net_to_host_s(~checksum);
}
memcpy(buffer, &_ip, sizeof(iphdr));
/* IP Options here... */
buffer += sizeof(iphdr);
for (uint32_t i = 0; i < _ip_options.size(); ++i)

6
src/tcp.cpp
View File

@@ -151,14 +151,14 @@ void Tins::TCP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PD
}
const Tins::IP *ip_packet = dynamic_cast<const Tins::IP*>(parent);
memcpy(tcp_start, &_tcp, sizeof(tcphdr));
if(!_tcp.check && ip_packet) {
uint32_t checksum = PDU::pseudoheader_checksum(ip_packet->source_address(), ip_packet->dest_address(), size(), IPPROTO_TCP) +
PDU::do_checksum(tcp_start + sizeof(tcphdr), tcp_start + total_sz) + PDU::do_checksum((uint8_t*)&_tcp, ((uint8_t*)&_tcp) + sizeof(tcphdr));
PDU::do_checksum(tcp_start, tcp_start + total_sz);
while (checksum >> 16)
checksum = (checksum & 0xffff) + (checksum >> 16);
_tcp.check = Utils::net_to_host_s(~checksum);
((tcphdr*)tcp_start)->check = Utils::net_to_host_s(~checksum);
}
memcpy(tcp_start, &_tcp, sizeof(tcphdr));
_tcp.check = 0;
}