options.c 16.2 KB
Newer Older
1 2 3 4
/*
 *  net/dccp/options.c
 *
 *  An implementation of the DCCP protocol
I
Ian McDonald 已提交
5 6
 *  Copyright (c) 2005 Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
 *  Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
7
 *  Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz>
8 9 10 11 12 13 14 15 16
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
 *      as published by the Free Software Foundation; either version
 *      2 of the License, or (at your option) any later version.
 */
#include <linux/dccp.h>
#include <linux/module.h>
#include <linux/types.h>
G
Gerrit Renker 已提交
17
#include <asm/unaligned.h>
18 19 20
#include <linux/kernel.h>
#include <linux/skbuff.h>

21
#include "ackvec.h"
22 23
#include "ccid.h"
#include "dccp.h"
24
#include "feat.h"
25

26 27 28 29 30 31
int sysctl_dccp_feat_sequence_window = DCCPF_INITIAL_SEQUENCE_WINDOW;
int sysctl_dccp_feat_rx_ccid	      = DCCPF_INITIAL_CCID;
int sysctl_dccp_feat_tx_ccid	      = DCCPF_INITIAL_CCID;
int sysctl_dccp_feat_ack_ratio	      = DCCPF_INITIAL_ACK_RATIO;
int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR;
int sysctl_dccp_feat_send_ndp_count  = DCCPF_INITIAL_SEND_NDP_COUNT;
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48

static u32 dccp_decode_value_var(const unsigned char *bf, const u8 len)
{
	u32 value = 0;

	if (len > 3)
		value += *bf++ << 24;
	if (len > 2)
		value += *bf++ << 16;
	if (len > 1)
		value += *bf++ << 8;
	if (len > 0)
		value += *bf;

	return value;
}

49 50 51 52 53 54 55
/**
 * dccp_parse_options  -  Parse DCCP options present in @skb
 * @sk: client|server|listening dccp socket (when @dreq != NULL)
 * @dreq: request socket to use during connection setup, or NULL
 */
int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
		       struct sk_buff *skb)
