diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-09-04 01:30:19 -0400 |
---|---|---|
committer | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-09-04 01:45:28 -0400 |
commit | d0440ee6f6903fcde6ed4efb88c910de1dfa18e5 (patch) | |
tree | 3eacaa56f4766967365d6f944129b6b71b528d9a /net/dccp | |
parent | b9aaac1c538a9c86e8ef3be2579a13ff55580908 (diff) |
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>
Diffstat (limited to 'net/dccp')
-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 90d16caf5457..602e0a7294ba 100644 --- a/net/dccp/feat.h +++ b/net/dccp/feat.h | |||
@@ -138,4 +138,6 @@ extern int dccp_feat_init(struct sock *sk); | |||
138 | 138 | ||
139 | extern void dccp_encode_value_var(const u64 value, u8 *to, const u8 len); | 139 | extern void dccp_encode_value_var(const u64 value, u8 *to, const u8 len); |
140 | extern u64 dccp_decode_value_var(const u8 *bf, const u8 len); | 140 | extern u64 dccp_decode_value_var(const u8 *bf, const u8 len); |
141 | |||
142 | extern int dccp_insert_option_mandatory(struct sk_buff *skb); | ||
141 | #endif /* _DCCP_FEAT_H */ | 143 | #endif /* _DCCP_FEAT_H */ |
diff --git a/net/dccp/options.c b/net/dccp/options.c index 9cb0ff894052..676d53065de9 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, | |||
467 | return 0; | 467 | return 0; |
468 | } | 468 | } |
469 | 469 | ||
470 | /** | ||
471 | * dccp_insert_option_mandatory - Mandatory option (5.8.2) | ||
472 | * Note that since we are using skb_push, this function needs to be called | ||
473 | * _after_ inserting the option it is supposed to influence (stack order). | ||
474 | */ | ||
475 | int dccp_insert_option_mandatory(struct sk_buff *skb) | ||
476 | { | ||
477 | if (DCCP_SKB_CB(skb)->dccpd_opt_len >= DCCP_MAX_OPT_LEN) | ||
478 | return -1; | ||
479 | |||
480 | DCCP_SKB_CB(skb)->dccpd_opt_len++; | ||
481 | *skb_push(skb, 1) = DCCPO_MANDATORY; | ||
482 | return 0; | ||
483 | } | ||
484 | |||
470 | static int dccp_insert_feat_opt(struct sk_buff *skb, u8 type, u8 feat, | 485 | static int dccp_insert_feat_opt(struct sk_buff *skb, u8 type, u8 feat, |
471 | u8 *val, u8 len) | 486 | u8 *val, u8 len) |
472 | { | 487 | { |