aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/proto.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2008-12-08 04:19:06 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-08 04:19:06 -0500
commit6fdd34d43bff8be9bb925b49d87a0ee144d2ab07 (patch)
tree547cf602983db37d573d3d191ac11660f1698e8f /net/dccp/proto.c
parent4098dce5be537a157eed4a326efd464109825b8b (diff)
dccp ccid-2: Phase out the use of boolean Ack Vector sysctl
This removes the use of the sysctl and the minisock variable for the Send Ack Vector feature, as it now is handled fully dynamically via feature negotiation (i.e. when CCID-2 is enabled, Ack Vectors are automatically enabled as per RFC 4341, 4.). Using a sysctl in parallel to this implementation would open the door to crashes, since much of the code relies on tests of the boolean minisock / sysctl variable. Thus, this patch replaces all tests of type if (dccp_msk(sk)->dccpms_send_ack_vector) /* ... */ with if (dp->dccps_hc_rx_ackvec != NULL) /* ... */ The dccps_hc_rx_ackvec is allocated by the dccp_hdlr_ackvec() when feature negotiation concluded that Ack Vectors are to be used on the half-connection. Otherwise, it is NULL (due to dccp_init_sock/dccp_create_openreq_child), so that the test is a valid one. The activation handler for Ack Vectors is called as soon as the feature negotiation has concluded at the * server when the Ack marking the transition RESPOND => OPEN arrives; * client after it has sent its ACK, marking the transition REQUEST => PARTOPEN. Adding the sequence number of the Response packet to the Ack Vector has been removed, since (a) connection establishment implies that the Response has been received; (b) the CCIDs only look at packets received in the (PART)OPEN state, i.e. this entry will always be ignored; (c) it can not be used for anything useful - to detect loss for instance, only packets received after the loss can serve as pseudo-dupacks. There was a FIXME to change the error code when dccp_ackvec_add() fails. I removed this after finding out that: * the check whether ackno < ISN is already made earlier, * this Response is likely the 1st packet with an Ackno that the client gets, * so when dccp_ackvec_add() fails, the reason is likely not a packet error. 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>
Diffstat (limited to 'net/dccp/proto.c')
-rw-r--r--net/dccp/proto.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 0941f8fe1675..d5c2bacb713c 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -201,7 +201,6 @@ EXPORT_SYMBOL_GPL(dccp_init_sock);
201void dccp_destroy_sock(struct sock *sk) 201void dccp_destroy_sock(struct sock *sk)
202{ 202{
203 struct dccp_sock *dp = dccp_sk(sk); 203 struct dccp_sock *dp = dccp_sk(sk);
204 struct dccp_minisock *dmsk = dccp_msk(sk);
205 204
206 /* 205 /*
207 * DCCP doesn't use sk_write_queue, just sk_send_head 206 * DCCP doesn't use sk_write_queue, just sk_send_head
@@ -219,7 +218,7 @@ void dccp_destroy_sock(struct sock *sk)
219 kfree(dp->dccps_service_list); 218 kfree(dp->dccps_service_list);
220 dp->dccps_service_list = NULL; 219 dp->dccps_service_list = NULL;
221 220
222 if (dmsk->dccpms_send_ack_vector) { 221 if (dp->dccps_hc_rx_ackvec != NULL) {
223 dccp_ackvec_free(dp->dccps_hc_rx_ackvec); 222 dccp_ackvec_free(dp->dccps_hc_rx_ackvec);
224 dp->dccps_hc_rx_ackvec = NULL; 223 dp->dccps_hc_rx_ackvec = NULL;
225 } 224 }