56 57 58 59
{
	struct dccp_sock *dp = dccp_sk(sk);
	const struct dccp_hdr *dh = dccp_hdr(skb);
	const u8 pkt_type = DCCP_SKB_CB(skb)->dccpd_type;
60
	u64 ackno = DCCP_SKB_CB(skb)->dccpd_ack_seq;
61 62
	unsigned char *options = (unsigned char *)dh + dccp_hdr_len(skb);
	unsigned char *opt_ptr = options;
63 64
	const unsigned char *opt_end = (unsigned char *)dh +
					(dh->dccph_doff * 4);
65 66 67
	struct dccp_options_received *opt_recv = &dp->dccps_options_received;
	unsigned char opt, len;
	unsigned char *value;
68
	u32 elapsed_time;
G
Gerrit Renker 已提交
69
	__be32 opt_val;
70 71
	int rc;
	int mandatory = 0;
72 73 74

	memset(opt_recv, 0, sizeof(*opt_recv));

75
	opt = len = 0;
76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
	while (opt_ptr != opt_end) {
		opt   = *opt_ptr++;
		len   = 0;
		value = NULL;

		/* Check if this isn't a single byte option */
		if (opt > DCCPO_MAX_RESERVED) {
			if (opt_ptr == opt_end)
				goto out_invalid_option;

			len = *opt_ptr++;
			if (len < 3)
				goto out_invalid_option;
			/*
			 * Remove the type and len fields, leaving
			 * just the value size
			 */
			len	-= 2;
			value	= opt_ptr;
			opt_ptr += len;

			if (opt_ptr > opt_end)
				goto out_invalid_option;
		}

101 102 103 104 105 106 107 108 109
		/*
		 * CCID-Specific Options (from RFC 4340, sec. 10.3):
		 *
		 * Option numbers 128 through 191 are for options sent from the
		 * HC-Sender to the HC-Receiver; option numbers 192 through 255
		 * are for options sent from the HC-Receiver to	the HC-Sender.
		 *
		 * CCID-specific options are ignored during connection setup, as
		 * negotiation may still be in progress (see RFC 4340, 10.3).
110
		 * The same applies to Ack Vectors, as these depend on the CCID.
111 112
		 *
		 */
113 114
		if (dreq != NULL && (opt >= 128 ||
		    opt == DCCPO_ACK_VECTOR_0 || opt == DCCPO_ACK_VECTOR_1))
115 116
			goto ignore_option;

117 118 119
		switch (opt) {
		case DCCPO_PADDING:
			break;
120 121 122
		case DCCPO_MANDATORY:
			if (mandatory)
				goto out_invalid_option;
123 124
			if (pkt_type != DCCP_PKT_DATA)
				mandatory = 1;
125
			break;
126
		case DCCPO_NDP_COUNT:
127
			if (len > 6)
128 129 130
				goto out_invalid_option;

			opt_recv->dccpor_ndp = dccp_decode_value_var(value, len);
131 132
			dccp_pr_debug("%s opt: NDP count=%llu\n", dccp_role(sk),
				      (unsigned long long)opt_recv->dccpor_ndp);
133
			break;
134 135 136
		case DCCPO_CHANGE_L:
			/* fall through */
		case DCCPO_CHANGE_R:
137 138
			if (pkt_type == DCCP_PKT_DATA)
				break;
139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
			if (len < 2)
				goto out_invalid_option;
			rc = dccp_feat_change_recv(sk, opt, *value, value + 1,
						   len - 1);
			/*
			 * When there is a change error, change_recv is
			 * responsible for dealing with it.  i.e. reply with an
			 * empty confirm.
			 * If the change was mandatory, then we need to die.
			 */
			if (rc && mandatory)
				goto out_invalid_option;
			break;
		case DCCPO_CONFIRM_L:
			/* fall through */
		case DCCPO_CONFIRM_R:
155 156 157
			if (pkt_type == DCCP_PKT_DATA)
				break;
			if (len < 2)	/* FIXME this disallows empty confirm */
158 159 160 161 162
				goto out_invalid_option;
			if (dccp_feat_confirm_recv(sk, opt, *value,
						   value + 1, len - 1))
				goto out_invalid_option;
			break;
163
		case DCCPO_ACK_VECTOR_0:
164
		case DCCPO_ACK_VECTOR_1:
165
			if (dccp_packet_without_ack(skb))   /* RFC 4340, 11.4 */
166
				break;
167

168
			if (dccp_msk(sk)->dccpms_send_ack_vector &&
169
			    dccp_ackvec_parse(sk, skb, &ackno, opt, value, len))
170
				goto out_invalid_option;
171 172 173 174
			break;
		case DCCPO_TIMESTAMP:
			if (len != 4)
				goto out_invalid_option;
175 176 177 178 179
			/*
			 * RFC 4340 13.1: "The precise time corresponding to
			 * Timestamp Value zero is not specified". We use
			 * zero to indicate absence of a meaningful timestamp.
			 */
G
Gerrit Renker 已提交
180
			opt_val = get_unaligned((__be32 *)value);
181 182 183 184
			if (unlikely(opt_val == 0)) {
				DCCP_WARN("Timestamp with zero value\n");
				break;
			}
185

186 187 188 189 190 191 192 193
			if (dreq != NULL) {
				dreq->dreq_timestamp_echo = ntohl(opt_val);
				dreq->dreq_timestamp_time = dccp_timestamp();
			} else {
				opt_recv->dccpor_timestamp =
					dp->dccps_timestamp_echo = ntohl(opt_val);
				dp->dccps_timestamp_time = dccp_timestamp();
			}
194
			dccp_pr_debug("%s rx opt: TIMESTAMP=%u, ackno=%llu\n",
195
				      dccp_role(sk), ntohl(opt_val),
196
				      (unsigned long long)
197 198 199
				      DCCP_SKB_CB(skb)->dccpd_ack_seq);
			break;
		case DCCPO_TIMESTAMP_ECHO:
I
Ian McDonald 已提交
200
			if (len != 4 && len != 6 && len != 8)
201 202
				goto out_invalid_option;

G
Gerrit Renker 已提交
203 204
			opt_val = get_unaligned((__be32 *)value);
			opt_recv->dccpor_timestamp_echo = ntohl(opt_val);
205

206
			dccp_pr_debug("%s rx opt: TIMESTAMP_ECHO=%u, len=%d, "
207
				      "ackno=%llu", dccp_role(sk),
208
				      opt_recv->dccpor_timestamp_echo,
209 210
				      len + 2,
				      (unsigned long long)
I
Ian McDonald 已提交
211 212
				      DCCP_SKB_CB(skb)->dccpd_ack_seq);

G
Gerrit Renker 已提交
213
			value += 4;
I
Ian McDonald 已提交
214

G
Gerrit Renker 已提交
215
			if (len == 4) {		/* no elapsed time included */
216
				dccp_pr_debug_cat("\n");
217
				break;
218
			}
219

G
Gerrit Renker 已提交
220 221 222 223 224 225 226
			if (len == 6) {		/* 2-byte elapsed time */
				__be16 opt_val2 = get_unaligned((__be16 *)value);
				elapsed_time = ntohs(opt_val2);
			} else {		/* 4-byte elapsed time */
				opt_val = get_unaligned((__be32 *)value);
				elapsed_time = ntohl(opt_val);
			}
227

G
Gerrit Renker 已提交
228
			dccp_pr_debug_cat(", ELAPSED_TIME=%u\n", elapsed_time);
229

230 231 232
			/* Give precedence to the biggest ELAPSED_TIME */
			if (elapsed_time > opt_recv->dccpor_elapsed_time)
				opt_recv->dccpor_elapsed_time = elapsed_time;
233 234
			break;
		case DCCPO_ELAPSED_TIME:
235 236
			if (dccp_packet_without_ack(skb))   /* RFC 4340, 13.2 */
				break;
I
Ian McDonald 已提交
237

G
Gerrit Renker 已提交
238 239 240
			if (len == 2) {
				__be16 opt_val2 = get_unaligned((__be16 *)value);
				elapsed_time = ntohs(opt_val2);
241
			} else if (len == 4) {
G
Gerrit Renker 已提交
242 243
				opt_val = get_unaligned((__be32 *)value);
				elapsed_time = ntohl(opt_val);
244 245
			} else {
				goto out_invalid_option;
G
Gerrit Renker 已提交
246
			}
247 248 249

			if (elapsed_time > opt_recv->dccpor_elapsed_time)
				opt_recv->dccpor_elapsed_time = elapsed_time;
I
Ian McDonald 已提交
250

251 252
			dccp_pr_debug("%s rx opt: ELAPSED_TIME=%d\n",
				      dccp_role(sk), elapsed_time);
253 254 255 256
			break;
		case 128 ... 191: {
			const u16 idx = value - options;

257 258 259
			if (ccid_hc_rx_parse_options(dp->dccps_hc_rx_ccid, sk,
						     opt, len, idx,
						     value) != 0)
260 261 262 263 264 265
				goto out_invalid_option;
		}
			break;
		case 192 ... 255: {
			const u16 idx = value - options;

266 267 268
			if (ccid_hc_tx_parse_options(dp->dccps_hc_tx_ccid, sk,
						     opt, len, idx,
						     value) != 0)
269 270 271 272
				goto out_invalid_option;
		}
			break;
		default:
273 274
			DCCP_CRIT("DCCP(%p): option %d(len=%d) not "
				  "implemented, ignoring", sk, opt, len);
275
			break;
276
		}
277
ignore_option:
278 279
		if (opt != DCCPO_MANDATORY)
			mandatory = 0;
280 281
	}

282 283 284 285
	/* mandatory was the last byte in option list -> reset connection */
	if (mandatory)
		goto out_invalid_option;

286 287 288 289 290
	return 0;

out_invalid_option:
	DCCP_INC_STATS_BH(DCCP_MIB_INVALIDOPT);
	DCCP_SKB_CB(skb)->dccpd_reset_code = DCCP_RESET_CODE_OPTION_ERROR;
291
	DCCP_WARN("DCCP(%p): invalid option %d, len=%d", sk, opt, len);
292 293 294
	return -1;
}

