korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 08:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DCCP]: Support inserting options during the 3-way handshake

Browse Source 
This provides a separate routine to insert options during the initial handshake.
The main purpose is to conduct feature negotiation, for the moment the only user
is the timestamp echo needed for the (CCID3) handshake RTT sample.

Padding of options has been put into a small separate routine, to be shared among
the two functions. This could also be used as a generic routine to finish inserting
options.

Also removed an `XXX' comment since its content was obvious.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gerrit Renker 2007-12-13 12:38:11 -02:00 committed by David S. Miller
parent b4d4f7c70f
commit af3b867e2f
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/dccp/dccp.h
View File

@ -428,6 +428,7 @@ static inline int dccp_ack_pending(const struct sock *sk)
} }
extern int dccp_insert_options(struct sock *sk, struct sk_buff *skb); extern int dccp_insert_options(struct sock *sk, struct sk_buff *skb);
extern int dccp_insert_options_rsk(struct dccp_request_sock*, struct sk_buff*);
extern int dccp_insert_option_elapsed_time(struct sock *sk, extern int dccp_insert_option_elapsed_time(struct sock *sk,
struct sk_buff *skb, struct sk_buff *skb,
u32 elapsed_time); u32 elapsed_time);

38
net/dccp/options.c
View File

@ -537,6 +537,18 @@ static int dccp_insert_options_feat(struct sock *sk, struct sk_buff *skb)
return 0; return 0;
} }
/* The length of all options needs to be a multiple of 4 (5.8) */
static void dccp_insert_option_padding(struct sk_buff *skb)
{
int padding = DCCP_SKB_CB(skb)->dccpd_opt_len % 4;
if (padding != 0) {
padding = 4 - padding;
memset(skb_push(skb, padding), 0, padding);
DCCP_SKB_CB(skb)->dccpd_opt_len += padding;
}
}
int dccp_insert_options(struct sock *sk, struct sk_buff *skb) int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
{ {
struct dccp_sock *dp = dccp_sk(sk); struct dccp_sock *dp = dccp_sk(sk);
@ -580,18 +592,18 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
dccp_insert_option_timestamp_echo(dp, NULL, skb)) dccp_insert_option_timestamp_echo(dp, NULL, skb))
return -1; return -1;
/* XXX: insert other options when appropriate */ dccp_insert_option_padding(skb);
return 0;
if (DCCP_SKB_CB(skb)->dccpd_opt_len != 0) { }
/* The length of all options has to be a multiple of 4 */
int padding = DCCP_SKB_CB(skb)->dccpd_opt_len % 4; int dccp_insert_options_rsk(struct dccp_request_sock *dreq, struct sk_buff *skb)
{
if (padding != 0) { DCCP_SKB_CB(skb)->dccpd_opt_len = 0;
padding = 4 - padding;
memset(skb_push(skb, padding), 0, padding); if (dreq->dreq_timestamp_echo != 0 &&
DCCP_SKB_CB(skb)->dccpd_opt_len += padding; dccp_insert_option_timestamp_echo(NULL, dreq, skb))
} return -1;
}
dccp_insert_option_padding(skb);
return 0; return 0;
} }

2
net/dccp/output.c
View File

@ -303,7 +303,7 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_RESPONSE; DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_RESPONSE;
DCCP_SKB_CB(skb)->dccpd_seq = dreq->dreq_iss; DCCP_SKB_CB(skb)->dccpd_seq = dreq->dreq_iss;
if (dccp_insert_options(sk, skb)) { if (dccp_insert_options_rsk(dreq, skb)) {
kfree_skb(skb); kfree_skb(skb);
return NULL; return NULL;
} }