Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Tue, 13 Sep 2005 23:32:40 +0000 (16:32 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 13 Sep 2005 23:32:40 +0000 (16:32 -0700)
net/dccp/input.c

index c60bc3433f5eac378d8a4b87198276576fd6d7f8..c74034cf7ede15e34390531a549c4a7ce1048193 100644 (file)
@@ -50,7 +50,8 @@ static void dccp_rcv_closereq(struct sock *sk, struct sk_buff *skb)
                return;
        }
 
-       dccp_set_state(sk, DCCP_CLOSING);
+       if (sk->sk_state != DCCP_CLOSING)
+               dccp_set_state(sk, DCCP_CLOSING);
        dccp_send_close(sk, 0);
 }
 
@@ -561,6 +562,12 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                return 0;
        }
 
+       if (unlikely(dh->dccph_type == DCCP_PKT_SYNC)) {
+               dccp_send_sync(sk, DCCP_SKB_CB(skb)->dccpd_seq,
+                              DCCP_PKT_SYNCACK);
+               goto discard;
+       }
+
        switch (sk->sk_state) {
        case DCCP_CLOSED:
                return 1;