295 296
EXPORT_SYMBOL_GPL(dccp_parse_options);

297 298 299 300 301 302 303 304 305 306 307 308 309
static void dccp_encode_value_var(const u32 value, unsigned char *to,
				  const unsigned int len)
{
	if (len > 3)
		*to++ = (value & 0xFF000000) >> 24;
	if (len > 2)
		*to++ = (value & 0xFF0000) >> 16;
	if (len > 1)
		*to++ = (value & 0xFF00) >> 8;
	if (len > 0)
		*to++ = (value & 0xFF);
}

310
static inline u8 dccp_ndp_len(const u64 ndp)
311
{
312 313 314
	if (likely(ndp <= 0xFF))
		return 1;
	return likely(ndp <= USHORT_MAX) ? 2 : (ndp <= UINT_MAX ? 4 : 6);
315 316
}

317
int dccp_insert_option(struct sock *sk, struct sk_buff *skb,
318 319 320 321 322
			const unsigned char option,
			const void *value, const unsigned char len)
{
	unsigned char *to;

323 324
	if (DCCP_SKB_CB(skb)->dccpd_opt_len + len + 2 > DCCP_MAX_OPT_LEN)
		return -1;
325 326 327 328 329 330 331 332

	DCCP_SKB_CB(skb)->dccpd_opt_len += len + 2;

	to    = skb_push(skb, len + 2);
	*to++ = option;
	*to++ = len + 2;

	memcpy(to, value, len);
333
	return 0;
334 335 336 337
}

