diff options
Diffstat (limited to 'net/dccp/input.c')
-rw-r--r-- | net/dccp/input.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index 7371a2f3acf4..4a3279cd684c 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c | |||
@@ -248,8 +248,18 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, | |||
248 | DCCP_ACKVEC_STATE_RECEIVED)) | 248 | DCCP_ACKVEC_STATE_RECEIVED)) |
249 | goto discard; | 249 | goto discard; |
250 | 250 | ||
251 | ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb); | 251 | /* |
252 | ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb); | 252 | * Deliver to the CCID module in charge. |
253 | * FIXME: Currently DCCP operates one-directional only, i.e. a listening | ||
254 | * server is not at the same time a connecting client. There is | ||
255 | * not much sense in delivering to both rx/tx sides at the moment | ||
256 | * (only one is active at a time); when moving to bidirectional | ||
257 | * service, this needs to be revised. | ||
258 | */ | ||
259 | if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER) | ||
260 | ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb); | ||
261 | else | ||
262 | ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb); | ||
253 | 263 | ||
254 | return __dccp_rcv_established(sk, skb, dh, len); | 264 | return __dccp_rcv_established(sk, skb, dh, len); |
255 | discard: | 265 | discard: |
@@ -484,8 +494,11 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, | |||
484 | DCCP_ACKVEC_STATE_RECEIVED)) | 494 | DCCP_ACKVEC_STATE_RECEIVED)) |
485 | goto discard; | 495 | goto discard; |
486 | 496 | ||
487 | ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb); | 497 | /* XXX see the comments in dccp_rcv_established about this */ |
488 | ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb); | 498 | if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER) |
499 | ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb); | ||
500 | else | ||
501 | ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb); | ||
489 | } | 502 | } |
490 | 503 | ||
491 | /* | 504 | /* |