Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b57c93d authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[DCCP]: Use `unsigned' for packet lengths 



This patch implements a suggestion by Ian McDonald and

 1) Avoids tests against negative packet lengths by using unsigned int
    for packet payload lengths in the CCID send_packet()/packet_sent() routines

 2) As a consequence, it removes an now unnecessary test with regard to `len > 0'
    in ccid3_hc_tx_packet_sent: that condition is always true, since
      * negative packet lengths are avoided
      * ccid3_hc_tx_send_packet flags an error whenever the payload length is 0.
        As a consequence, ccid3_hc_tx_packet_sent is never called as all errors
        returned by ccid_hc_tx_send_packet are caught in dccp_write_xmit

 3) Removes the third argument of ccid_hc_tx_send_packet (the `len' parameter),
    since it is currently always set to skb->len. The code is updated with regard
    to this parameter change.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent a79ef76f

net/dccp/ccid.h

+6 −6
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ struct ccid_operations { 
						    unsigned char len, u16 idx,

						    unsigned char* value);

	int		(*ccid_hc_tx_send_packet)(struct sock *sk,

						  struct sk_buff *skb, int len);

	void		(*ccid_hc_tx_packet_sent)(struct sock *sk, int more,

						  int len);

						  struct sk_buff *skb);

	void		(*ccid_hc_tx_packet_sent)(struct sock *sk,

						  int more, unsigned int len);

	void		(*ccid_hc_rx_get_info)(struct sock *sk,

					       struct tcp_info *info);

	void		(*ccid_hc_tx_get_info)(struct sock *sk,
@@ -94,16 +94,16 @@ extern void ccid_hc_rx_delete(struct ccid *ccid, struct sock *sk); 
extern void ccid_hc_tx_delete(struct ccid *ccid, struct sock *sk);



static inline int ccid_hc_tx_send_packet(struct ccid *ccid, struct sock *sk,

					 struct sk_buff *skb, int len)

					 struct sk_buff *skb)

{

	int rc = 0;

	if (ccid->ccid_ops->ccid_hc_tx_send_packet != NULL)

		rc = ccid->ccid_ops->ccid_hc_tx_send_packet(sk, skb, len);

		rc = ccid->ccid_ops->ccid_hc_tx_send_packet(sk, skb);

	return rc;

}



static inline void ccid_hc_tx_packet_sent(struct ccid *ccid, struct sock *sk,

					  int more, int len)

					  int more, unsigned int len)

{

	if (ccid->ccid_ops->ccid_hc_tx_packet_sent != NULL)

		ccid->ccid_ops->ccid_hc_tx_packet_sent(sk, more, len);

net/dccp/ccids/ccid2.c

+2 −3
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ static int ccid2_hc_tx_alloc_seq(struct ccid2_hc_tx_sock *hctx, int num, 
	return 0;

}



static int ccid2_hc_tx_send_packet(struct sock *sk,

				   struct sk_buff *skb, int len)

static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)

{

	struct ccid2_hc_tx_sock *hctx;
@@ -268,7 +267,7 @@ static void ccid2_start_rto_timer(struct sock *sk) 
		       jiffies + hctx->ccid2hctx_rto);

}



static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, int len)

static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)

{

	struct dccp_sock *dp = dccp_sk(sk);

	struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);

net/dccp/ccids/ccid3.c

+38 −45
Original line number Diff line number Diff line
@@ -272,8 +272,7 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data) 
 *   = 0: can send immediately

 *   < 0: error condition; do not send packet

 */

static int ccid3_hc_tx_send_packet(struct sock *sk,

				   struct sk_buff *skb, int len)

static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)

{

	struct dccp_sock *dp = dccp_sk(sk);

	struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
@@ -288,7 +287,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, 
	 * zero-sized Data(Ack)s is theoretically possible, but for congestion

	 * control this case is pathological - ignore it.

	 */

	if (unlikely(len == 0))

	if (unlikely(skb->len == 0))

		return -EBADMSG;



	/* See if last packet allocated was not sent */
@@ -317,7 +316,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, 
		ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK);



		/* Set initial sending rate to 1 packet per second */

		ccid3_hc_tx_update_s(hctx, len);

		ccid3_hc_tx_update_s(hctx, skb->len);

		hctx->ccid3hctx_x     = hctx->ccid3hctx_s;



		/* First timeout, according to [RFC 3448, 4.2], is 1 second */
@@ -356,21 +355,18 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, 
	return 0;

}



static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, int len)

static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)

{

	const struct dccp_sock *dp = dccp_sk(sk);

	struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);

	struct timeval now;

	unsigned long quarter_rtt;

	struct dccp_tx_hist_entry *packet;



	BUG_ON(hctx == NULL);



	dccp_timestamp(sk, &now);



	/* check if we have sent a data packet */

	if (len > 0) {

		unsigned long quarter_rtt;

		struct dccp_tx_hist_entry *packet;



	ccid3_hc_tx_update_s(hctx, len);



	packet = dccp_tx_hist_head(&hctx->ccid3hctx_hist);
@@ -406,9 +402,6 @@ static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, int len) 
	hctx->ccid3hctx_idle = 0;

	packet->dccphtx_rtt  = hctx->ccid3hctx_rtt;

	packet->dccphtx_sent = 1;

	} else

		ccid3_pr_debug("%s, sk=%p, seqno=%llu NOT inserted!\n",

			       dccp_role(sk), sk, dp->dccps_gss);

}



static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)

net/dccp/output.c

+2 −4
Original line number Diff line number Diff line
@@ -195,8 +195,7 @@ static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb, 
		if (signal_pending(current))

			goto do_interrupted;



		rc = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb,

					    skb->len);

		rc = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb);

		if (rc <= 0)

			break;

		delay = msecs_to_jiffies(rc);
@@ -245,8 +244,7 @@ void dccp_write_xmit(struct sock *sk, int block) 
					   this we have other issues */



	while ((skb = skb_peek(&sk->sk_write_queue))) {

		int err = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb,

					 skb->len);

		int err = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb);



		if (err > 0) {

			if (!block) {