aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/proto.c
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:31 -0400
commitb235dc4abbc1356284bd0dc730efa711f394e0e2 (patch)
treec8adf34d1904c04ab0bee54e3d60f743822a8e9f /net/dccp/proto.c
parent68e074bfcef269bc61006c2740d7f89ccbbd93d7 (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, which is now handled fully dynamically via feature negotiation; i.e. when CCID2 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. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
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 0d420790b795..775eaa3d0c49 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -207,7 +207,6 @@ EXPORT_SYMBOL_GPL(dccp_init_sock);
207void dccp_destroy_sock(struct sock *sk) 207void dccp_destroy_sock(struct sock *sk)
208{ 208{
209 struct dccp_sock *dp = dccp_sk(sk); 209 struct dccp_sock *dp = dccp_sk(sk);
210 struct dccp_minisock *dmsk = dccp_msk(sk);
211 210
212 /* 211 /*
213 * DCCP doesn't use sk_write_queue, just sk_send_head 212 * DCCP doesn't use sk_write_queue, just sk_send_head
@@ -225,7 +224,7 @@ void dccp_destroy_sock(struct sock *sk)
225 kfree(dp->dccps_service_list); 224 kfree(dp->dccps_service_list);
226 dp->dccps_service_list = NULL; 225 dp->dccps_service_list = NULL;
227 226
228 if (dmsk->dccpms_send_ack_vector) { 227 if (dp->dccps_hc_rx_ackvec != NULL) {
229 dccp_ackvec_free(dp->dccps_hc_rx_ackvec); 228 dccp_ackvec_free(dp->dccps_hc_rx_ackvec);
230 dp->dccps_hc_rx_ackvec = NULL; 229 dp->dccps_hc_rx_ackvec = NULL;
231 } 230 }