[DCCP]: Correctly split CCID half connections

This fixes a bug caused by a previous patch, which causes DCCP servers in
LISTEN state to not receive packets.

This patch changes the logic so that
 * servers in either LISTEN or OPEN state get the RX half connection packets
 * clients in OPEN state get the TX half connection packets

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dccp/input.c b/net/dccp/input.c
index 4dee462..287099f 100644 (file)
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -256,10 +256,10 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
         *        (only one is active at a time); when moving to bidirectional
         *        service, this needs to be revised.
         */
-       if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER)
-               ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
-       else
+       if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)
                ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
+       else    /* listening or connected server */
+               ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
 
        return __dccp_rcv_established(sk, skb, dh, len);
 discard:
@@ -495,10 +495,10 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                        goto discard;
 
                /* XXX see the comments in dccp_rcv_established about this */
-               if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER)
-                       ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
-               else
+               if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)
                        ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
+               else
+                       ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
        }
 
        /*