2005-08-09 23:14:34 -04:00
|
|
|
/*
|
|
|
|
* net/dccp/output.c
|
2006-12-10 13:01:18 -05:00
|
|
|
*
|
2005-08-09 23:14:34 -04:00
|
|
|
* An implementation of the DCCP protocol
|
|
|
|
* Arnaldo Carvalho de Melo <acme@conectiva.com.br>
|
|
|
|
*
|
|
|
|
* 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>
|
2005-10-29 20:20:59 -04:00
|
|
|
#include <linux/kernel.h>
|
2005-08-09 23:14:34 -04:00
|
|
|
#include <linux/skbuff.h>
|
|
|
|
|
2005-12-26 23:43:12 -05:00
|
|
|
#include <net/inet_sock.h>
|
2005-08-09 23:14:34 -04:00
|
|
|
#include <net/sock.h>
|
|
|
|
|
2005-09-18 03:17:51 -04:00
|
|
|
#include "ackvec.h"
|
2005-08-09 23:14:34 -04:00
|
|
|
#include "ccid.h"
|
|
|
|
#include "dccp.h"
|
|
|
|
|
|
|
|
static inline void dccp_event_ack_sent(struct sock *sk)
|
|
|
|
{
|
|
|
|
inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);
|
|
|
|
}
|
|
|
|
|
2006-03-21 00:58:56 -05:00
|
|
|
static void dccp_skb_entail(struct sock *sk, struct sk_buff *skb)
|
2005-10-29 20:20:59 -04:00
|
|
|
{
|
|
|
|
skb_set_owner_w(skb, sk);
|
|
|
|
WARN_ON(sk->sk_send_head);
|
|
|
|
sk->sk_send_head = skb;
|
|
|
|
}
|
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
/*
|
|
|
|
* All SKB's seen here are completely headerless. It is our
|
|
|
|
* job to build the DCCP header, and pass the packet down to
|
|
|
|
* IP so it can do the same plus pass the packet off to the
|
|
|
|
* device.
|
|
|
|
*/
|
2005-10-29 20:20:59 -04:00
|
|
|
static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
|
2005-08-09 23:14:34 -04:00
|
|
|
{
|
|
|
|
if (likely(skb != NULL)) {
|
|
|
|
const struct inet_sock *inet = inet_sk(sk);
|
2005-12-14 02:16:16 -05:00
|
|
|
const struct inet_connection_sock *icsk = inet_csk(sk);
|
2005-08-09 23:14:34 -04:00
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
|
|
|
struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
|
|
|
|
struct dccp_hdr *dh;
|
|
|
|
/* XXX For now we're using only 48 bits sequence numbers */
|
2006-03-21 01:31:09 -05:00
|
|
|
const u32 dccp_header_size = sizeof(*dh) +
|
2005-08-09 23:14:34 -04:00
|
|
|
sizeof(struct dccp_hdr_ext) +
|
2005-08-13 19:34:54 -04:00
|
|
|
dccp_packet_hdr_len(dcb->dccpd_type);
|
2005-08-09 23:14:34 -04:00
|
|
|
int err, set_ack = 1;
|
|
|
|
u64 ackno = dp->dccps_gsr;
|
dccp: Bug-Fix - AWL was never updated
The AWL lower Ack validity window advances in proportion to GSS, the greatest
sequence number sent. Updating AWL other than at connection setup (in the
DCCP-Request sent by dccp_v{4,6}_connect()) was missing in the DCCP code.
This bug lead to syslog messages such as
"kernel: dccp_check_seqno: DCCP: Step 6 failed for DATAACK packet, [...]
P.ackno exists or LAWL(82947089) <= P.ackno(82948208)
<= S.AWH(82948728), sending SYNC..."
The difference between AWL/AWH here is 1639 packets, while the expected value
(the Sequence Window) would have been 100 (the default). A closer look showed
that LAWL = AWL = 82947089 equalled the ISS on the Response.
The patch now updates AWL with each increase of GSS.
Further changes:
----------------
The patch also enforces more stringent checks on the ISS sequence number:
* AWL is initialised to ISS at connection setup and remains at this value;
* AWH is then always set to GSS (via dccp_update_gss());
* so on the first Request: AWL = AWH = ISS,
and on the n-th Request: AWL = ISS, AWH = ISS + n.
As a consequence, only Response packets that refer to Requests sent by this
host will pass, all others are discarded. This is the intention and in effect
implements the initial adjustments for AWL as specified in RFC 4340, 7.5.1.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
2008-07-26 06:59:10 -04:00
|
|
|
/*
|
|
|
|
* Increment GSS here already in case the option code needs it.
|
|
|
|
* Update GSS for real only if option processing below succeeds.
|
|
|
|
*/
|
|
|
|
dcb->dccpd_seq = ADD48(dp->dccps_gss, 1);
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
switch (dcb->dccpd_type) {
|
|
|
|
case DCCP_PKT_DATA:
|
|
|
|
set_ack = 0;
|
2005-10-29 20:20:59 -04:00
|
|
|
/* fall through */
|
|
|
|
case DCCP_PKT_DATAACK:
|
2007-09-26 10:30:02 -04:00
|
|
|
case DCCP_PKT_RESET:
|
2005-08-09 23:14:34 -04:00
|
|
|
break;
|
2005-10-29 20:20:59 -04:00
|
|
|
|
[DCCP]: Initial feature negotiation implementation
Still needs more work, but boots and doesn't crashes, even
does some negotiation!
18:38:52.174934 127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526 127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398 127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>
:-)
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-03-20 20:43:56 -05:00
|
|
|
case DCCP_PKT_REQUEST:
|
|
|
|
set_ack = 0;
|
dccp: Bug-Fix - AWL was never updated
The AWL lower Ack validity window advances in proportion to GSS, the greatest
sequence number sent. Updating AWL other than at connection setup (in the
DCCP-Request sent by dccp_v{4,6}_connect()) was missing in the DCCP code.
This bug lead to syslog messages such as
"kernel: dccp_check_seqno: DCCP: Step 6 failed for DATAACK packet, [...]
P.ackno exists or LAWL(82947089) <= P.ackno(82948208)
<= S.AWH(82948728), sending SYNC..."
The difference between AWL/AWH here is 1639 packets, while the expected value
(the Sequence Window) would have been 100 (the default). A closer look showed
that LAWL = AWL = 82947089 equalled the ISS on the Response.
The patch now updates AWL with each increase of GSS.
Further changes:
----------------
The patch also enforces more stringent checks on the ISS sequence number:
* AWL is initialised to ISS at connection setup and remains at this value;
* AWH is then always set to GSS (via dccp_update_gss());
* so on the first Request: AWL = AWH = ISS,
and on the n-th Request: AWL = ISS, AWH = ISS + n.
As a consequence, only Response packets that refer to Requests sent by this
host will pass, all others are discarded. This is the intention and in effect
implements the initial adjustments for AWL as specified in RFC 4340, 7.5.1.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
2008-07-26 06:59:10 -04:00
|
|
|
/* Use ISS on the first (non-retransmitted) Request. */
|
|
|
|
if (icsk->icsk_retransmits == 0)
|
|
|
|
dcb->dccpd_seq = dp->dccps_iss;
|
[DCCP]: Initial feature negotiation implementation
Still needs more work, but boots and doesn't crashes, even
does some negotiation!
18:38:52.174934 127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526 127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398 127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>
:-)
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-03-20 20:43:56 -05:00
|
|
|
/* fall through */
|
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
case DCCP_PKT_SYNC:
|
|
|
|
case DCCP_PKT_SYNCACK:
|
2007-09-26 01:42:27 -04:00
|
|
|
ackno = dcb->dccpd_ack_seq;
|
2005-10-29 20:20:59 -04:00
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
/*
|
2007-09-26 10:30:02 -04:00
|
|
|
* Set owner/destructor: some skbs are allocated via
|
|
|
|
* alloc_skb (e.g. when retransmission may happen).
|
|
|
|
* Only Data, DataAck, and Reset packets should come
|
|
|
|
* through here with skb->sk set.
|
2005-10-29 20:20:59 -04:00
|
|
|
*/
|
|
|
|
WARN_ON(skb->sk);
|
|
|
|
skb_set_owner_w(skb, sk);
|
2005-08-09 23:14:34 -04:00
|
|
|
break;
|
|
|
|
}
|
2005-08-21 04:40:16 -04:00
|
|
|
|
2006-03-21 01:32:06 -05:00
|
|
|
if (dccp_insert_options(sk, skb)) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
return -EPROTO;
|
|
|
|
}
|
2007-02-09 09:24:38 -05:00
|
|
|
|
2005-10-14 02:38:49 -04:00
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
/* Build DCCP header and checksum it. */
|
2006-11-10 08:22:32 -05:00
|
|
|
dh = dccp_zeroed_hdr(skb, dccp_header_size);
|
2005-08-09 23:14:34 -04:00
|
|
|
dh->dccph_type = dcb->dccpd_type;
|
|
|
|
dh->dccph_sport = inet->sport;
|
|
|
|
dh->dccph_dport = inet->dport;
|
|
|
|
dh->dccph_doff = (dccp_header_size + dcb->dccpd_opt_len) / 4;
|
|
|
|
dh->dccph_ccval = dcb->dccpd_ccval;
|
2006-11-10 14:43:06 -05:00
|
|
|
dh->dccph_cscov = dp->dccps_pcslen;
|
2005-08-09 23:14:34 -04:00
|
|
|
/* XXX For now we're using only 48 bits sequence numbers */
|
|
|
|
dh->dccph_x = 1;
|
|
|
|
|
dccp: Bug-Fix - AWL was never updated
The AWL lower Ack validity window advances in proportion to GSS, the greatest
sequence number sent. Updating AWL other than at connection setup (in the
DCCP-Request sent by dccp_v{4,6}_connect()) was missing in the DCCP code.
This bug lead to syslog messages such as
"kernel: dccp_check_seqno: DCCP: Step 6 failed for DATAACK packet, [...]
P.ackno exists or LAWL(82947089) <= P.ackno(82948208)
<= S.AWH(82948728), sending SYNC..."
The difference between AWL/AWH here is 1639 packets, while the expected value
(the Sequence Window) would have been 100 (the default). A closer look showed
that LAWL = AWL = 82947089 equalled the ISS on the Response.
The patch now updates AWL with each increase of GSS.
Further changes:
----------------
The patch also enforces more stringent checks on the ISS sequence number:
* AWL is initialised to ISS at connection setup and remains at this value;
* AWH is then always set to GSS (via dccp_update_gss());
* so on the first Request: AWL = AWH = ISS,
and on the n-th Request: AWL = ISS, AWH = ISS + n.
As a consequence, only Response packets that refer to Requests sent by this
host will pass, all others are discarded. This is the intention and in effect
implements the initial adjustments for AWL as specified in RFC 4340, 7.5.1.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
2008-07-26 06:59:10 -04:00
|
|
|
dccp_update_gss(sk, dcb->dccpd_seq);
|
2005-08-09 23:14:34 -04:00
|
|
|
dccp_hdr_set_seq(dh, dp->dccps_gss);
|
|
|
|
if (set_ack)
|
|
|
|
dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), ackno);
|
|
|
|
|
|
|
|
switch (dcb->dccpd_type) {
|
|
|
|
case DCCP_PKT_REQUEST:
|
2005-08-13 19:34:54 -04:00
|
|
|
dccp_hdr_request(skb)->dccph_req_service =
|
2005-09-16 19:58:40 -04:00
|
|
|
dp->dccps_service;
|
dccp: Bug-Fix - AWL was never updated
The AWL lower Ack validity window advances in proportion to GSS, the greatest
sequence number sent. Updating AWL other than at connection setup (in the
DCCP-Request sent by dccp_v{4,6}_connect()) was missing in the DCCP code.
This bug lead to syslog messages such as
"kernel: dccp_check_seqno: DCCP: Step 6 failed for DATAACK packet, [...]
P.ackno exists or LAWL(82947089) <= P.ackno(82948208)
<= S.AWH(82948728), sending SYNC..."
The difference between AWL/AWH here is 1639 packets, while the expected value
(the Sequence Window) would have been 100 (the default). A closer look showed
that LAWL = AWL = 82947089 equalled the ISS on the Response.
The patch now updates AWL with each increase of GSS.
Further changes:
----------------
The patch also enforces more stringent checks on the ISS sequence number:
* AWL is initialised to ISS at connection setup and remains at this value;
* AWH is then always set to GSS (via dccp_update_gss());
* so on the first Request: AWL = AWH = ISS,
and on the n-th Request: AWL = ISS, AWH = ISS + n.
As a consequence, only Response packets that refer to Requests sent by this
host will pass, all others are discarded. This is the intention and in effect
implements the initial adjustments for AWL as specified in RFC 4340, 7.5.1.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
2008-07-26 06:59:10 -04:00
|
|
|
/*
|
|
|
|
* Limit Ack window to ISS <= P.ackno <= GSS, so that
|
|
|
|
* only Responses to Requests we sent are considered.
|
|
|
|
*/
|
|
|
|
dp->dccps_awl = dp->dccps_iss;
|
2005-08-09 23:14:34 -04:00
|
|
|
break;
|
|
|
|
case DCCP_PKT_RESET:
|
2005-08-13 19:34:54 -04:00
|
|
|
dccp_hdr_reset(skb)->dccph_reset_code =
|
|
|
|
dcb->dccpd_reset_code;
|
2005-08-09 23:14:34 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-11-10 14:43:06 -05:00
|
|
|
icsk->icsk_af_ops->send_check(sk, 0, skb);
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2005-08-24 00:50:06 -04:00
|
|
|
if (set_ack)
|
2005-08-09 23:14:34 -04:00
|
|
|
dccp_event_ack_sent(sk);
|
|
|
|
|
|
|
|
DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
|
|
|
|
|
2007-01-26 04:04:55 -05:00
|
|
|
err = icsk->icsk_af_ops->queue_xmit(skb, 0);
|
2006-11-14 08:21:36 -05:00
|
|
|
return net_xmit_eval(err);
|
2005-08-09 23:14:34 -04:00
|
|
|
}
|
|
|
|
return -ENOBUFS;
|
|
|
|
}
|
|
|
|
|
2007-12-13 20:37:55 -05:00
|
|
|
/**
|
|
|
|
* dccp_determine_ccmps - Find out about CCID-specfic packet-size limits
|
|
|
|
* We only consider the HC-sender CCID for setting the CCMPS (RFC 4340, 14.),
|
|
|
|
* since the RX CCID is restricted to feedback packets (Acks), which are small
|
|
|
|
* in comparison with the data traffic. A value of 0 means "no current CCMPS".
|
|
|
|
*/
|
|
|
|
static u32 dccp_determine_ccmps(const struct dccp_sock *dp)
|
|
|
|
{
|
|
|
|
const struct ccid *tx_ccid = dp->dccps_hc_tx_ccid;
|
|
|
|
|
|
|
|
if (tx_ccid == NULL || tx_ccid->ccid_ops == NULL)
|
|
|
|
return 0;
|
|
|
|
return tx_ccid->ccid_ops->ccid_ccmps;
|
|
|
|
}
|
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
unsigned int dccp_sync_mss(struct sock *sk, u32 pmtu)
|
|
|
|
{
|
2005-12-14 02:26:10 -05:00
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
2005-08-09 23:14:34 -04:00
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
2007-12-13 20:37:55 -05:00
|
|
|
u32 ccmps = dccp_determine_ccmps(dp);
|
2009-02-27 17:38:28 -05:00
|
|
|
u32 cur_mps = ccmps ? min(pmtu, ccmps) : pmtu;
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2007-12-13 20:37:55 -05:00
|
|
|
/* Account for header lengths and IPv4/v6 option overhead */
|
|
|
|
cur_mps -= (icsk->icsk_af_ops->net_header_len + icsk->icsk_ext_hdr_len +
|
|
|
|
sizeof(struct dccp_hdr) + sizeof(struct dccp_hdr_ext));
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
/*
|
2009-02-27 17:38:28 -05:00
|
|
|
* Leave enough headroom for common DCCP header options.
|
|
|
|
* This only considers options which may appear on DCCP-Data packets, as
|
|
|
|
* per table 3 in RFC 4340, 5.8. When running out of space for other
|
|
|
|
* options (eg. Ack Vector which can take up to 255 bytes), it is better
|
|
|
|
* to schedule a separate Ack. Thus we leave headroom for the following:
|
|
|
|
* - 1 byte for Slow Receiver (11.6)
|
|
|
|
* - 6 bytes for Timestamp (13.1)
|
|
|
|
* - 10 bytes for Timestamp Echo (13.3)
|
|
|
|
* - 8 bytes for NDP count (7.7, when activated)
|
|
|
|
* - 6 bytes for Data Checksum (9.3)
|
|
|
|
* - %DCCPAV_MIN_OPTLEN bytes for Ack Vector size (11.4, when enabled)
|
2005-08-09 23:14:34 -04:00
|
|
|
*/
|
2009-02-27 17:38:28 -05:00
|
|
|
cur_mps -= roundup(1 + 6 + 10 + dp->dccps_send_ndp_count * 8 + 6 +
|
|
|
|
(dp->dccps_hc_rx_ackvec ? DCCPAV_MIN_OPTLEN : 0), 4);
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
/* And store cached results */
|
2005-12-14 02:26:10 -05:00
|
|
|
icsk->icsk_pmtu_cookie = pmtu;
|
2007-12-13 20:37:55 -05:00
|
|
|
dp->dccps_mss_cache = cur_mps;
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2007-12-13 20:37:55 -05:00
|
|
|
return cur_mps;
|
2005-08-09 23:14:34 -04:00
|
|
|
}
|
|
|
|
|
2005-12-14 02:24:16 -05:00
|
|
|
EXPORT_SYMBOL_GPL(dccp_sync_mss);
|
|
|
|
|
2005-08-29 01:15:54 -04:00
|
|
|
void dccp_write_space(struct sock *sk)
|
|
|
|
{
|
|
|
|
read_lock(&sk->sk_callback_lock);
|
|
|
|
|
|
|
|
if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
|
|
|
|
wake_up_interruptible(sk->sk_sleep);
|
|
|
|
/* Should agree with poll, otherwise some programs break */
|
|
|
|
if (sock_writeable(sk))
|
2007-11-26 07:10:50 -05:00
|
|
|
sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
|
2005-08-29 01:15:54 -04:00
|
|
|
|
|
|
|
read_unlock(&sk->sk_callback_lock);
|
|
|
|
}
|
|
|
|
|
2005-08-27 02:06:35 -04:00
|
|
|
/**
|
|
|
|
* dccp_wait_for_ccid - Wait for ccid to tell us we can send a packet
|
2007-10-04 17:38:49 -04:00
|
|
|
* @sk: socket to wait for
|
|
|
|
* @skb: current skb to pass on for waiting
|
|
|
|
* @delay: sleep timeout in milliseconds (> 0)
|
|
|
|
* This function is called by default when the socket is closed, and
|
|
|
|
* when a non-zero linger time is set on the socket. For consistency
|
2005-08-27 02:06:35 -04:00
|
|
|
*/
|
2007-10-04 17:38:49 -04:00
|
|
|
static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb, int delay)
|
2005-08-27 02:06:35 -04:00
|
|
|
{
|
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
|
|
|
DEFINE_WAIT(wait);
|
2007-10-04 17:38:49 -04:00
|
|
|
unsigned long jiffdelay;
|
2005-08-27 02:06:35 -04:00
|
|
|
int rc;
|
|
|
|
|
2007-10-04 17:38:49 -04:00
|
|
|
do {
|
|
|
|
dccp_pr_debug("delayed send by %d msec\n", delay);
|
|
|
|
jiffdelay = msecs_to_jiffies(delay);
|
|
|
|
|
2005-08-27 02:06:35 -04:00
|
|
|
prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
|
|
|
|
|
2007-10-04 17:38:49 -04:00
|
|
|
sk->sk_write_pending++;
|
|
|
|
release_sock(sk);
|
|
|
|
schedule_timeout(jiffdelay);
|
|
|
|
lock_sock(sk);
|
|
|
|
sk->sk_write_pending--;
|
|
|
|
|
2006-08-26 22:16:45 -04:00
|
|
|
if (sk->sk_err)
|
2005-08-27 02:06:35 -04:00
|
|
|
goto do_error;
|
|
|
|
if (signal_pending(current))
|
|
|
|
goto do_interrupted;
|
|
|
|
|
2006-11-28 16:55:06 -05:00
|
|
|
rc = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb);
|
2007-10-04 17:38:49 -04:00
|
|
|
} while ((delay = rc) > 0);
|
2005-08-27 02:06:35 -04:00
|
|
|
out:
|
|
|
|
finish_wait(sk->sk_sleep, &wait);
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
do_error:
|
|
|
|
rc = -EPIPE;
|
|
|
|
goto out;
|
|
|
|
do_interrupted:
|
2006-12-09 20:56:09 -05:00
|
|
|
rc = -EINTR;
|
2005-08-27 02:06:35 -04:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2006-08-26 22:16:45 -04:00
|
|
|
void dccp_write_xmit(struct sock *sk, int block)
|
2005-08-09 23:30:56 -04:00
|
|
|
{
|
2006-08-26 22:16:45 -04:00
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
while ((skb = skb_peek(&sk->sk_write_queue))) {
|
2006-11-28 16:55:06 -05:00
|
|
|
int err = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb);
|
2005-08-27 02:06:35 -04:00
|
|
|
|
2006-08-26 22:16:45 -04:00
|
|
|
if (err > 0) {
|
|
|
|
if (!block) {
|
|
|
|
sk_reset_timer(sk, &dp->dccps_xmit_timer,
|
|
|
|
msecs_to_jiffies(err)+jiffies);
|
|
|
|
break;
|
2006-12-09 20:56:09 -05:00
|
|
|
} else
|
2007-10-04 17:38:49 -04:00
|
|
|
err = dccp_wait_for_ccid(sk, skb, err);
|
2006-12-09 21:05:12 -05:00
|
|
|
if (err && err != -EINTR)
|
2006-11-20 15:39:23 -05:00
|
|
|
DCCP_BUG("err=%d after dccp_wait_for_ccid", err);
|
2006-08-26 22:16:45 -04:00
|
|
|
}
|
2005-08-09 23:30:56 -04:00
|
|
|
|
2006-08-26 22:16:45 -04:00
|
|
|
skb_dequeue(&sk->sk_write_queue);
|
|
|
|
if (err == 0) {
|
|
|
|
struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
|
|
|
|
const int len = skb->len;
|
2005-08-09 23:30:56 -04:00
|
|
|
|
2006-08-26 22:16:45 -04:00
|
|
|
if (sk->sk_state == DCCP_PARTOPEN) {
|
dccp: Do not let initial option overhead shrink the MPS
This fixes a problem caused by the overlap of the connection-setup and
established-state phases of DCCP connections.
During connection setup, the client retransmits Confirm Feature-Negotiation
options until a response from the server signals that it can move from the
half-established PARTOPEN into the OPEN state, whereupon the connection is
fully established on both ends (RFC 4340, 8.1.5).
However, since the client may already send data while it is in the PARTOPEN
state, consequences arise for the Maximum Packet Size: the problem is that the
initial option overhead is much higher than for the subsequent established
phase, as it involves potentially many variable-length list-type options
(server-priority options, RFC 4340, 6.4).
Applying the standard MPS is insufficient here: especially with larger
payloads this can lead to annoying, counter-intuitive EMSGSIZE errors.
On the other hand, reducing the MPS available for the established phase by
the added initial overhead is highly wasteful and inefficient.
The solution chosen therefore is a two-phase strategy:
If the payload length of the DataAck in PARTOPEN is too large, an Ack is sent
to carry the options, and the feature-negotiation list is then flushed.
This means that the server gets two Acks for one Response. If both Acks get
lost, it is probably better to restart the connection anyway and devising yet
another special-case does not seem worth the extra complexity.
The result is a higher utilisation of the available packet space for the data
transmission phase (established state) of a connection.
The patch (over-)estimates the initial overhead to be 32*4 bytes -- commonly
seen values were around 90 bytes for initial feature-negotiation options.
It uses sizeof(u32) to mean "aligned units of 4 bytes".
For consistency, another use of 4-byte alignment is adapted.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-02-27 17:38:29 -05:00
|
|
|
const u32 cur_mps = dp->dccps_mss_cache - DCCP_FEATNEG_OVERHEAD;
|
|
|
|
/*
|
|
|
|
* See 8.1.5 - Handshake Completion.
|
|
|
|
*
|
|
|
|
* For robustness we resend Confirm options until the client has
|
|
|
|
* entered OPEN. During the initial feature negotiation, the MPS
|
|
|
|
* is smaller than usual, reduced by the Change/Confirm options.
|
|
|
|
*/
|
|
|
|
if (!list_empty(&dp->dccps_featneg) && len > cur_mps) {
|
|
|
|
DCCP_WARN("Payload too large (%d) for featneg.\n", len);
|
|
|
|
dccp_send_ack(sk);
|
|
|
|
dccp_feat_list_purge(&dp->dccps_featneg);
|
|
|
|
}
|
|
|
|
|
2006-08-26 22:16:45 -04:00
|
|
|
inet_csk_schedule_ack(sk);
|
|
|
|
inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
|
2005-08-09 23:30:56 -04:00
|
|
|
inet_csk(sk)->icsk_rto,
|
|
|
|
DCCP_RTO_MAX);
|
2006-08-26 22:16:45 -04:00
|
|
|
dcb->dccpd_type = DCCP_PKT_DATAACK;
|
|
|
|
} else if (dccp_ack_pending(sk))
|
|
|
|
dcb->dccpd_type = DCCP_PKT_DATAACK;
|
|
|
|
else
|
|
|
|
dcb->dccpd_type = DCCP_PKT_DATA;
|
|
|
|
|
|
|
|
err = dccp_transmit_skb(sk, skb);
|
|
|
|
ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, 0, len);
|
2006-11-20 15:39:23 -05:00
|
|
|
if (err)
|
|
|
|
DCCP_BUG("err=%d after ccid_hc_tx_packet_sent",
|
|
|
|
err);
|
2006-12-09 21:05:12 -05:00
|
|
|
} else {
|
2007-03-20 14:00:28 -04:00
|
|
|
dccp_pr_debug("packet discarded due to err=%d\n", err);
|
2007-02-27 12:57:37 -05:00
|
|
|
kfree_skb(skb);
|
2006-12-09 21:05:12 -05:00
|
|
|
}
|
2006-08-26 22:16:45 -04:00
|
|
|
}
|
2005-08-09 23:30:56 -04:00
|
|
|
}
|
|
|
|
|
2008-07-26 06:59:09 -04:00
|
|
|
/**
|
|
|
|
* dccp_retransmit_skb - Retransmit Request, Close, or CloseReq packets
|
|
|
|
* There are only four retransmittable packet types in DCCP:
|
|
|
|
* - Request in client-REQUEST state (sec. 8.1.1),
|
|
|
|
* - CloseReq in server-CLOSEREQ state (sec. 8.3),
|
|
|
|
* - Close in node-CLOSING state (sec. 8.3),
|
|
|
|
* - Acks in client-PARTOPEN state (sec. 8.1.5, handled by dccp_delack_timer()).
|
|
|
|
* This function expects sk->sk_send_head to contain the original skb.
|
|
|
|
*/
|
|
|
|
int dccp_retransmit_skb(struct sock *sk)
|
2005-08-09 23:14:34 -04:00
|
|
|
{
|
2008-07-26 06:59:09 -04:00
|
|
|
WARN_ON(sk->sk_send_head == NULL);
|
|
|
|
|
2005-12-14 02:16:16 -05:00
|
|
|
if (inet_csk(sk)->icsk_af_ops->rebuild_header(sk) != 0)
|
2005-08-09 23:14:34 -04:00
|
|
|
return -EHOSTUNREACH; /* Routing failure or similar. */
|
|
|
|
|
2008-07-26 06:59:09 -04:00
|
|
|
/* this count is used to distinguish original and retransmitted skb */
|
|
|
|
inet_csk(sk)->icsk_retransmits++;
|
|
|
|
|
|
|
|
return dccp_transmit_skb(sk, skb_clone(sk->sk_send_head, GFP_ATOMIC));
|
2005-08-09 23:14:34 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
|
|
|
|
struct request_sock *req)
|
|
|
|
{
|
|
|
|
struct dccp_hdr *dh;
|
2005-09-16 19:58:40 -04:00
|
|
|
struct dccp_request_sock *dreq;
|
2006-03-21 01:31:09 -05:00
|
|
|
const u32 dccp_header_size = sizeof(struct dccp_hdr) +
|
2005-08-09 23:14:34 -04:00
|
|
|
sizeof(struct dccp_hdr_ext) +
|
|
|
|
sizeof(struct dccp_hdr_response);
|
2006-03-21 01:31:09 -05:00
|
|
|
struct sk_buff *skb = sock_wmalloc(sk, sk->sk_prot->max_header, 1,
|
2005-08-09 23:14:34 -04:00
|
|
|
GFP_ATOMIC);
|
|
|
|
if (skb == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Reserve space for headers. */
|
2006-03-21 01:31:09 -05:00
|
|
|
skb_reserve(skb, sk->sk_prot->max_header);
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
skb->dst = dst_clone(dst);
|
|
|
|
|
2005-09-16 19:58:40 -04:00
|
|
|
dreq = dccp_rsk(req);
|
2006-11-13 10:12:07 -05:00
|
|
|
if (inet_rsk(req)->acked) /* increase ISS upon retransmission */
|
|
|
|
dccp_inc_seqno(&dreq->dreq_iss);
|
2005-08-09 23:14:34 -04:00
|
|
|
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_RESPONSE;
|
2005-09-16 19:58:40 -04:00
|
|
|
DCCP_SKB_CB(skb)->dccpd_seq = dreq->dreq_iss;
|
2006-03-21 01:32:06 -05:00
|
|
|
|
2008-11-17 01:49:52 -05:00
|
|
|
/* Resolve feature dependencies resulting from choice of CCID */
|
|
|
|
if (dccp_feat_server_ccid_dependencies(dreq))
|
|
|
|
goto response_failed;
|
|
|
|
|
|
|
|
if (dccp_insert_options_rsk(dreq, skb))
|
|
|
|
goto response_failed;
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2006-11-14 09:57:34 -05:00
|
|
|
/* Build and checksum header */
|
2006-11-10 08:22:32 -05:00
|
|
|
dh = dccp_zeroed_hdr(skb, dccp_header_size);
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2008-10-20 02:36:47 -04:00
|
|
|
dh->dccph_sport = inet_rsk(req)->loc_port;
|
2005-08-09 23:14:34 -04:00
|
|
|
dh->dccph_dport = inet_rsk(req)->rmt_port;
|
2005-08-13 19:34:54 -04:00
|
|
|
dh->dccph_doff = (dccp_header_size +
|
|
|
|
DCCP_SKB_CB(skb)->dccpd_opt_len) / 4;
|
2005-08-09 23:14:34 -04:00
|
|
|
dh->dccph_type = DCCP_PKT_RESPONSE;
|
|
|
|
dh->dccph_x = 1;
|
2005-09-16 19:58:40 -04:00
|
|
|
dccp_hdr_set_seq(dh, dreq->dreq_iss);
|
|
|
|
dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), dreq->dreq_isr);
|
|
|
|
dccp_hdr_response(skb)->dccph_resp_service = dreq->dreq_service;
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2006-11-10 14:43:06 -05:00
|
|
|
dccp_csum_outgoing(skb);
|
|
|
|
|
2006-11-13 10:12:07 -05:00
|
|
|
/* We use `acked' to remember that a Response was already sent. */
|
|
|
|
inet_rsk(req)->acked = 1;
|
2005-08-09 23:14:34 -04:00
|
|
|
DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
|
|
|
|
return skb;
|
2008-11-17 01:49:52 -05:00
|
|
|
response_failed:
|
|
|
|
kfree_skb(skb);
|
|
|
|
return NULL;
|
2005-08-09 23:14:34 -04:00
|
|
|
}
|
|
|
|
|
2005-12-14 02:24:16 -05:00
|
|
|
EXPORT_SYMBOL_GPL(dccp_make_response);
|
|
|
|
|
[DCCP]: Factor out common code for generating Resets
This factors code common to dccp_v{4,6}_ctl_send_reset into a separate function,
and adds support for filling in the Data 1 ... Data 3 fields from RFC 4340, 5.6.
It is useful to have this separate, since the following Reset codes will always
be generated from the control socket rather than via dccp_send_reset:
* Code 3, "No Connection", cf. 8.3.1;
* Code 4, "Packet Error" (identification for Data 1 added);
* Code 5, "Option Error" (identification for Data 1..3 added, will be used later);
* Code 6, "Mandatory Error" (same as Option Error);
* Code 7, "Connection Refused" (what on Earth is the difference to "No Connection"?);
* Code 8, "Bad Service Code";
* Code 9, "Too Busy";
* Code 10, "Bad Init Cookie" (not used).
Code 0 is not recommended by the RFC, the following codes would be used in
dccp_send_reset() instead, since they all relate to an established DCCP connection:
* Code 1, "Closed";
* Code 2, "Aborted";
* Code 11, "Aggression Penalty" (12.3).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
2007-09-26 13:35:19 -04:00
|
|
|
/* answer offending packet in @rcv_skb with Reset from control socket @ctl */
|
2008-04-03 17:20:52 -04:00
|
|
|
struct sk_buff *dccp_ctl_make_reset(struct sock *sk, struct sk_buff *rcv_skb)
|
[DCCP]: Factor out common code for generating Resets
This factors code common to dccp_v{4,6}_ctl_send_reset into a separate function,
and adds support for filling in the Data 1 ... Data 3 fields from RFC 4340, 5.6.
It is useful to have this separate, since the following Reset codes will always
be generated from the control socket rather than via dccp_send_reset:
* Code 3, "No Connection", cf. 8.3.1;
* Code 4, "Packet Error" (identification for Data 1 added);
* Code 5, "Option Error" (identification for Data 1..3 added, will be used later);
* Code 6, "Mandatory Error" (same as Option Error);
* Code 7, "Connection Refused" (what on Earth is the difference to "No Connection"?);
* Code 8, "Bad Service Code";
* Code 9, "Too Busy";
* Code 10, "Bad Init Cookie" (not used).
Code 0 is not recommended by the RFC, the following codes would be used in
dccp_send_reset() instead, since they all relate to an established DCCP connection:
* Code 1, "Closed";
* Code 2, "Aborted";
* Code 11, "Aggression Penalty" (12.3).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
2007-09-26 13:35:19 -04:00
|
|
|
{
|
|
|
|
struct dccp_hdr *rxdh = dccp_hdr(rcv_skb), *dh;
|
|
|
|
struct dccp_skb_cb *dcb = DCCP_SKB_CB(rcv_skb);
|
|
|
|
const u32 dccp_hdr_reset_len = sizeof(struct dccp_hdr) +
|
|
|
|
sizeof(struct dccp_hdr_ext) +
|
|
|
|
sizeof(struct dccp_hdr_reset);
|
|
|
|
struct dccp_hdr_reset *dhr;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
2008-04-03 17:20:52 -04:00
|
|
|
skb = alloc_skb(sk->sk_prot->max_header, GFP_ATOMIC);
|
[DCCP]: Factor out common code for generating Resets
This factors code common to dccp_v{4,6}_ctl_send_reset into a separate function,
and adds support for filling in the Data 1 ... Data 3 fields from RFC 4340, 5.6.
It is useful to have this separate, since the following Reset codes will always
be generated from the control socket rather than via dccp_send_reset:
* Code 3, "No Connection", cf. 8.3.1;
* Code 4, "Packet Error" (identification for Data 1 added);
* Code 5, "Option Error" (identification for Data 1..3 added, will be used later);
* Code 6, "Mandatory Error" (same as Option Error);
* Code 7, "Connection Refused" (what on Earth is the difference to "No Connection"?);
* Code 8, "Bad Service Code";
* Code 9, "Too Busy";
* Code 10, "Bad Init Cookie" (not used).
Code 0 is not recommended by the RFC, the following codes would be used in
dccp_send_reset() instead, since they all relate to an established DCCP connection:
* Code 1, "Closed";
* Code 2, "Aborted";
* Code 11, "Aggression Penalty" (12.3).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
2007-09-26 13:35:19 -04:00
|
|
|
if (skb == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2008-04-03 17:20:52 -04:00
|
|
|
skb_reserve(skb, sk->sk_prot->max_header);
|
[DCCP]: Factor out common code for generating Resets
This factors code common to dccp_v{4,6}_ctl_send_reset into a separate function,
and adds support for filling in the Data 1 ... Data 3 fields from RFC 4340, 5.6.
It is useful to have this separate, since the following Reset codes will always
be generated from the control socket rather than via dccp_send_reset:
* Code 3, "No Connection", cf. 8.3.1;
* Code 4, "Packet Error" (identification for Data 1 added);
* Code 5, "Option Error" (identification for Data 1..3 added, will be used later);
* Code 6, "Mandatory Error" (same as Option Error);
* Code 7, "Connection Refused" (what on Earth is the difference to "No Connection"?);
* Code 8, "Bad Service Code";
* Code 9, "Too Busy";
* Code 10, "Bad Init Cookie" (not used).
Code 0 is not recommended by the RFC, the following codes would be used in
dccp_send_reset() instead, since they all relate to an established DCCP connection:
* Code 1, "Closed";
* Code 2, "Aborted";
* Code 11, "Aggression Penalty" (12.3).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
2007-09-26 13:35:19 -04:00
|
|
|
|
|
|
|
/* Swap the send and the receive. */
|
|
|
|
dh = dccp_zeroed_hdr(skb, dccp_hdr_reset_len);
|
|
|
|
dh->dccph_type = DCCP_PKT_RESET;
|
|
|
|
dh->dccph_sport = rxdh->dccph_dport;
|
|
|
|
dh->dccph_dport = rxdh->dccph_sport;
|
|
|
|
dh->dccph_doff = dccp_hdr_reset_len / 4;
|
|
|
|
dh->dccph_x = 1;
|
|
|
|
|
|
|
|
dhr = dccp_hdr_reset(skb);
|
|
|
|
dhr->dccph_reset_code = dcb->dccpd_reset_code;
|
|
|
|
|
|
|
|
switch (dcb->dccpd_reset_code) {
|
|
|
|
case DCCP_RESET_CODE_PACKET_ERROR:
|
|
|
|
dhr->dccph_reset_data[0] = rxdh->dccph_type;
|
|
|
|
break;
|
|
|
|
case DCCP_RESET_CODE_OPTION_ERROR: /* fall through */
|
|
|
|
case DCCP_RESET_CODE_MANDATORY_ERROR:
|
|
|
|
memcpy(dhr->dccph_reset_data, dcb->dccpd_reset_data, 3);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* From RFC 4340, 8.3.1:
|
|
|
|
* If P.ackno exists, set R.seqno := P.ackno + 1.
|
|
|
|
* Else set R.seqno := 0.
|
|
|
|
*/
|
|
|
|
if (dcb->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)
|
|
|
|
dccp_hdr_set_seq(dh, ADD48(dcb->dccpd_ack_seq, 1));
|
|
|
|
dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), dcb->dccpd_seq);
|
|
|
|
|
|
|
|
dccp_csum_outgoing(skb);
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(dccp_ctl_make_reset);
|
|
|
|
|
2007-09-26 10:30:02 -04:00
|
|
|
/* send Reset on established socket, to close or abort the connection */
|
2006-03-20 22:25:24 -05:00
|
|
|
int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code)
|
|
|
|
{
|
2007-09-26 10:30:02 -04:00
|
|
|
struct sk_buff *skb;
|
2006-03-20 22:25:24 -05:00
|
|
|
/*
|
|
|
|
* FIXME: what if rebuild_header fails?
|
|
|
|
* Should we be doing a rebuild_header here?
|
|
|
|
*/
|
2007-11-28 03:35:08 -05:00
|
|
|
int err = inet_csk(sk)->icsk_af_ops->rebuild_header(sk);
|
2006-03-20 22:25:24 -05:00
|
|
|
|
2007-09-26 10:30:02 -04:00
|
|
|
if (err != 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
skb = sock_wmalloc(sk, sk->sk_prot->max_header, 1, GFP_ATOMIC);
|
|
|
|
if (skb == NULL)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
/* Reserve space for headers and prepare control bits. */
|
|
|
|
skb_reserve(skb, sk->sk_prot->max_header);
|
|
|
|
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_RESET;
|
|
|
|
DCCP_SKB_CB(skb)->dccpd_reset_code = code;
|
2006-03-20 22:25:24 -05:00
|
|
|
|
2007-09-26 10:30:02 -04:00
|
|
|
return dccp_transmit_skb(sk, skb);
|
2006-03-20 22:25:24 -05:00
|
|
|
}
|
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
/*
|
|
|
|
* Do all connect socket setups that can be done AF independent.
|
|
|
|
*/
|
|
|
|
static inline void dccp_connect_init(struct sock *sk)
|
|
|
|
{
|
2005-12-14 02:24:16 -05:00
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
2005-08-09 23:14:34 -04:00
|
|
|
struct dst_entry *dst = __sk_dst_get(sk);
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
|
|
|
|
sk->sk_err = 0;
|
|
|
|
sock_reset_flag(sk, SOCK_DONE);
|
2007-02-09 09:24:38 -05:00
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
dccp_sync_mss(sk, dst_mtu(dst));
|
|
|
|
|
dccp: Bug-Fix - AWL was never updated
The AWL lower Ack validity window advances in proportion to GSS, the greatest
sequence number sent. Updating AWL other than at connection setup (in the
DCCP-Request sent by dccp_v{4,6}_connect()) was missing in the DCCP code.
This bug lead to syslog messages such as
"kernel: dccp_check_seqno: DCCP: Step 6 failed for DATAACK packet, [...]
P.ackno exists or LAWL(82947089) <= P.ackno(82948208)
<= S.AWH(82948728), sending SYNC..."
The difference between AWL/AWH here is 1639 packets, while the expected value
(the Sequence Window) would have been 100 (the default). A closer look showed
that LAWL = AWL = 82947089 equalled the ISS on the Response.
The patch now updates AWL with each increase of GSS.
Further changes:
----------------
The patch also enforces more stringent checks on the ISS sequence number:
* AWL is initialised to ISS at connection setup and remains at this value;
* AWH is then always set to GSS (via dccp_update_gss());
* so on the first Request: AWL = AWH = ISS,
and on the n-th Request: AWL = ISS, AWH = ISS + n.
As a consequence, only Response packets that refer to Requests sent by this
host will pass, all others are discarded. This is the intention and in effect
implements the initial adjustments for AWL as specified in RFC 4340, 7.5.1.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
2008-07-26 06:59:10 -04:00
|
|
|
/* Initialise GAR as per 8.5; AWL/AWH are set in dccp_transmit_skb() */
|
2006-11-13 10:34:38 -05:00
|
|
|
dp->dccps_gar = dp->dccps_iss;
|
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
icsk->icsk_retransmits = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int dccp_connect(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
|
dccp: Resolve dependencies of features on choice of CCID
This provides a missing link in the code chain, as several features implicitly
depend and/or rely on the choice of CCID. Most notably, this is the Send Ack Vector
feature, but also Ack Ratio and Send Loss Event Rate (also taken care of).
For Send Ack Vector, the situation is as follows:
* since CCID2 mandates the use of Ack Vectors, there is no point in allowing
endpoints which use CCID2 to disable Ack Vector features such a connection;
* a peer with a TX CCID of CCID2 will always expect Ack Vectors, and a peer
with a RX CCID of CCID2 must always send Ack Vectors (RFC 4341, sec. 4);
* for all other CCIDs, the use of (Send) Ack Vector is optional and thus
negotiable. However, this implies that the code negotiating the use of Ack
Vectors also supports it (i.e. is able to supply and to either parse or
ignore received Ack Vectors). Since this is not the case (CCID-3 has no Ack
Vector support), the use of Ack Vectors is here disabled, with a comment
in the source code.
An analogous consideration arises for the Send Loss Event Rate feature,
since the CCID-3 implementation does not support the loss interval options
of RFC 4342. To make such use explicit, corresponding feature-negotiation
options are inserted which signal the use of the loss event rate option,
as it is used by the CCID3 code.
Lastly, the values of the Ack Ratio feature are matched to the choice of CCID.
The patch implements this as a function which is called after the user has
made all other registrations for changing default values of features.
The table is variable-length, the reserved (and hence for feature-negotiation
invalid, confirmed by considering section 19.4 of RFC 4340) feature number `0'
is used to mark the end of the table.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-11-12 03:48:44 -05:00
|
|
|
/* do not connect if feature negotiation setup fails */
|
|
|
|
if (dccp_feat_finalise_settings(dccp_sk(sk)))
|
|
|
|
return -EPROTO;
|
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
dccp_connect_init(sk);
|
|
|
|
|
2006-03-21 01:31:09 -05:00
|
|
|
skb = alloc_skb(sk->sk_prot->max_header, sk->sk_allocation);
|
2005-08-09 23:14:34 -04:00
|
|
|
if (unlikely(skb == NULL))
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
/* Reserve space for headers. */
|
2006-03-21 01:31:09 -05:00
|
|
|
skb_reserve(skb, sk->sk_prot->max_header);
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_REQUEST;
|
|
|
|
|
2005-10-29 20:20:59 -04:00
|
|
|
dccp_skb_entail(sk, skb);
|
2005-08-09 23:14:34 -04:00
|
|
|
dccp_transmit_skb(sk, skb_clone(skb, GFP_KERNEL));
|
|
|
|
DCCP_INC_STATS(DCCP_MIB_ACTIVEOPENS);
|
|
|
|
|
|
|
|
/* Timer for repeating the REQUEST until an answer. */
|
2005-08-09 23:30:56 -04:00
|
|
|
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
|
|
|
|
icsk->icsk_rto, DCCP_RTO_MAX);
|
2005-08-09 23:14:34 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-12-14 02:24:16 -05:00
|
|
|
EXPORT_SYMBOL_GPL(dccp_connect);
|
|
|
|
|
2005-08-09 23:14:34 -04:00
|
|
|
void dccp_send_ack(struct sock *sk)
|
|
|
|
{
|
|
|
|
/* If we have been reset, we may not send again. */
|
|
|
|
if (sk->sk_state != DCCP_CLOSED) {
|
2006-03-21 01:31:09 -05:00
|
|
|
struct sk_buff *skb = alloc_skb(sk->sk_prot->max_header,
|
|
|
|
GFP_ATOMIC);
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
if (skb == NULL) {
|
|
|
|
inet_csk_schedule_ack(sk);
|
|
|
|
inet_csk(sk)->icsk_ack.ato = TCP_ATO_MIN;
|
2005-08-13 19:34:54 -04:00
|
|
|
inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
|
|
|
|
TCP_DELACK_MAX,
|
|
|
|
DCCP_RTO_MAX);
|
2005-08-09 23:14:34 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reserve space for headers */
|
2006-03-21 01:31:09 -05:00
|
|
|
skb_reserve(skb, sk->sk_prot->max_header);
|
2005-08-09 23:14:34 -04:00
|
|
|
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_ACK;
|
|
|
|
dccp_transmit_skb(sk, skb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(dccp_send_ack);
|
|
|
|
|
2008-06-11 06:19:09 -04:00
|
|
|
#if 0
|
2007-09-26 10:26:04 -04:00
|
|
|
/* FIXME: Is this still necessary (11.3) - currently nowhere used by DCCP. */
|
2005-08-09 23:14:34 -04:00
|
|
|
void dccp_send_delayed_ack(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
/*
|
|
|
|
* FIXME: tune this timer. elapsed time fixes the skew, so no problem
|
|
|
|
* with using 2s, and active senders also piggyback the ACK into a
|
|
|
|
* DATAACK packet, so this is really for quiescent senders.
|
|
|
|
*/
|
|
|
|
unsigned long timeout = jiffies + 2 * HZ;
|
|
|
|
|
|
|
|
/* Use new timeout only if there wasn't a older one earlier. */
|
|
|
|
if (icsk->icsk_ack.pending & ICSK_ACK_TIMER) {
|
|
|
|
/* If delack timer was blocked or is about to expire,
|
|
|
|
* send ACK now.
|
|
|
|
*
|
|
|
|
* FIXME: check the "about to expire" part
|
|
|
|
*/
|
|
|
|
if (icsk->icsk_ack.blocked) {
|
|
|
|
dccp_send_ack(sk);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!time_before(timeout, icsk->icsk_ack.timeout))
|
|
|
|
timeout = icsk->icsk_ack.timeout;
|
|
|
|
}
|
|
|
|
icsk->icsk_ack.pending |= ICSK_ACK_SCHED | ICSK_ACK_TIMER;
|
|
|
|
icsk->icsk_ack.timeout = timeout;
|
|
|
|
sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout);
|
|
|
|
}
|
2008-06-11 06:19:09 -04:00
|
|
|
#endif
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2007-09-26 01:42:27 -04:00
|
|
|
void dccp_send_sync(struct sock *sk, const u64 ackno,
|
2005-08-17 02:10:59 -04:00
|
|
|
const enum dccp_pkt_type pkt_type)
|
2005-08-09 23:14:34 -04:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* We are not putting this on the write queue, so
|
|
|
|
* dccp_transmit_skb() will set the ownership to this
|
|
|
|
* sock.
|
|
|
|
*/
|
2006-03-21 01:31:09 -05:00
|
|
|
struct sk_buff *skb = alloc_skb(sk->sk_prot->max_header, GFP_ATOMIC);
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2007-09-26 01:42:27 -04:00
|
|
|
if (skb == NULL) {
|
2005-08-09 23:14:34 -04:00
|
|
|
/* FIXME: how to make sure the sync is sent? */
|
2007-09-26 01:42:27 -04:00
|
|
|
DCCP_CRIT("could not send %s", dccp_packet_name(pkt_type));
|
2005-08-09 23:14:34 -04:00
|
|
|
return;
|
2007-09-26 01:42:27 -04:00
|
|
|
}
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
/* Reserve space for headers and prepare control bits. */
|
2006-03-21 01:31:09 -05:00
|
|
|
skb_reserve(skb, sk->sk_prot->max_header);
|
2005-08-17 02:10:59 -04:00
|
|
|
DCCP_SKB_CB(skb)->dccpd_type = pkt_type;
|
2007-09-26 01:42:27 -04:00
|
|
|
DCCP_SKB_CB(skb)->dccpd_ack_seq = ackno;
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
dccp_transmit_skb(sk, skb);
|
|
|
|
}
|
|
|
|
|
2006-03-21 00:25:11 -05:00
|
|
|
EXPORT_SYMBOL_GPL(dccp_send_sync);
|
|
|
|
|
2005-08-13 19:34:54 -04:00
|
|
|
/*
|
|
|
|
* Send a DCCP_PKT_CLOSE/CLOSEREQ. The caller locks the socket for us. This
|
|
|
|
* cannot be allowed to fail queueing a DCCP_PKT_CLOSE/CLOSEREQ frame under
|
|
|
|
* any circumstances.
|
2005-08-09 23:14:34 -04:00
|
|
|
*/
|
2005-08-24 00:50:06 -04:00
|
|
|
void dccp_send_close(struct sock *sk, const int active)
|
2005-08-09 23:14:34 -04:00
|
|
|
{
|
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
|
|
|
struct sk_buff *skb;
|
2005-10-21 03:20:43 -04:00
|
|
|
const gfp_t prio = active ? GFP_KERNEL : GFP_ATOMIC;
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2005-08-24 00:50:06 -04:00
|
|
|
skb = alloc_skb(sk->sk_prot->max_header, prio);
|
|
|
|
if (skb == NULL)
|
|
|
|
return;
|
2005-08-09 23:14:34 -04:00
|
|
|
|
|
|
|
/* Reserve space for headers and prepare control bits. */
|
|
|
|
skb_reserve(skb, sk->sk_prot->max_header);
|
2007-12-13 09:25:01 -05:00
|
|
|
if (dp->dccps_role == DCCP_ROLE_SERVER && !dp->dccps_server_timewait)
|
|
|
|
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_CLOSEREQ;
|
|
|
|
else
|
|
|
|
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_CLOSE;
|
2005-08-09 23:14:34 -04:00
|
|
|
|
2005-08-24 00:50:06 -04:00
|
|
|
if (active) {
|
2006-08-26 22:16:45 -04:00
|
|
|
dccp_write_xmit(sk, 1);
|
2005-10-29 20:20:59 -04:00
|
|
|
dccp_skb_entail(sk, skb);
|
2005-08-24 00:50:06 -04:00
|
|
|
dccp_transmit_skb(sk, skb_clone(skb, prio));
|
2007-12-13 09:02:43 -05:00
|
|
|
/*
|
|
|
|
* Retransmission timer for active-close: RFC 4340, 8.3 requires
|
|
|
|
* to retransmit the Close/CloseReq until the CLOSING/CLOSEREQ
|
|
|
|
* state can be left. The initial timeout is 2 RTTs.
|
|
|
|
* Since RTT measurement is done by the CCIDs, there is no easy
|
|
|
|
* way to get an RTT sample. The fallback RTT from RFC 4340, 3.4
|
|
|
|
* is too low (200ms); we use a high value to avoid unnecessary
|
|
|
|
* retransmissions when the link RTT is > 0.2 seconds.
|
|
|
|
* FIXME: Let main module sample RTTs and use that instead.
|
|
|
|
*/
|
|
|
|
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
|
|
|
|
DCCP_TIMEOUT_INIT, DCCP_RTO_MAX);
|
2005-08-24 00:50:06 -04:00
|
|
|
} else
|
|
|
|
dccp_transmit_skb(sk, skb);
|
2005-08-09 23:14:34 -04:00
|
|
|
}
|