: Use `unsigned' for packet lengths
PATCH 7/7 : 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.
--- net/dccp/ccid.h | 12 +++---- net/dccp/ccids/ccid2.c | 5 +-- net/dccp/ccids/ccid3.c | 83 ++++++++++++++++++++++-------------------------- net/dccp/output.c | 6 +-- 4 files changed, 48 insertions(+), 58 deletions(-)
net/dccp/ccid.h +6 -6
@@ -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 cciextern 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
@@ -125,8 +125,7 @@ static int ccid2_hc_tx_alloc_seq(structreturn 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 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
119 lines not on this page · raw message
net/dccp/output.c +2 -4
@@ -195,8 +195,7 @@ static int dccp_wait_for_ccid(struct socif (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, inthis 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) {
Signature · 1 line
1.4.2.1.g3d5c