summaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo2005-08-21 10:33:48 +0200
committerDavid S. Miller2005-08-30 01:03:25 +0200
commit2807d4ffb0dccb8f932c3e1701b6b6163153d333 (patch)
tree77379d35e53a7c531e78659e8244652b8c6635d5 /net/dccp/ipv4.c
parent[CCID3]: Reintroduce ccid3hctx_t_rto (diff)
downloadkernel-qcow2-linux-2807d4ffb0dccb8f932c3e1701b6b6163153d333.tar.gz
kernel-qcow2-linux-2807d4ffb0dccb8f932c3e1701b6b6163153d333.tar.xz
kernel-qcow2-linux-2807d4ffb0dccb8f932c3e1701b6b6163153d333.zip
[DCCP]: Fix seqno setting in dccp_v4_ctl_send_reset
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index cc5d60d9afa4..02ebf1f39f38 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -887,6 +887,7 @@ static void dccp_v4_ctl_send_reset(struct sk_buff *rxskb)
sizeof(struct dccp_hdr_reset);
struct sk_buff *skb;
struct dst_entry *dst;
+ u64 seqno;
/* Never send a reset in response to a reset. */
if (rxdh->dccph_type == DCCP_PKT_RESET)
@@ -920,7 +921,12 @@ static void dccp_v4_ctl_send_reset(struct sk_buff *rxskb)
dccp_hdr_reset(skb)->dccph_reset_code =
DCCP_SKB_CB(rxskb)->dccpd_reset_code;
- dccp_hdr_set_seq(dh, DCCP_SKB_CB(rxskb)->dccpd_ack_seq);
+ /* See "8.3.1. Abnormal Termination" in draft-ietf-dccp-spec-11 */
+ seqno = 0;
+ if (DCCP_SKB_CB(rxskb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)
+ dccp_set_seqno(&seqno, DCCP_SKB_CB(rxskb)->dccpd_ack_seq + 1);
+
+ dccp_hdr_set_seq(dh, seqno);
dccp_hdr_set_ack(dccp_hdr_ack_bits(skb),
DCCP_SKB_CB(rxskb)->dccpd_seq);