]> bbs.cooldavid.org Git - net-next-2.6.git/blame - net/dccp/options.c
dccp: Kill dead code and add static markers.
[net-next-2.6.git] / net / dccp / options.c
CommitLineData
7c657876
ACM
1/*
2 * net/dccp/options.c
3 *
4 * An implementation of the DCCP protocol
1bc09869
IM
5 * Copyright (c) 2005 Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
6 * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
e6bccd35 7 * Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz>
7c657876
ACM
8 *
9 * This program is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU General Public License
11 * as published by the Free Software Foundation; either version
12 * 2 of the License, or (at your option) any later version.
13 */
7c657876
ACM
14#include <linux/dccp.h>
15#include <linux/module.h>
16#include <linux/types.h>
76fd1e87 17#include <asm/unaligned.h>
7c657876
ACM
18#include <linux/kernel.h>
19#include <linux/skbuff.h>
20
ae31c339 21#include "ackvec.h"
7c657876
ACM
22#include "ccid.h"
23#include "dccp.h"
afe00251 24#include "feat.h"
7c657876 25
02fa460e 26u64 dccp_decode_value_var(const u8 *bf, const u8 len)
7c657876 27{
02fa460e 28 u64 value = 0;
7c657876 29
02fa460e
GR
30 if (len >= DCCP_OPTVAL_MAXLEN)
31 value += ((u64)*bf++) << 40;
32 if (len > 4)
33 value += ((u64)*bf++) << 32;
7c657876 34 if (len > 3)
02fa460e 35 value += ((u64)*bf++) << 24;
7c657876 36 if (len > 2)
02fa460e 37 value += ((u64)*bf++) << 16;
7c657876 38 if (len > 1)
02fa460e 39 value += ((u64)*bf++) << 8;
7c657876
ACM
40 if (len > 0)
41 value += *bf;
42
43 return value;
44}
45
8b819412
GR
46/**
47 * dccp_parse_options - Parse DCCP options present in @skb
48 * @sk: client|server|listening dccp socket (when @dreq != NULL)
49 * @dreq: request socket to use during connection setup, or NULL
50 */
51int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
52 struct sk_buff *skb)
7c657876
ACM
53{
54 struct dccp_sock *dp = dccp_sk(sk);
7c657876
ACM
55 const struct dccp_hdr *dh = dccp_hdr(skb);
56 const u8 pkt_type = DCCP_SKB_CB(skb)->dccpd_type;
410e27a4 57 u64 ackno = DCCP_SKB_CB(skb)->dccpd_ack_seq;
7c657876
ACM
58 unsigned char *options = (unsigned char *)dh + dccp_hdr_len(skb);
59 unsigned char *opt_ptr = options;
7690af3f
ACM
60 const unsigned char *opt_end = (unsigned char *)dh +
61 (dh->dccph_doff * 4);
7c657876
ACM
62 struct dccp_options_received *opt_recv = &dp->dccps_options_received;
63 unsigned char opt, len;
3ed7cc0f 64 unsigned char *uninitialized_var(value);
1c14ac0a 65 u32 elapsed_time;
76fd1e87 66 __be32 opt_val;
afe00251
AB
67 int rc;
68 int mandatory = 0;
7c657876
ACM
69
70 memset(opt_recv, 0, sizeof(*opt_recv));
71
fb950496 72 opt = len = 0;
7c657876
ACM
73 while (opt_ptr != opt_end) {
74 opt = *opt_ptr++;
75 len = 0;
76 value = NULL;
77
78 /* Check if this isn't a single byte option */
79 if (opt > DCCPO_MAX_RESERVED) {
80 if (opt_ptr == opt_end)
faf61c33 81 goto out_nonsensical_length;
7c657876
ACM
82
83 len = *opt_ptr++;
faf61c33
GR
84 if (len < 2)
85 goto out_nonsensical_length;
7c657876
ACM
86 /*
87 * Remove the type and len fields, leaving
88 * just the value size
89 */
90 len -= 2;
91 value = opt_ptr;
92 opt_ptr += len;
93
94 if (opt_ptr > opt_end)
faf61c33 95 goto out_nonsensical_length;
7c657876
ACM
96 }
97
8b819412 98 /*
8b819412
GR
99 * CCID-specific options are ignored during connection setup, as
100 * negotiation may still be in progress (see RFC 4340, 10.3).
65907a43 101 * The same applies to Ack Vectors, as these depend on the CCID.
8b819412 102 */
a18213d1 103 if (dreq != NULL && (opt >= DCCPO_MIN_RX_CCID_SPECIFIC ||
65907a43 104 opt == DCCPO_ACK_VECTOR_0 || opt == DCCPO_ACK_VECTOR_1))
8b819412
GR
105 goto ignore_option;
106
7c657876
ACM
107 switch (opt) {
108 case DCCPO_PADDING:
109 break;
afe00251
AB
110 case DCCPO_MANDATORY:
111 if (mandatory)
112 goto out_invalid_option;
6df9424a
ACM
113 if (pkt_type != DCCP_PKT_DATA)
114 mandatory = 1;
afe00251 115 break;
7c657876 116 case DCCPO_NDP_COUNT:
5b5d0e70 117 if (len > 6)
7c657876
ACM
118 goto out_invalid_option;
119
120 opt_recv->dccpor_ndp = dccp_decode_value_var(value, len);
5b5d0e70
GR
121 dccp_pr_debug("%s opt: NDP count=%llu\n", dccp_role(sk),
122 (unsigned long long)opt_recv->dccpor_ndp);
7c657876 123 break;
b1ad0042
GR
124 case DCCPO_CHANGE_L ... DCCPO_CONFIRM_R:
125 if (pkt_type == DCCP_PKT_DATA) /* RFC 4340, 6 */
cf86314c 126 break;
e77b8363
GR
127 rc = dccp_feat_parse_options(sk, dreq, mandatory, opt,
128 *value, value + 1, len - 1);
129 if (rc)
130 goto out_featneg_failed;
410e27a4 131 break;
410e27a4
GR
132 case DCCPO_ACK_VECTOR_0:
133 case DCCPO_ACK_VECTOR_1:
134 if (dccp_packet_without_ack(skb)) /* RFC 4340, 11.4 */
135 break;
6fdd34d4 136 if (dp->dccps_hc_rx_ackvec != NULL &&
410e27a4
GR
137 dccp_ackvec_parse(sk, skb, &ackno, opt, value, len))
138 goto out_invalid_option;
afe00251 139 break;
7c657876
ACM
140 case DCCPO_TIMESTAMP:
141 if (len != 4)
142 goto out_invalid_option;
b4d4f7c7
GR
143 /*
144 * RFC 4340 13.1: "The precise time corresponding to
145 * Timestamp Value zero is not specified". We use
146 * zero to indicate absence of a meaningful timestamp.
147 */
76fd1e87 148 opt_val = get_unaligned((__be32 *)value);
b4d4f7c7
GR
149 if (unlikely(opt_val == 0)) {
150 DCCP_WARN("Timestamp with zero value\n");
151 break;
152 }
7c657876 153
b4d4f7c7
GR
154 if (dreq != NULL) {
155 dreq->dreq_timestamp_echo = ntohl(opt_val);
156 dreq->dreq_timestamp_time = dccp_timestamp();
157 } else {
158 opt_recv->dccpor_timestamp =
159 dp->dccps_timestamp_echo = ntohl(opt_val);
160 dp->dccps_timestamp_time = dccp_timestamp();
161 }
09dbc389 162 dccp_pr_debug("%s rx opt: TIMESTAMP=%u, ackno=%llu\n",
b4d4f7c7 163 dccp_role(sk), ntohl(opt_val),
f6ccf554 164 (unsigned long long)
7c657876
ACM
165 DCCP_SKB_CB(skb)->dccpd_ack_seq);
166 break;
167 case DCCPO_TIMESTAMP_ECHO:
1bc09869 168 if (len != 4 && len != 6 && len != 8)
7c657876
ACM
169 goto out_invalid_option;
170
76fd1e87
GR
171 opt_val = get_unaligned((__be32 *)value);
172 opt_recv->dccpor_timestamp_echo = ntohl(opt_val);
7c657876 173
09dbc389 174 dccp_pr_debug("%s rx opt: TIMESTAMP_ECHO=%u, len=%d, "
f73f7097 175 "ackno=%llu", dccp_role(sk),
7690af3f 176 opt_recv->dccpor_timestamp_echo,
f6ccf554
DM
177 len + 2,
178 (unsigned long long)
1bc09869
IM
179 DCCP_SKB_CB(skb)->dccpd_ack_seq);
180
76fd1e87 181 value += 4;
1bc09869 182
76fd1e87 183 if (len == 4) { /* no elapsed time included */
f73f7097 184 dccp_pr_debug_cat("\n");
1c14ac0a 185 break;
f73f7097 186 }
1c14ac0a 187
76fd1e87
GR
188 if (len == 6) { /* 2-byte elapsed time */
189 __be16 opt_val2 = get_unaligned((__be16 *)value);
190 elapsed_time = ntohs(opt_val2);
191 } else { /* 4-byte elapsed time */
192 opt_val = get_unaligned((__be32 *)value);
193 elapsed_time = ntohl(opt_val);
194 }
1c14ac0a 195
dcad856f 196 dccp_pr_debug_cat(", ELAPSED_TIME=%u\n", elapsed_time);
f73f7097 197
1c14ac0a
ACM
198 /* Give precedence to the biggest ELAPSED_TIME */
199 if (elapsed_time > opt_recv->dccpor_elapsed_time)
200 opt_recv->dccpor_elapsed_time = elapsed_time;
7c657876
ACM
201 break;
202 case DCCPO_ELAPSED_TIME:
c86ab2b6
GR
203 if (dccp_packet_without_ack(skb)) /* RFC 4340, 13.2 */
204 break;
1bc09869 205
76fd1e87
GR
206 if (len == 2) {
207 __be16 opt_val2 = get_unaligned((__be16 *)value);
208 elapsed_time = ntohs(opt_val2);
c86ab2b6 209 } else if (len == 4) {
76fd1e87
GR
210 opt_val = get_unaligned((__be32 *)value);
211 elapsed_time = ntohl(opt_val);
c86ab2b6
GR
212 } else {
213 goto out_invalid_option;
76fd1e87 214 }
1c14ac0a
ACM
215
216 if (elapsed_time > opt_recv->dccpor_elapsed_time)
217 opt_recv->dccpor_elapsed_time = elapsed_time;
1bc09869 218
09dbc389
GR
219 dccp_pr_debug("%s rx opt: ELAPSED_TIME=%d\n",
220 dccp_role(sk), elapsed_time);
7c657876 221 break;
a18213d1 222 case DCCPO_MIN_RX_CCID_SPECIFIC ... DCCPO_MAX_RX_CCID_SPECIFIC:
7690af3f 223 if (ccid_hc_rx_parse_options(dp->dccps_hc_rx_ccid, sk,
4874c131 224 pkt_type, opt, value, len))
7c657876 225 goto out_invalid_option;
7c657876 226 break;
a18213d1 227 case DCCPO_MIN_TX_CCID_SPECIFIC ... DCCPO_MAX_TX_CCID_SPECIFIC:
7690af3f 228 if (ccid_hc_tx_parse_options(dp->dccps_hc_tx_ccid, sk,
4874c131 229 pkt_type, opt, value, len))
7c657876 230 goto out_invalid_option;
7c657876
ACM
231 break;
232 default:
59348b19
GR
233 DCCP_CRIT("DCCP(%p): option %d(len=%d) not "
234 "implemented, ignoring", sk, opt, len);
7c657876 235 break;
c9eaf173 236 }
8b819412 237ignore_option:
afe00251
AB
238 if (opt != DCCPO_MANDATORY)
239 mandatory = 0;
7c657876
ACM
240 }
241
6df9424a
ACM
242 /* mandatory was the last byte in option list -> reset connection */
243 if (mandatory)
244 goto out_invalid_option;
245
faf61c33
GR
246out_nonsensical_length:
247 /* RFC 4340, 5.8: ignore option and all remaining option space */
7c657876
ACM
248 return 0;
249
250out_invalid_option:
251 DCCP_INC_STATS_BH(DCCP_MIB_INVALIDOPT);
e77b8363
GR
252 rc = DCCP_RESET_CODE_OPTION_ERROR;
253out_featneg_failed:
254 DCCP_WARN("DCCP(%p): Option %d (len=%d) error=%u\n", sk, opt, len, rc);
255 DCCP_SKB_CB(skb)->dccpd_reset_code = rc;
eac7726b
GR
256 DCCP_SKB_CB(skb)->dccpd_reset_data[0] = opt;
257 DCCP_SKB_CB(skb)->dccpd_reset_data[1] = len > 0 ? value[0] : 0;
258 DCCP_SKB_CB(skb)->dccpd_reset_data[2] = len > 1 ? value[1] : 0;
7c657876
ACM
259 return -1;
260}
261
b61fafc4
ACM
262EXPORT_SYMBOL_GPL(dccp_parse_options);
263
02fa460e 264void dccp_encode_value_var(const u64 value, u8 *to, const u8 len)
7c657876 265{
02fa460e
GR
266 if (len >= DCCP_OPTVAL_MAXLEN)
267 *to++ = (value & 0xFF0000000000ull) >> 40;
268 if (len > 4)
269 *to++ = (value & 0xFF00000000ull) >> 32;
7c657876
ACM
270 if (len > 3)
271 *to++ = (value & 0xFF000000) >> 24;
272 if (len > 2)
273 *to++ = (value & 0xFF0000) >> 16;
274 if (len > 1)
275 *to++ = (value & 0xFF00) >> 8;
276 if (len > 0)
277 *to++ = (value & 0xFF);
278}
279
5b5d0e70 280static inline u8 dccp_ndp_len(const u64 ndp)
7c657876 281{
5b5d0e70
GR
282 if (likely(ndp <= 0xFF))
283 return 1;
4be929be 284 return likely(ndp <= USHRT_MAX) ? 2 : (ndp <= UINT_MAX ? 4 : 6);
7c657876
ACM
285}
286
a7d13fbf
GR
287int dccp_insert_option(struct sk_buff *skb, const unsigned char option,
288 const void *value, const unsigned char len)
7c657876
ACM
289{
290 unsigned char *to;
291
2d0817d1
ACM
292 if (DCCP_SKB_CB(skb)->dccpd_opt_len + len + 2 > DCCP_MAX_OPT_LEN)
293 return -1;
7c657876
ACM
294
295 DCCP_SKB_CB(skb)->dccpd_opt_len += len + 2;
296
297 to = skb_push(skb, len + 2);
298 *to++ = option;
299 *to++ = len + 2;
300
301 memcpy(to, value, len);
2d0817d1 302 return 0;
7c657876
ACM
303}
304
305EXPORT_SYMBOL_GPL(dccp_insert_option);
306
2d0817d1 307static int dccp_insert_option_ndp(struct sock *sk, struct sk_buff *skb)
7c657876
ACM
308{
309 struct dccp_sock *dp = dccp_sk(sk);
5b5d0e70 310 u64 ndp = dp->dccps_ndp_count;
7c657876
ACM
311
312 if (dccp_non_data_packet(skb))
313 ++dp->dccps_ndp_count;
314 else
315 dp->dccps_ndp_count = 0;
316
317 if (ndp > 0) {
318 unsigned char *ptr;
319 const int ndp_len = dccp_ndp_len(ndp);
320 const int len = ndp_len + 2;
321
322 if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
2d0817d1 323 return -1;
7c657876
ACM
324
325 DCCP_SKB_CB(skb)->dccpd_opt_len += len;
326
327 ptr = skb_push(skb, len);
328 *ptr++ = DCCPO_NDP_COUNT;
329 *ptr++ = len;
330 dccp_encode_value_var(ndp, ptr, ndp_len);
331 }
2d0817d1
ACM
332
333 return 0;
7c657876
ACM
334}
335
336static inline int dccp_elapsed_time_len(const u32 elapsed_time)
337{
b1c9fe7b 338 return elapsed_time == 0 ? 0 : elapsed_time <= 0xFFFF ? 2 : 4;
7c657876
ACM
339}
340
a7d13fbf 341int dccp_insert_option_elapsed_time(struct sk_buff *skb, u32 elapsed_time)
7c657876 342{
7c657876
ACM
343 const int elapsed_time_len = dccp_elapsed_time_len(elapsed_time);
344 const int len = 2 + elapsed_time_len;
345 unsigned char *to;
346
1bc09869 347 if (elapsed_time_len == 0)
2d0817d1 348 return 0;
7c657876 349
2d0817d1
ACM
350 if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
351 return -1;
7c657876
ACM
352
353 DCCP_SKB_CB(skb)->dccpd_opt_len += len;
354
355 to = skb_push(skb, len);
356 *to++ = DCCPO_ELAPSED_TIME;
357 *to++ = len;
358
1bc09869 359 if (elapsed_time_len == 2) {
60fe62e7 360 const __be16 var16 = htons((u16)elapsed_time);
1bc09869
IM
361 memcpy(to, &var16, 2);
362 } else {
60fe62e7 363 const __be32 var32 = htonl(elapsed_time);
1bc09869
IM
364 memcpy(to, &var32, 4);
365 }
7c657876 366
2d0817d1 367 return 0;
7c657876
ACM
368}
369
d4b81ff7 370EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time);
7c657876 371
1f4f0f64 372static int dccp_insert_option_timestamp(struct sk_buff *skb)
7c657876 373{
4c70f383 374 __be32 now = htonl(dccp_timestamp());
1bc09869
IM
375 /* yes this will overflow but that is the point as we want a
376 * 10 usec 32 bit timer which mean it wraps every 11.9 hours */
377
a7d13fbf 378 return dccp_insert_option(skb, DCCPO_TIMESTAMP, &now, sizeof(now));
7c657876
ACM
379}
380
b4d4f7c7
GR
381static int dccp_insert_option_timestamp_echo(struct dccp_sock *dp,
382 struct dccp_request_sock *dreq,
2d0817d1 383 struct sk_buff *skb)
7c657876 384{
60fe62e7 385 __be32 tstamp_echo;
7c657876 386 unsigned char *to;
b4d4f7c7
GR
387 u32 elapsed_time, elapsed_time_len, len;
388
389 if (dreq != NULL) {
390 elapsed_time = dccp_timestamp() - dreq->dreq_timestamp_time;
391 tstamp_echo = htonl(dreq->dreq_timestamp_echo);
392 dreq->dreq_timestamp_echo = 0;
393 } else {
394 elapsed_time = dccp_timestamp() - dp->dccps_timestamp_time;
395 tstamp_echo = htonl(dp->dccps_timestamp_echo);
396 dp->dccps_timestamp_echo = 0;
397 }
398
b0e56780
ACM
399 elapsed_time_len = dccp_elapsed_time_len(elapsed_time);
400 len = 6 + elapsed_time_len;
401
2d0817d1
ACM
402 if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
403 return -1;
7c657876
ACM
404
405 DCCP_SKB_CB(skb)->dccpd_opt_len += len;
406
407 to = skb_push(skb, len);
408 *to++ = DCCPO_TIMESTAMP_ECHO;
409 *to++ = len;
410
7c657876
ACM
411 memcpy(to, &tstamp_echo, 4);
412 to += 4;
afe00251 413
1bc09869 414 if (elapsed_time_len == 2) {
60fe62e7 415 const __be16 var16 = htons((u16)elapsed_time);
1bc09869
IM
416 memcpy(to, &var16, 2);
417 } else if (elapsed_time_len == 4) {
60fe62e7 418 const __be32 var32 = htonl(elapsed_time);
1bc09869
IM
419 memcpy(to, &var32, 4);
420 }
7c657876 421
2d0817d1 422 return 0;
7c657876
ACM
423}
424
d3710566
GR
425/**
426 * dccp_insert_option_mandatory - Mandatory option (5.8.2)
427 * Note that since we are using skb_push, this function needs to be called
428 * _after_ inserting the option it is supposed to influence (stack order).
429 */
430int dccp_insert_option_mandatory(struct sk_buff *skb)
431{
432 if (DCCP_SKB_CB(skb)->dccpd_opt_len >= DCCP_MAX_OPT_LEN)
433 return -1;
434
435 DCCP_SKB_CB(skb)->dccpd_opt_len++;
436 *skb_push(skb, 1) = DCCPO_MANDATORY;
437 return 0;
438}
439
8c862c23
GR
440/**
441 * dccp_insert_fn_opt - Insert single Feature-Negotiation option into @skb
442 * @type: %DCCPO_CHANGE_L, %DCCPO_CHANGE_R, %DCCPO_CONFIRM_L, %DCCPO_CONFIRM_R
443 * @feat: one out of %dccp_feature_numbers
444 * @val: NN value or SP array (preferred element first) to copy
445 * @len: true length of @val in bytes (excluding first element repetition)
446 * @repeat_first: whether to copy the first element of @val twice
447 * The last argument is used to construct Confirm options, where the preferred
448 * value and the preference list appear separately (RFC 4340, 6.3.1). Preference
449 * lists are kept such that the preferred entry is always first, so we only need
450 * to copy twice, and avoid the overhead of cloning into a bigger array.
451 */
452int dccp_insert_fn_opt(struct sk_buff *skb, u8 type, u8 feat,
453 u8 *val, u8 len, bool repeat_first)
4829007c 454{
8c862c23 455 u8 tot_len, *to;
4829007c 456
8c862c23
GR
457 /* take the `Feature' field and possible repetition into account */
458 if (len > (DCCP_SINGLE_OPT_MAXLEN - 2)) {
459 DCCP_WARN("length %u for feature %u too large\n", len, feat);
4829007c 460 return -1;
c2f42077 461 }
4829007c 462
8c862c23
GR
463 if (unlikely(val == NULL || len == 0))
464 len = repeat_first = 0;
465 tot_len = 3 + repeat_first + len;
466
467 if (DCCP_SKB_CB(skb)->dccpd_opt_len + tot_len > DCCP_MAX_OPT_LEN) {
468 DCCP_WARN("packet too small for feature %d option!\n", feat);
469 return -1;
470 }
471 DCCP_SKB_CB(skb)->dccpd_opt_len += tot_len;
4829007c 472
8c862c23 473 to = skb_push(skb, tot_len);
410e27a4 474 *to++ = type;
8c862c23 475 *to++ = tot_len;
410e27a4 476 *to++ = feat;
4829007c 477
8c862c23
GR
478 if (repeat_first)
479 *to++ = *val;
410e27a4
GR
480 if (len)
481 memcpy(to, val, len);
d0440ee6
GR
482 return 0;
483}
484
af3b867e
GR
485/* The length of all options needs to be a multiple of 4 (5.8) */
486static void dccp_insert_option_padding(struct sk_buff *skb)
487{
488 int padding = DCCP_SKB_CB(skb)->dccpd_opt_len % 4;
489
490 if (padding != 0) {
491 padding = 4 - padding;
492 memset(skb_push(skb, padding), 0, padding);
493 DCCP_SKB_CB(skb)->dccpd_opt_len += padding;
494 }
495}
496
2d0817d1 497int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
7c657876
ACM
498{
499 struct dccp_sock *dp = dccp_sk(sk);
500
501 DCCP_SKB_CB(skb)->dccpd_opt_len = 0;
502
4098dce5 503 if (dp->dccps_send_ndp_count && dccp_insert_option_ndp(sk, skb))
2d0817d1 504 return -1;
7c657876 505
8b7b6c75
GR
506 if (DCCP_SKB_CB(skb)->dccpd_type != DCCP_PKT_DATA) {
507
508 /* Feature Negotiation */
509 if (dccp_feat_insert_opts(dp, NULL, skb))
2d0817d1 510 return -1;
8b7b6c75
GR
511
512 if (DCCP_SKB_CB(skb)->dccpd_type == DCCP_PKT_REQUEST) {
513 /*
514 * Obtain RTT sample from Request/Response exchange.
59b80802 515 * This is currently used for TFRC initialisation.
8b7b6c75 516 */
a7d13fbf 517 if (dccp_insert_option_timestamp(skb))
8b7b6c75
GR
518 return -1;
519
6fdd34d4 520 } else if (dp->dccps_hc_rx_ackvec != NULL &&
8b7b6c75
GR
521 dccp_ackvec_pending(dp->dccps_hc_rx_ackvec) &&
522 dccp_insert_option_ackvec(sk, skb)) {
523 return -1;
524 }
7c657876
ACM
525 }
526
507d37cf 527 if (dp->dccps_hc_rx_insert_options) {
2d0817d1
ACM
528 if (ccid_hc_rx_insert_options(dp->dccps_hc_rx_ccid, sk, skb))
529 return -1;
507d37cf
ACM
530 dp->dccps_hc_rx_insert_options = 0;
531 }
7c657876 532
b4d4f7c7
GR
533 if (dp->dccps_timestamp_echo != 0 &&
534 dccp_insert_option_timestamp_echo(dp, NULL, skb))
535 return -1;
536
af3b867e
GR
537 dccp_insert_option_padding(skb);
538 return 0;
539}
7c657876 540
af3b867e
GR
541int dccp_insert_options_rsk(struct dccp_request_sock *dreq, struct sk_buff *skb)
542{
543 DCCP_SKB_CB(skb)->dccpd_opt_len = 0;
7c657876 544
8b7b6c75
GR
545 if (dccp_feat_insert_opts(NULL, dreq, skb))
546 return -1;
547
59b80802
GR
548 /* Obtain RTT sample from Response/Ack exchange (used by TFRC). */
549 if (dccp_insert_option_timestamp(skb))
550 return -1;
551
af3b867e
GR
552 if (dreq->dreq_timestamp_echo != 0 &&
553 dccp_insert_option_timestamp_echo(NULL, dreq, skb))
554 return -1;
2d0817d1 555
af3b867e 556 dccp_insert_option_padding(skb);
2d0817d1 557 return 0;
7c657876 558}