riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1301 from cgundogan/fix_tcp_handshake_seq_ack_rfc_compliancy

Browse Source 
destiny: wireshark revealed wrong seq/ack nr. in tcp handshake
This commit is contained in:
Christian Mehlis 2014-06-30 22:05:23 +02:00
commit 381fec1fa8
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/net/transport_layer/destiny/socket.c
View File

@ -470,9 +470,8 @@ int send_tcp(socket_internal_t *current_socket, tcp_hdr_t *current_tcp_packet,
set_tcp_packet(current_tcp_packet, current_tcp_socket->local_address.sin6_port, set_tcp_packet(current_tcp_packet, current_tcp_socket->local_address.sin6_port,
current_tcp_socket->foreign_address.sin6_port, current_tcp_socket->foreign_address.sin6_port,
(flags == TCP_ACK ? current_tcp_socket->tcp_control.send_una - 1 : current_tcp_socket->tcp_control.send_una,
current_tcp_socket->tcp_control.send_una), (IS_TCP_ACK(flags) ? current_tcp_socket->tcp_control.rcv_nxt : 0x00), header_length, flags,
current_tcp_socket->tcp_control.rcv_nxt, header_length, flags,
current_tcp_socket->tcp_control.rcv_wnd, 0, 0); current_tcp_socket->tcp_control.rcv_wnd, 0, 0);
/* Fill IPv6 Header */ /* Fill IPv6 Header */
@ -575,7 +574,7 @@ int destiny_socket_connect(int socket, sockaddr6_t *addr, uint32_t addrlen)
#endif #endif
set_tcp_cb(&current_tcp_socket->tcp_control, 0, DESTINY_SOCKET_STATIC_WINDOW, set_tcp_cb(&current_tcp_socket->tcp_control, 0, DESTINY_SOCKET_STATIC_WINDOW,
current_tcp_socket->tcp_control.send_iss, current_tcp_socket->tcp_control.send_iss + 1,
current_tcp_socket->tcp_control.send_iss, 0); current_tcp_socket->tcp_control.send_iss, 0);
/* Remember current time */ /* Remember current time */
@ -617,7 +616,7 @@ int destiny_socket_connect(int socket, sockaddr6_t *addr, uint32_t addrlen)
tcp_hdr_t *tcp_header = ((tcp_hdr_t *)(msg_from_server.content.ptr)); tcp_hdr_t *tcp_header = ((tcp_hdr_t *)(msg_from_server.content.ptr));
/* Check for consistency */ /* Check for consistency */
if (tcp_header->ack_nr != current_tcp_socket->tcp_control.send_nxt + 1) { if (tcp_header->ack_nr != current_tcp_socket->tcp_control.send_nxt) {
printf("TCP packets not consistent!\n"); printf("TCP packets not consistent!\n");
} }
@ -635,11 +634,9 @@ int destiny_socket_connect(int socket, sockaddr6_t *addr, uint32_t addrlen)
current_tcp_socket->tcp_control.rcv_irs = tcp_header->seq_nr; current_tcp_socket->tcp_control.rcv_irs = tcp_header->seq_nr;
set_tcp_cb(&current_tcp_socket->tcp_control, tcp_header->seq_nr + 1, set_tcp_cb(&current_tcp_socket->tcp_control, tcp_header->seq_nr + 1,
current_tcp_socket->tcp_control.rcv_wnd, current_tcp_socket->tcp_control.rcv_wnd,
current_tcp_socket->tcp_control.send_una, current_tcp_socket->tcp_control.send_una + 1,
current_tcp_socket->tcp_control.send_una, tcp_header->ack_nr,
tcp_header->window); tcp_header->window);
current_tcp_socket->tcp_control.send_una++;
current_tcp_socket->tcp_control.send_nxt++;
msg_from_server.type = UNDEFINED; msg_from_server.type = UNDEFINED;
@ -1270,13 +1267,13 @@ int handle_new_tcp_connection(socket_internal_t *current_queued_int_socket,
tcp_header = ((tcp_hdr_t *)(msg_recv_client_ack.content.ptr)); tcp_header = ((tcp_hdr_t *)(msg_recv_client_ack.content.ptr));
/* Check for consistency */ /* Check for consistency */
if (tcp_header->ack_nr != current_queued_socket->tcp_control.send_nxt + 1) { if (tcp_header->ack_nr != current_queued_socket->tcp_control.send_nxt) {
printf("TCP packets not consistent!\n"); printf("TCP packets not consistent!\n");
} }
/* Got ack, connection established, refresh local and foreign tcp socket /* Got ack, connection established, refresh local and foreign tcp socket
* status */ * status */
set_tcp_cb(&current_queued_socket->tcp_control, tcp_header->seq_nr + 1, set_tcp_cb(&current_queued_socket->tcp_control, tcp_header->seq_nr,
current_queued_socket->tcp_control.rcv_wnd, tcp_header->ack_nr, current_queued_socket->tcp_control.rcv_wnd, tcp_header->ack_nr,
tcp_header->ack_nr, tcp_header->window); tcp_header->ack_nr, tcp_header->window);
@ -1379,7 +1376,7 @@ socket_internal_t *new_tcp_queued_socket(ipv6_hdr_t *ipv6_header,
current_queued_socket->socket_values.tcp_control.state = TCP_SYN_RCVD; current_queued_socket->socket_values.tcp_control.state = TCP_SYN_RCVD;
set_tcp_cb(&current_queued_socket->socket_values.tcp_control, set_tcp_cb(&current_queued_socket->socket_values.tcp_control,
tcp_header->seq_nr + 1, DESTINY_SOCKET_STATIC_WINDOW, tcp_header->seq_nr + 1, DESTINY_SOCKET_STATIC_WINDOW,
current_queued_socket->socket_values.tcp_control.send_iss, current_queued_socket->socket_values.tcp_control.send_iss + 1,
current_queued_socket->socket_values.tcp_control.send_iss, current_queued_socket->socket_values.tcp_control.send_iss,
tcp_header->window); tcp_header->window);