EXPORT_SYMBOL_GPL(dccp_insert_option);

338
static int dccp_insert_option_ndp(struct sock *sk, struct sk_buff *skb)
339 340
{
	struct dccp_sock *dp = dccp_sk(sk);
341
	u64 ndp = dp->dccps_ndp_count;
342 343 344 345 346 347 348 349 350 351 352 353

	if (dccp_non_data_packet(skb))
		++dp->dccps_ndp_count;
	else
		dp->dccps_ndp_count = 0;

	if (ndp > 0) {
		unsigned char *ptr;
		const int ndp_len = dccp_ndp_len(ndp);
		const int len = ndp_len + 2;

		if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
354
			return -1;
355 356 357 358 359 360 361 362

		DCCP_SKB_CB(skb)->dccpd_opt_len += len;

		ptr = skb_push(skb, len);
		*ptr++ = DCCPO_NDP_COUNT;
		*ptr++ = len;
		dccp_encode_value_var(ndp, ptr, ndp_len);
	}
363 364

	return 0;
365 366 367 368
}

static inline int dccp_elapsed_time_len(const u32 elapsed_time)
{
369
	return elapsed_time == 0 ? 0 : elapsed_time <= 0xFFFF ? 2 : 4;
370 371
}

372 373
int dccp_insert_option_elapsed_time(struct sock *sk, struct sk_buff *skb,
				    u32 elapsed_time)
374 375 376 377 378
{
	const int elapsed_time_len = dccp_elapsed_time_len(elapsed_time);
	const int len = 2 + elapsed_time_len;
	unsigned char *to;

I
Ian McDonald 已提交
379
	if (elapsed_time_len == 0)
380
		return 0;
381

382 383
	if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
		return -1;
384 385 386 387 388 389 390

	DCCP_SKB_CB(skb)->dccpd_opt_len += len;

	to    = skb_push(skb, len);
	*to++ = DCCPO_ELAPSED_TIME;
	*to++ = len;

I
Ian McDonald 已提交
391
	if (elapsed_time_len == 2) {
392
		const __be16 var16 = htons((u16)elapsed_time);
I
Ian McDonald 已提交
393 394
		memcpy(to, &var16, 2);
	} else {
395
		const __be32 var32 = htonl(elapsed_time);
I
Ian McDonald 已提交
396 397
		memcpy(to, &var32, 4);
	}
398

399
	return 0;
400 401
}

402
EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time);
403

404
int dccp_insert_option_timestamp(struct sock *sk, struct sk_buff *skb)
405
{
406
	__be32 now = htonl(dccp_timestamp());
I
Ian McDonald 已提交
407 408 409
	/* yes this will overflow but that is the point as we want a
	 * 10 usec 32 bit timer which mean it wraps every 11.9 hours */

410
	return dccp_insert_option(sk, skb, DCCPO_TIMESTAMP, &now, sizeof(now));
411 412
}

