aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/input.c8
-rw-r--r--net/dccp/options.c8
2 files changed, 16 insertions, 0 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c
index bd578c87b2e7..da6ec185ed5b 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -300,6 +300,14 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk,
300 if (dccp_parse_options(sk, skb)) 300 if (dccp_parse_options(sk, skb))
301 goto out_invalid_packet; 301 goto out_invalid_packet;
302 302
303 /* Obtain RTT sample from SYN exchange (used by CCID 3) */
304 if (dp->dccps_options_received.dccpor_timestamp_echo) {
305 struct timeval now;
306
307 dccp_timestamp(sk, &now);
308 dp->dccps_syn_rtt = dccp_sample_rtt(sk, &now, NULL);
309 }
310
303 if (dccp_msk(sk)->dccpms_send_ack_vector && 311 if (dccp_msk(sk)->dccpms_send_ack_vector &&
304 dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk, 312 dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk,
305 DCCP_SKB_CB(skb)->dccpd_seq, 313 DCCP_SKB_CB(skb)->dccpd_seq,
diff --git a/net/dccp/options.c b/net/dccp/options.c
index 9074ca7977b2..14b621227323 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -563,6 +563,14 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
563 dccp_insert_options_feat(sk, skb)) 563 dccp_insert_options_feat(sk, skb))
564 return -1; 564 return -1;
565 565
566 /*
567 * Obtain RTT sample from Request/Response exchange.
568 * This is currently used in CCID 3 initialisation.
569 */
570 if (DCCP_SKB_CB(skb)->dccpd_type == DCCP_PKT_REQUEST &&
571 dccp_insert_option_timestamp(sk, skb))
572 return -1;
573
566 /* XXX: insert other options when appropriate */ 574 /* XXX: insert other options when appropriate */
567 575
568 if (DCCP_SKB_CB(skb)->dccpd_opt_len != 0) { 576 if (DCCP_SKB_CB(skb)->dccpd_opt_len != 0) {