diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-11-23 16:09:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-23 16:09:11 -0800 |
| commit | d371056695ef993d36c57b73d654e66080377a9c (patch) | |
| tree | 85e587e5558cf00232d8b24b4e28a390d3856d2a /net | |
| parent | 02fa460ef553faabc7e0b15ff9f607f028739808 (diff) | |
| download | op-kernel-dev-d371056695ef993d36c57b73d654e66080377a9c.zip op-kernel-dev-d371056695ef993d36c57b73d654e66080377a9c.tar.gz | |
dccp: Support for Mandatory options
Support for Mandatory options is provided by this patch, which will
be used by subsequent feature-negotiation patches.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dccp/feat.h | 2 | ||||
| -rw-r--r-- | net/dccp/options.c | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/net/dccp/feat.h b/net/dccp/feat.h index a8ab9e1..f8e4878 100644 --- a/net/dccp/feat.h +++ b/net/dccp/feat.h @@ -139,4 +139,6 @@ extern int dccp_feat_init(struct sock *sk); extern void dccp_encode_value_var(const u64 value, u8 *to, const u8 len); extern u64 dccp_decode_value_var(const u8 *bf, const u8 len); + +extern int dccp_insert_option_mandatory(struct sk_buff *skb); #endif /* _DCCP_FEAT_H */ diff --git a/net/dccp/options.c b/net/dccp/options.c index 9cb0ff8..676d530 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c @@ -467,6 +467,21 @@ static int dccp_insert_option_timestamp_echo(struct dccp_sock *dp, return 0; } +/** + * dccp_insert_option_mandatory - Mandatory option (5.8.2) + * Note that since we are using skb_push, this function needs to be called + * _after_ inserting the option it is supposed to influence (stack order). + */ +int dccp_insert_option_mandatory(struct sk_buff *skb) +{ + if (DCCP_SKB_CB(skb)->dccpd_opt_len >= DCCP_MAX_OPT_LEN) + return -1; + + DCCP_SKB_CB(skb)->dccpd_opt_len++; + *skb_push(skb, 1) = DCCPO_MANDATORY; + return 0; +} + static int dccp_insert_feat_opt(struct sk_buff *skb, u8 type, u8 feat, u8 *val, u8 len) { |
