Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0440ee6 authored by Gerrit Renker's avatar Gerrit Renker
Browse files

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: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b9aaac1c

net/dccp/feat.h

+2 −0
Original line number Diff line number Diff line
@@ -138,4 +138,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 */

net/dccp/options.c

+15 −0
Original line number Diff line number Diff line
@@ -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)

{