413 414
EXPORT_SYMBOL_GPL(dccp_insert_option_timestamp);

415 416
static int dccp_insert_option_timestamp_echo(struct dccp_sock *dp,
					     struct dccp_request_sock *dreq,
417
					     struct sk_buff *skb)
418
{
419
	__be32 tstamp_echo;
420
	unsigned char *to;
421 422 423 424 425 426 427 428 429 430 431 432
	u32 elapsed_time, elapsed_time_len, len;

	if (dreq != NULL) {
		elapsed_time = dccp_timestamp() - dreq->dreq_timestamp_time;
		tstamp_echo  = htonl(dreq->dreq_timestamp_echo);
		dreq->dreq_timestamp_echo = 0;
	} else {
		elapsed_time = dccp_timestamp() - dp->dccps_timestamp_time;
		tstamp_echo  = htonl(dp->dccps_timestamp_echo);
		dp->dccps_timestamp_echo = 0;
	}

433 434 435
	elapsed_time_len = dccp_elapsed_time_len(elapsed_time);
	len = 6 + elapsed_time_len;

436 437
	if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
		return -1;
438 439 440 441 442 443 444 445 446

	DCCP_SKB_CB(skb)->dccpd_opt_len += len;

	to    = skb_push(skb, len);
	*to++ = DCCPO_TIMESTAMP_ECHO;
	*to++ = len;

	memcpy(to, &tstamp_echo, 4);
	to += 4;
447

I
Ian McDonald 已提交
448
	if (elapsed_time_len == 2) {
449
		const __be16 var16 = htons((u16)elapsed_time);
I
Ian McDonald 已提交
450 451
		memcpy(to, &var16, 2);
	} else if (elapsed_time_len == 4) {
452
		const __be32 var32 = htonl(elapsed_time);
I
Ian McDonald 已提交
453 454
		memcpy(to, &var32, 4);
	}
455

456
	return 0;
457 458
}

459
static int dccp_insert_feat_opt(struct sk_buff *skb, u8 type, u8 feat,
460
				u8 *val, u8 len)
461 462 463 464
{
	u8 *to;

	if (DCCP_SKB_CB(skb)->dccpd_opt_len + len + 3 > DCCP_MAX_OPT_LEN) {
465
		DCCP_WARN("packet too small for feature %d option!\n", feat);
466 467 468 469 470 471 472 473 474 475 476 477 478
		return -1;
	}

	DCCP_SKB_CB(skb)->dccpd_opt_len += len + 3;

	to    = skb_push(skb, len + 3);
	*to++ = type;
	*to++ = len + 3;
	*to++ = feat;

	if (len)
		memcpy(to, val, len);

479 480 481
	dccp_pr_debug("%s(%s (%d), ...), length %d\n",
		      dccp_feat_typename(type),
		      dccp_feat_name(feat), feat, len);
482 483 484
	return 0;
}

485
static int dccp_insert_options_feat(struct sock *sk, struct sk_buff *skb)
486 487
{
	struct dccp_sock *dp = dccp_sk(sk);
488
	struct dccp_minisock *dmsk = dccp_msk(sk);
489 490 491 492
	struct dccp_opt_pend *opt, *next;
	int change = 0;

	/* confirm any options [NN opts] */
493
	list_for_each_entry_safe(opt, next, &dmsk->dccpms_conf, dccpop_node) {
494 495 496 497 498 499 500 501
		dccp_insert_feat_opt(skb, opt->dccpop_type,
				     opt->dccpop_feat, opt->dccpop_val,
				     opt->dccpop_len);
		/* fear empty confirms */
		if (opt->dccpop_val)
			kfree(opt->dccpop_val);
		kfree(opt);
	}
502
	INIT_LIST_HEAD(&dmsk->dccpms_conf);
503 504

	/* see which features we need to send */
505
	list_for_each_entry(opt, &dmsk->dccpms_pending, dccpop_node) {
506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543
		/* see if we need to send any confirm */
		if (opt->dccpop_sc) {
			dccp_insert_feat_opt(skb, opt->dccpop_type + 1,
					     opt->dccpop_feat,
					     opt->dccpop_sc->dccpoc_val,
					     opt->dccpop_sc->dccpoc_len);

			BUG_ON(!opt->dccpop_sc->dccpoc_val);
			kfree(opt->dccpop_sc->dccpoc_val);
			kfree(opt->dccpop_sc);
			opt->dccpop_sc = NULL;
		}

		/* any option not confirmed, re-send it */
		if (!opt->dccpop_conf) {
			dccp_insert_feat_opt(skb, opt->dccpop_type,
					     opt->dccpop_feat, opt->dccpop_val,
					     opt->dccpop_len);
			change++;
		}
	}

	/* Retransmit timer.
	 * If this is the master listening sock, we don't set a timer on it.  It
	 * should be fine because if the dude doesn't receive our RESPONSE
	 * [which will contain the CHANGE] he will send another REQUEST which
	 * will "retrnasmit" the change.
	 */
	if (change && dp->dccps_role != DCCP_ROLE_LISTEN) {
		dccp_pr_debug("reset feat negotiation timer %p\n", sk);

		/* XXX don't reset the timer on re-transmissions.  I.e. reset it
		 * only when sending new stuff i guess.  Currently the timer
		 * never backs off because on re-transmission it just resets it!
		 */
		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
					  inet_csk(sk)->icsk_rto, DCCP_RTO_MAX);
	}
