diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2006-11-14 09:48:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:22:29 -0500 |
| commit | c02fdc0e81e9c735d8d895af1e201b235df326d8 (patch) | |
| tree | f30af6744e4ecea9e5bb12483addb306d49ce458 /include/linux | |
| parent | 6a128e053e75a5f1be9fb53d0d53159f88197c61 (diff) | |
[DCCP]: Make feature negotiation more readable
This patch replaces cryptic feature negotiation messages of type
Oct 31 15:42:20 kernel: dccp_feat_change: feat change type=32 feat=1
Oct 31 15:42:21 kernel: dccp_feat_change: feat change type=34 feat=1
Oct 31 15:42:21 kernel: dccp_feat_change: feat change type=32 feat=5
into ones of type:
Nov 2 13:54:45 kernel: dccp_feat_change: ChangeL(CCID (1), 3)
Nov 2 13:54:45 kernel: dccp_feat_change: ChangeR(CCID (1), 3)
Nov 2 13:54:45 kernel: dccp_feat_change: ChangeL(Ack Ratio (5), 2)
Also,
* completed the feature number list wrt RFC 4340 sec. 6.4
* annotating which ones have been implemented so far
* implemented rudimentary sanity checking in feat.c (FIXMEs)
* some minor fixes
Commiter note: uninlined dccp_feat_name and dccp_feat_typename, for
consistency with dccp_{state,packet}_name, that, BTW,
should be compiled only if CONFIG_IP_DCCP_DEBUG is
selected, leaving this to another cset tho. Also
shortened dccp_feat_negotiation_debug to dccp_feat_debug.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dccp.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h index 0502dfa7f32..696319ee2d5 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h | |||
| @@ -175,18 +175,21 @@ enum { | |||
| 175 | DCCPC_CCID3 = 3, | 175 | DCCPC_CCID3 = 3, |
| 176 | }; | 176 | }; |
| 177 | 177 | ||
| 178 | /* DCCP features */ | 178 | /* DCCP features (RFC 4340 section 6.4) */ |
| 179 | enum { | 179 | enum { |
| 180 | DCCPF_RESERVED = 0, | 180 | DCCPF_RESERVED = 0, |
| 181 | DCCPF_CCID = 1, | 181 | DCCPF_CCID = 1, |
| 182 | DCCPF_SEQUENCE_WINDOW = 3, | 182 | DCCPF_SHORT_SEQNOS = 2, /* XXX: not yet implemented */ |
| 183 | DCCPF_ACK_RATIO = 5, | 183 | DCCPF_SEQUENCE_WINDOW = 3, |
| 184 | DCCPF_SEND_ACK_VECTOR = 6, | 184 | DCCPF_ECN_INCAPABLE = 4, /* XXX: not yet implemented */ |
| 185 | DCCPF_SEND_NDP_COUNT = 7, | 185 | DCCPF_ACK_RATIO = 5, |
| 186 | DCCPF_SEND_ACK_VECTOR = 6, | ||
| 187 | DCCPF_SEND_NDP_COUNT = 7, | ||
| 186 | DCCPF_MIN_CSUM_COVER = 8, | 188 | DCCPF_MIN_CSUM_COVER = 8, |
| 187 | /* 10-127 reserved */ | 189 | DCCPF_DATA_CHECKSUM = 9, /* XXX: not yet implemented */ |
| 188 | DCCPF_MIN_CCID_SPECIFIC = 128, | 190 | /* 10-127 reserved */ |
| 189 | DCCPF_MAX_CCID_SPECIFIC = 255, | 191 | DCCPF_MIN_CCID_SPECIFIC = 128, |
| 192 | DCCPF_MAX_CCID_SPECIFIC = 255, | ||
| 190 | }; | 193 | }; |
| 191 | 194 | ||
| 192 | /* this structure is argument to DCCP_SOCKOPT_CHANGE_X */ | 195 | /* this structure is argument to DCCP_SOCKOPT_CHANGE_X */ |