[DCCP]: Don't use necessarily the same CCID for tx and rx
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
65299d6c3c
commit
561713cf47
3 changed files with 6 additions and 4 deletions
|
@ -330,7 +330,8 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
|
|||
*/
|
||||
struct dccp_options {
|
||||
__u64 dccpo_sequence_window;
|
||||
__u8 dccpo_ccid;
|
||||
__u8 dccpo_rx_ccid;
|
||||
__u8 dccpo_tx_ccid;
|
||||
__u8 dccpo_send_ack_vector;
|
||||
__u8 dccpo_send_ndp_count;
|
||||
};
|
||||
|
|
|
@ -1241,9 +1241,9 @@ static int dccp_v4_init_sock(struct sock *sk)
|
|||
* setsockopt(CCIDs-I-want/accept). -acme
|
||||
*/
|
||||
if (likely(!dccp_ctl_socket_init)) {
|
||||
dp->dccps_hc_rx_ccid = ccid_init(dp->dccps_options.dccpo_ccid,
|
||||
dp->dccps_hc_rx_ccid = ccid_init(dp->dccps_options.dccpo_rx_ccid,
|
||||
sk);
|
||||
dp->dccps_hc_tx_ccid = ccid_init(dp->dccps_options.dccpo_ccid,
|
||||
dp->dccps_hc_tx_ccid = ccid_init(dp->dccps_options.dccpo_tx_ccid,
|
||||
sk);
|
||||
if (dp->dccps_hc_rx_ccid == NULL ||
|
||||
dp->dccps_hc_tx_ccid == NULL) {
|
||||
|
|
|
@ -25,7 +25,8 @@
|
|||
/* stores the default values for new connection. may be changed with sysctl */
|
||||
static const struct dccp_options dccpo_default_values = {
|
||||
.dccpo_sequence_window = DCCPF_INITIAL_SEQUENCE_WINDOW,
|
||||
.dccpo_ccid = DCCPF_INITIAL_CCID,
|
||||
.dccpo_rx_ccid = DCCPF_INITIAL_CCID,
|
||||
.dccpo_tx_ccid = DCCPF_INITIAL_CCID,
|
||||
.dccpo_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR,
|
||||
.dccpo_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue