On 10/2/07, Gerrit Renker <[EMAIL PROTECTED]> wrote:
> [DCCP]: Insert feature-negotiation options into skb
>
> The core insertion routine, provided by this patch, does a simple list walk
> and calls
> an already existing function in options.c to do the actual insertion of
> individual options.
>
> This replaces the earlier insertion routine from options.c
>
> Signed-off-by: Gerrit Renker <[EMAIL PROTECTED]>
Once a couple of things commented on/fixed.
Acked-by: Ian McDonald <[EMAIL PROTECTED]>
> ---
> net/dccp/dccp.h | 2 +
> net/dccp/feat.c | 57
> +++++++++++++++++++++++++++++++++++++++++++++++++++++
> net/dccp/options.c | 45 -----------------------------------------
> 3 files changed, 59 insertions(+), 45 deletions(-)
>
> --- a/net/dccp/dccp.h
> +++ b/net/dccp/dccp.h
> @@ -424,6 +424,8 @@ static inline int dccp_ack_pending(const
>
> extern int dccp_feat_finalise_settings(struct dccp_sock *dp);
> extern int dccp_feat_server_ccid_dependencies(struct dccp_request_sock
> *dreq);
> +extern int dccp_feat_insert_opts(struct dccp_sock*, struct
> dccp_request_sock*,
> + struct sk_buff *skb);
> extern void dccp_feat_list_purge(struct list_head *fn_list);
>
> extern int dccp_insert_options(struct sock *sk, struct sk_buff *skb);
> --- a/net/dccp/feat.c
> +++ b/net/dccp/feat.c
> @@ -334,6 +334,63 @@ static u8 dccp_feat_sp_list_ok(u8 feat_n
> }
>
> /**
> + * dccp_feat_insert_opts - Generate FN options from current list state
> + * @skb: next sk_buff to be sent to the peer
> + * @dp: for client during handshake and general negotiation
> + * @dreq: used by the server only (all Changes/Confirms in LISTEN/RESPOND)
> + */
> +int dccp_feat_insert_opts(struct dccp_sock *dp, struct dccp_request_sock
> *dreq,
> + struct sk_buff *skb)
> +{
> + struct list_head *fn = dreq? &dreq->dreq_featneg : &dp->dccps_featneg;
need a space before ? as per Arnaldo's email.
> + struct dccp_feat_entry *pos, *next;
> + u8 opt, type, len, *ptr, nn_in_nbo[6];
I think the 6 should be a constant of some kind.
--
Web1: http://wand.net.nz/~iam4/
Web2: http://www.jandi.co.nz
Blog: http://iansblog.jandi.co.nz
-
To unsubscribe from this list: send the line "unsubscribe dccp" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
