diff options
| author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-10-11 06:25:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-10-11 06:25:00 +0200 |
| commit | 2a9bc9bb4d3a4570a8a48aadf071b91e657adb89 (patch) | |
| tree | b20dc78e5e9dc6deed61c47bf12a72ec8f9a9768 /net | |
| parent | [CCID]: Check if ccid is NULL in the hc_[tr]x_exit functions (diff) | |
| download | linux-2a9bc9bb4d3a4570a8a48aadf071b91e657adb89.tar.xz linux-2a9bc9bb4d3a4570a8a48aadf071b91e657adb89.zip | |
[DCCP]: Transition from PARTOPEN to OPEN when receiving DATA packets
Noticed by Andrea Bittau, that provided a patch that was modified to
not transition from RESPOND to OPEN when receiving DATA packets.
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dccp/input.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index 1b6b2cb12376..3454d5941900 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c @@ -375,6 +375,9 @@ static int dccp_rcv_respond_partopen_state_process(struct sock *sk, case DCCP_PKT_RESET: inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK); break; + case DCCP_PKT_DATA: + if (sk->sk_state == DCCP_RESPOND) + break; case DCCP_PKT_DATAACK: case DCCP_PKT_ACK: /* @@ -393,7 +396,8 @@ static int dccp_rcv_respond_partopen_state_process(struct sock *sk, dccp_sk(sk)->dccps_osr = DCCP_SKB_CB(skb)->dccpd_seq; dccp_set_state(sk, DCCP_OPEN); - if (dh->dccph_type == DCCP_PKT_DATAACK) { + if (dh->dccph_type == DCCP_PKT_DATAACK || + dh->dccph_type == DCCP_PKT_DATA) { dccp_rcv_established(sk, skb, dh, len); queued = 1; /* packet was queued (by dccp_rcv_established) */ |