Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed bit fields and change to doing some bit math to remove compiler warnings

Browse Source
This commit is contained in:
Matt White 2015-07-30 17:02:14 -07:00
parent de43948e73
commit f34285a3de
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/include/ipv4.h
View File

@ -75,9 +75,6 @@ struct tcp_header {
uint32_t seq_number;
uint32_t ack_number;
uint8_t data_off:4,
reserved:4;
uint16_t flags;
uint16_t window_size;
uint16_t checksum;

4
modules/net.c
View File

@ -617,7 +617,9 @@ static int net_send_ip(struct tcp_socket *socket, int proto, void* payload, uint
};
struct tcp_header* tcp_hdr =(struct tcp_header*)payload;
size_t orig_payload_size = payload_size - sizeof(struct tcp_header) - ((tcp_hdr->data_off - 5) * 4);
// Note: Data offset is in upper 4 bits of flags field. Shift and subtract 5 since that is the min TCP size.
// If the value is more than 5, multiply by 4 because this field is specified in number of words
size_t orig_payload_size = payload_size - sizeof(struct tcp_header) - (((tcp_hdr->flags >> 12) - 5) * 4);
calculate_tcp_checksum(&check_hd, tcp_hdr, tcp_hdr->payload, orig_payload_size);
}