544 545

	return 0;
546 547
}

548 549 550 551 552 553 554 555 556 557 558 559
/* The length of all options needs to be a multiple of 4 (5.8) */
static void dccp_insert_option_padding(struct sk_buff *skb)
{
	int padding = DCCP_SKB_CB(skb)->dccpd_opt_len % 4;

	if (padding != 0) {
		padding = 4 - padding;
		memset(skb_push(skb, padding), 0, padding);
		DCCP_SKB_CB(skb)->dccpd_opt_len += padding;
	}
}

560
int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
561 562
{
	struct dccp_sock *dp = dccp_sk(sk);
563
	struct dccp_minisock *dmsk = dccp_msk(sk);
564 565 566

	DCCP_SKB_CB(skb)->dccpd_opt_len = 0;

567
	if (dmsk->dccpms_send_ndp_count &&
568 569
	    dccp_insert_option_ndp(sk, skb))
		return -1;
570 571

	if (!dccp_packet_without_ack(skb)) {
572
		if (dmsk->dccpms_send_ack_vector &&
573 574 575
		    dccp_ackvec_pending(dp->dccps_hc_rx_ackvec) &&
		    dccp_insert_option_ackvec(sk, skb))
			return -1;
576 577
	}

578
	if (dp->dccps_hc_rx_insert_options) {
579 580
		if (ccid_hc_rx_insert_options(dp->dccps_hc_rx_ccid, sk, skb))
			return -1;
581 582
		dp->dccps_hc_rx_insert_options = 0;
	}
583

584
	/* Feature negotiation */
585 586 587 588 589
	/* Data packets can't do feat negotiation */
	if (DCCP_SKB_CB(skb)->dccpd_type != DCCP_PKT_DATA &&
	    DCCP_SKB_CB(skb)->dccpd_type != DCCP_PKT_DATAACK &&
	    dccp_insert_options_feat(sk, skb))
		return -1;
590

591 592 593 594 595 596 597 598
	/*
	 * Obtain RTT sample from Request/Response exchange.
	 * This is currently used in CCID 3 initialisation.
	 */
	if (DCCP_SKB_CB(skb)->dccpd_type == DCCP_PKT_REQUEST &&
	    dccp_insert_option_timestamp(sk, skb))
		return -1;

599 600 601 602
	if (dp->dccps_timestamp_echo != 0 &&
	    dccp_insert_option_timestamp_echo(dp, NULL, skb))
		return -1;

603 604 605
	dccp_insert_option_padding(skb);
	return 0;
}
606

607 608 609
int dccp_insert_options_rsk(struct dccp_request_sock *dreq, struct sk_buff *skb)
{
	DCCP_SKB_CB(skb)->dccpd_opt_len = 0;
610

611 612 613
	if (dreq->dreq_timestamp_echo != 0 &&
	    dccp_insert_option_timestamp_echo(NULL, dreq, skb))
		return -1;
614

615
	dccp_insert_option_padding(skb);
616
	return 0;
617
}