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

Solved conflicts.

Browse Source
This commit is contained in:
Matias F
2011-08-12 20:24:51 -03:00
parent 35c1a6e65d 2cdf0f6b29
commit 81bcdeb402
7 changed files with 124 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ip.cpp
View File

@@ -54,6 +54,7 @@ void Tins::IP::init_ip_fields() {
_ip.ihl = sizeof(iphdr) / sizeof(uint32_t);
_ip.ttl = DEFAULT_TTL;
_options_size = 0;
_padded_options_size = 0;
}
/* Setters */
@@ -164,7 +165,7 @@ bool Tins::IP::send(PacketSender* sender) {
return sender->send_l3(this, (const struct sockaddr*)&link_addr, sizeof(link_addr));
}
void Tins::IP::write_serialization(uint8_t *buffer, uint32_t total_sz) {
void Tins::IP::write_serialization(uint8_t *buffer, uint32_t total_sz, PDU *) {
uint32_t my_sz = header_size();
uint32_t new_flag;
assert(total_sz >= my_sz);