[DCCP]: Initial feature negotiation implementation
Still needs more work, but boots and doesn't crashes, even
does some negotiation!
18:38:52.174934 127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526 127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398 127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>
:-)
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-03-20 18:43:56 -07:00
|
|
|
#ifndef _DCCP_FEAT_H
|
|
|
|
#define _DCCP_FEAT_H
|
|
|
|
/*
|
|
|
|
* net/dccp/feat.h
|
|
|
|
*
|
|
|
|
* An implementation of the DCCP protocol
|
|
|
|
* Copyright (c) 2005 Andrea Bittau <a.bittau@cs.ucl.ac.uk>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
[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>
2006-11-14 07:48:10 -07:00
|
|
|
#include "dccp.h"
|
[DCCP]: Initial feature negotiation implementation
Still needs more work, but boots and doesn't crashes, even
does some negotiation!
18:38:52.174934 127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526 127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398 127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>
:-)
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-03-20 18:43:56 -07:00
|
|
|
|
2008-11-05 00:38:20 -07:00
|
|
|
enum dccp_feat_type {
|
|
|
|
FEAT_AT_RX = 1, /* located at RX side of half-connection */
|
|
|
|
FEAT_AT_TX = 2, /* located at TX side of half-connection */
|
|
|
|
FEAT_SP = 4, /* server-priority reconciliation (6.3.1) */
|
|
|
|
FEAT_NN = 8, /* non-negotiable reconciliation (6.3.2) */
|
|
|
|
FEAT_UNKNOWN = 0xFF /* not understood or invalid feature */
|
|
|
|
};
|
|
|
|
|
|
|
|
enum dccp_feat_state {
|
|
|
|
FEAT_DEFAULT = 0, /* using default values from 6.4 */
|
|
|
|
FEAT_INITIALISING, /* feature is being initialised */
|
|
|
|
FEAT_CHANGING, /* Change sent but not confirmed yet */
|
|
|
|
FEAT_UNSTABLE, /* local modification in state CHANGING */
|
|
|
|
FEAT_STABLE /* both ends (think they) agree */
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* dccp_feat_val - Container for SP or NN feature values
|
|
|
|
* @nn: single NN value
|
|
|
|
* @sp.vec: single SP value plus optional preference list
|
|
|
|
* @sp.len: length of @sp.vec in bytes
|
|
|
|
*/
|
|
|
|
typedef union {
|
|
|
|
u64 nn;
|
|
|
|
struct {
|
|
|
|
u8 *vec;
|
|
|
|
u8 len;
|
|
|
|
} sp;
|
|
|
|
} dccp_feat_val;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* struct feat_entry - Data structure to perform feature negotiation
|
|
|
|
* @val: feature's current value (SP features may have preference list)
|
|
|
|
* @state: feature's current state
|
|
|
|
* @feat_num: one of %dccp_feature_numbers
|
|
|
|
* @needs_mandatory: whether Mandatory options should be sent
|
|
|
|
* @needs_confirm: whether to send a Confirm instead of a Change
|
|
|
|
* @empty_confirm: whether to send an empty Confirm (depends on @needs_confirm)
|
|
|
|
* @is_local: feature location (1) or feature-remote (0)
|
|
|
|
* @node: list pointers, entries arranged in FIFO order
|
|
|
|
*/
|
|
|
|
struct dccp_feat_entry {
|
|
|
|
dccp_feat_val val;
|
|
|
|
enum dccp_feat_state state:8;
|
|
|
|
u8 feat_num;
|
|
|
|
|
|
|
|
bool needs_mandatory,
|
|
|
|
needs_confirm,
|
|
|
|
empty_confirm,
|
|
|
|
is_local;
|
|
|
|
|
|
|
|
struct list_head node;
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline u8 dccp_feat_genopt(struct dccp_feat_entry *entry)
|
|
|
|
{
|
|
|
|
if (entry->needs_confirm)
|
|
|
|
return entry->is_local ? DCCPO_CONFIRM_L : DCCPO_CONFIRM_R;
|
|
|
|
return entry->is_local ? DCCPO_CHANGE_L : DCCPO_CHANGE_R;
|
|
|
|
}
|
|
|
|
|
[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>
2006-11-14 07:48:10 -07:00
|
|
|
#ifdef CONFIG_IP_DCCP_DEBUG
|
|
|
|
extern const char *dccp_feat_typename(const u8 type);
|
|
|
|
extern const char *dccp_feat_name(const u8 feat);
|
|
|
|
|
|
|
|
static inline void dccp_feat_debug(const u8 type, const u8 feat, const u8 val)
|
|
|
|
{
|
|
|
|
dccp_pr_debug("%s(%s (%d), %d)\n", dccp_feat_typename(type),
|
|
|
|
dccp_feat_name(feat), feat, val);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define dccp_feat_debug(type, feat, val)
|
|
|
|
#endif /* CONFIG_IP_DCCP_DEBUG */
|
[DCCP]: Initial feature negotiation implementation
Still needs more work, but boots and doesn't crashes, even
does some negotiation!
18:38:52.174934 127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526 127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398 127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>
:-)
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-03-20 18:43:56 -07:00
|
|
|
|
2006-03-20 23:51:53 -07:00
|
|
|
extern int dccp_feat_change(struct dccp_minisock *dmsk, u8 type, u8 feature,
|
[DCCP]: Initial feature negotiation implementation
Still needs more work, but boots and doesn't crashes, even
does some negotiation!
18:38:52.174934 127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526 127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398 127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>
:-)
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-03-20 18:43:56 -07:00
|
|
|
u8 *val, u8 len, gfp_t gfp);
|
|
|
|
extern int dccp_feat_change_recv(struct sock *sk, u8 type, u8 feature,
|
|
|
|
u8 *val, u8 len);
|
|
|
|
extern int dccp_feat_confirm_recv(struct sock *sk, u8 type, u8 feature,
|
|
|
|
u8 *val, u8 len);
|
2006-03-20 23:51:53 -07:00
|
|
|
extern void dccp_feat_clean(struct dccp_minisock *dmsk);
|
[DCCP]: Initial feature negotiation implementation
Still needs more work, but boots and doesn't crashes, even
does some negotiation!
18:38:52.174934 127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526 127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398 127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>
:-)
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-03-20 18:43:56 -07:00
|
|
|
extern int dccp_feat_clone(struct sock *oldsk, struct sock *newsk);
|
2008-11-05 00:55:49 -07:00
|
|
|
extern int dccp_feat_clone_list(struct list_head const *, struct list_head *);
|
2006-03-20 23:51:53 -07:00
|
|
|
extern int dccp_feat_init(struct dccp_minisock *dmsk);
|
[DCCP]: Initial feature negotiation implementation
Still needs more work, but boots and doesn't crashes, even
does some negotiation!
18:38:52.174934 127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526 127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398 127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>
:-)
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-03-20 18:43:56 -07:00
|
|
|
|
|
|
|
#endif /* _DCCP_FEAT_H */
|