diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-11-16 22:49:52 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-16 22:49:52 -0800 |
| commit | 0c1168398ecbfacbb27203b281bde20ec9f78017 (patch) | |
| tree | 3298379e950bba174b46e53102f265829340fa6d /net/dccp/output.c | |
| parent | 3f2c31d90327f21d76d296af34aa4ca547932ff4 (diff) | |
| download | linux-3.10-0c1168398ecbfacbb27203b281bde20ec9f78017.tar.gz linux-3.10-0c1168398ecbfacbb27203b281bde20ec9f78017.tar.bz2 linux-3.10-0c1168398ecbfacbb27203b281bde20ec9f78017.zip | |
dccp: Mechanism to resolve CCID dependencies
This adds a hook to resolve features whose value depends on the choice of
CCID. It is done at the server since it can only be done after the CCID
values have been negotiated; i.e. the client will add its CCID preference
list on the Change options sent in the Request, which will be reconciled
with the local preference list of the server.
The concept is documented on
http://www.erg.abdn.ac.uk/users/gerrit/dccp/notes/feature_negotiation/\
implementation_notes.html#ccid_dependencies
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/output.c')
| -rw-r--r-- | net/dccp/output.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index 92f3f6f2ef5..fea30cdc0be 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c @@ -339,10 +339,12 @@ 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_seq = dreq->dreq_iss; - if (dccp_insert_options_rsk(dreq, skb)) { - kfree_skb(skb); - return NULL; - } + /* Resolve feature dependencies resulting from choice of CCID */ + if (dccp_feat_server_ccid_dependencies(dreq)) + goto response_failed; + + if (dccp_insert_options_rsk(dreq, skb)) + goto response_failed; /* Build and checksum header */ dh = dccp_zeroed_hdr(skb, dccp_header_size); @@ -363,6 +365,9 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst, inet_rsk(req)->acked = 1; DCCP_INC_STATS(DCCP_MIB_OUTSEGS); return skb; +response_failed: + kfree_skb(skb); + return NULL; } EXPORT_SYMBOL_GPL(dccp_make_response); |