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

Commit 5cdae198 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[DCCP]: Make code assumptions explicit 



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: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd6303df

net/dccp/feat.c

+10 −7
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 
 *  An implementation of the DCCP protocol

 *  Andrea Bittau <a.bittau@cs.ucl.ac.uk>

 *

 *  ASSUMPTIONS

 *  -----------

 *  o All currently known SP features have 1-byte quantities. If in the future

 *    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
@@ -95,7 +101,6 @@ static int dccp_feat_update_ccid(struct sock *sk, u8 type, u8 new_ccid_nr) 
	return 0;

}



/* XXX taking only u8 vals */

static int dccp_feat_update(struct sock *sk, u8 type, u8 feat, u8 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 */



	/* Are values in any order?  XXX Lame "algorithm" here */

	/* XXX assume values are 1 byte */

	for (i = 0; i < slen; i++) {

		for (j = 0; j < rlen; 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 */

	/* XXX assume 1 byte vals */

	rlen = 1 + opt->dccpop_len;

	rpref = kmalloc(rlen, GFP_ATOMIC);

	if (rpref == NULL)