aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2007-09-26 10:32:49 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:52:43 -0400
commit9bf55cda9b2487fa7316dad3880acb0031ad3c0f (patch)
treeed4e30691351b9d59583f17a6811f14d0fbcb9e1 /net/dccp
parenta94f0f970549e63e54c80c4509db299c514d8c11 (diff)
[DCCP]: Sequence number wrap-around when sending reset
This replaces normal addition with mod-48 addition so that sequence number wraparound is respected. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ipv4.c2
-rw-r--r--net/dccp/ipv6.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 2c6282815264..58a79c2ae55c 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -552,7 +552,7 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
552 552
553 /* See "8.3.1. Abnormal Termination" in RFC 4340 */ 553 /* See "8.3.1. Abnormal Termination" in RFC 4340 */
554 if (DCCP_SKB_CB(rxskb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ) 554 if (DCCP_SKB_CB(rxskb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)
555 dccp_set_seqno(&seqno, DCCP_SKB_CB(rxskb)->dccpd_ack_seq + 1); 555 seqno = ADD48(DCCP_SKB_CB(rxskb)->dccpd_ack_seq, 1);
556 556
557 dccp_hdr_set_seq(dh, seqno); 557 dccp_hdr_set_seq(dh, seqno);
558 dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), DCCP_SKB_CB(rxskb)->dccpd_seq); 558 dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), DCCP_SKB_CB(rxskb)->dccpd_seq);
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index b158c661867b..d954e8319dbd 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -336,7 +336,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
336 336
337 /* See "8.3.1. Abnormal Termination" in RFC 4340 */ 337 /* See "8.3.1. Abnormal Termination" in RFC 4340 */
338 if (DCCP_SKB_CB(rxskb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ) 338 if (DCCP_SKB_CB(rxskb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)
339 dccp_set_seqno(&seqno, DCCP_SKB_CB(rxskb)->dccpd_ack_seq + 1); 339 seqno = ADD48(DCCP_SKB_CB(rxskb)->dccpd_ack_seq, 1);
340 340
341 dccp_hdr_set_seq(dh, seqno); 341 dccp_hdr_set_seq(dh, seqno);
342 dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), DCCP_SKB_CB(rxskb)->dccpd_seq); 342 dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), DCCP_SKB_CB(rxskb)->dccpd_seq);