lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DCCP]: Make code assumptions explicit

Browse Source 
This removes several `XXX' references which indicate a missing support
for non-1-byte feature values: this is unnecessary, as all currently known
(standardised) SP feature values are 1-byte quantities.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gerrit Renker
2007-12-13 12:41:46 -02:00
committed by David S. Miller
parent dd6303df09
commit 5cdae198de
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/dccp/feat.c
View File

@@ -4,10 +4,16 @@
* An implementation of the DCCP protocol * An implementation of the DCCP protocol
* Andrea Bittau <a.bittau@cs.ucl.ac.uk> * Andrea Bittau <a.bittau@cs.ucl.ac.uk>
* *
* This program is free software; you can redistribute it and/or * ASSUMPTIONS
* modify it under the terms of the GNU General Public License * -----------
* as published by the Free Software Foundation; either version * o All currently known SP features have 1-byte quantities. If in the future
* 2 of the License, or (at your option) any later version. * extensions of RFCs 4340..42 define features with item lengths larger than
* one byte, a feature-specific extension of the code will be required.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/ */
#include <linux/module.h> #include <linux/module.h>
@@ -95,7 +101,6 @@ static int dccp_feat_update_ccid(struct sock *sk, u8 type, u8 new_ccid_nr)
return 0; return 0;
} }
/* XXX taking only u8 vals */
static int dccp_feat_update(struct sock *sk, u8 type, u8 feat, u8 val) static int dccp_feat_update(struct sock *sk, u8 type, u8 feat, u8 val)
{ {
dccp_feat_debug(type, feat, val); dccp_feat_debug(type, feat, val);
@@ -140,7 +145,6 @@ static int dccp_feat_reconcile(struct sock *sk, struct dccp_opt_pend *opt,
/* FIXME sanity check vals */ /* FIXME sanity check vals */
/* Are values in any order? XXX Lame "algorithm" here */ /* Are values in any order? XXX Lame "algorithm" here */
/* XXX assume values are 1 byte */
for (i = 0; i < slen; i++) { for (i = 0; i < slen; i++) {
for (j = 0; j < rlen; j++) { for (j = 0; j < rlen; j++) {
if (spref[i] == rpref[j]) { if (spref[i] == rpref[j]) {
@@ -175,7 +179,6 @@ static int dccp_feat_reconcile(struct sock *sk, struct dccp_opt_pend *opt,
} }
/* need to put result and our preference list */ /* need to put result and our preference list */
/* XXX assume 1 byte vals */
rlen = 1 + opt->dccpop_len; rlen = 1 + opt->dccpop_len;
rpref = kmalloc(rlen, GFP_ATOMIC); rpref = kmalloc(rlen, GFP_ATOMIC);
if (rpref == NULL) if (rpref == NULL)