aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/dccp.h
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2008-09-04 01:30:19 -0400
committerGerrit Renker <gerrit@erg.abdn.ac.uk>2008-09-04 01:45:26 -0400
commit828755cee087e4a34f45d6c9db661ccd0631cc6d (patch)
tree07e687e6f5c559a49467ca3f56117ec58d9549b3 /include/linux/dccp.h
parent3001fc0569651f2d0c3b45adc991351471b0c382 (diff)
dccp: Per-socket initialisation of feature negotiation
This provides feature-negotiation initialisation for both DCCP sockets and DCCP request_sockets, to support feature negotiation during connection setup. It also resolves a FIXME regarding the congestion control initialisation. Thanks to Wei Yongjun for help with the IPv6 side of this patch. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Diffstat (limited to 'include/linux/dccp.h')
-rw-r--r--include/linux/dccp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 3978aff197d9..484b8a1fb023 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -412,6 +412,7 @@ extern void dccp_minisock_init(struct dccp_minisock *dmsk);
412 * @dreq_iss: initial sequence number sent on the Response (RFC 4340, 7.1) 412 * @dreq_iss: initial sequence number sent on the Response (RFC 4340, 7.1)
413 * @dreq_isr: initial sequence number received on the Request 413 * @dreq_isr: initial sequence number received on the Request
414 * @dreq_service: service code present on the Request (there is just one) 414 * @dreq_service: service code present on the Request (there is just one)
415 * @dreq_featneg: feature negotiation options for this connection
415 * The following two fields are analogous to the ones in dccp_sock: 416 * The following two fields are analogous to the ones in dccp_sock:
416 * @dreq_timestamp_echo: last received timestamp to echo (13.1) 417 * @dreq_timestamp_echo: last received timestamp to echo (13.1)
417 * @dreq_timestamp_echo: the time of receiving the last @dreq_timestamp_echo 418 * @dreq_timestamp_echo: the time of receiving the last @dreq_timestamp_echo
@@ -421,6 +422,7 @@ struct dccp_request_sock {
421 __u64 dreq_iss; 422 __u64 dreq_iss;
422 __u64 dreq_isr; 423 __u64 dreq_isr;
423 __be32 dreq_service; 424 __be32 dreq_service;
425 struct list_head dreq_featneg;
424 __u32 dreq_timestamp_echo; 426 __u32 dreq_timestamp_echo;
425 __u32 dreq_timestamp_time; 427 __u32 dreq_timestamp_time;
426}; 428};
@@ -498,6 +500,7 @@ struct dccp_ackvec;
498 * @dccps_mss_cache - current value of MSS (path MTU minus header sizes) 500 * @dccps_mss_cache - current value of MSS (path MTU minus header sizes)
499 * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4) 501 * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4)
500 * @dccps_minisock - associated minisock (accessed via dccp_msk) 502 * @dccps_minisock - associated minisock (accessed via dccp_msk)
503 * @dccps_featneg - tracks feature-negotiation state (mostly during handshake)
501 * @dccps_hc_rx_ackvec - rx half connection ack vector 504 * @dccps_hc_rx_ackvec - rx half connection ack vector
502 * @dccps_hc_rx_ccid - CCID used for the receiver (or receiving half-connection) 505 * @dccps_hc_rx_ccid - CCID used for the receiver (or receiving half-connection)
503 * @dccps_hc_tx_ccid - CCID used for the sender (or sending half-connection) 506 * @dccps_hc_tx_ccid - CCID used for the sender (or sending half-connection)
@@ -535,6 +538,7 @@ struct dccp_sock {
535 __u64 dccps_ndp_count:48; 538 __u64 dccps_ndp_count:48;
536 unsigned long dccps_rate_last; 539 unsigned long dccps_rate_last;
537 struct dccp_minisock dccps_minisock; 540 struct dccp_minisock dccps_minisock;
541 struct list_head dccps_featneg;
538 struct dccp_ackvec *dccps_hc_rx_ackvec; 542 struct dccp_ackvec *dccps_hc_rx_ackvec;
539 struct ccid *dccps_hc_rx_ccid; 543 struct ccid *dccps_hc_rx_ccid;
540 struct ccid *dccps_hc_tx_ccid; 544 struct ccid *dccps_hc_tx_ccid;