linux-stable.git/include/linux/dccp.h, branch linux-2.6.17.y

[DCCP] minisock: Rename struct dccp_options to struct dccp_minisock

2006-03-21T06:50:58+00:00

This will later be included in struct dccp_request_sock so that we can
have per connection feature negotiation state while in the 3way
handshake, when we clone the DCCP_ROLE_LISTEN socket (in
dccp_create_openreq_child) we'll just copy this state from
dreq_minisock to dccps_minisock.

Also the feature negotiation and option parsing code will mostly touch
dccps_minisock, which will simplify some stuff.

Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller

[DCCP]: Make CCID2 be the default

2006-03-21T03:23:58+00:00

As per the draft. This fixes the build when netfilter dccp components
are built and dccp isn't. Thanks to Reuben Farrelly for reporting
this.

The following changesets will introduce /proc/sys/net/dccp/defaults/
to give more flexibility to DCCP developers and testers while apps
doesn't use setsockopt to specify the desired CCID, etc.

Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller

[DCCP]: sparse endianness annotations

2006-03-21T03:23:32+00:00

This also fixes the layout of dccp_hdr short sequence numbers, problem
was not fatal now as we only support long (48 bits) sequence numbers.

Signed-off-by: Andrea Bittau 
Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: Al Viro 
Signed-off-by: David S. Miller

[DCCP] CCID: Improve CCID infrastructure

2006-03-21T03:21:44+00:00

1. No need for ->ccid_init nor ->ccid_exit, this is what module_{init,exit}
   does and anynways neither ccid2 nor ccid3 were using it.

2. Rename struct ccid to struct ccid_operations and introduce struct ccid
   with a pointer to ccid_operations and rigth after it the rx or tx
   private state.

3. Remove the pointer to the state of the half connections from struct
   dccp_sock, now its derived thru ccid_priv() from the ccid pointer.

Now we also can implement the setsockopt for changing the CCID easily as
no ccid init routines can affect struct dccp_sock in any way that prevents
other CCIDs from working if a CCID switch operation is asked by apps.

Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller

[DCCP]: Set the default CCID according to kernel config selection

2006-03-21T01:56:56+00:00

Now CCID2 is the default, as stated in the RFC drafts, but we allow
a config where just CCID3 is built, where CCID3 becomes the default.

Signed-off-by: Ian McDonald 
Signed-off-by: Arnaldo Carvalho de Melo

[DCCP]: Initial feature negotiation implementation

2006-03-21T01:43:56+00:00

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 
18:38:52.218526  127.0.0.1.5001 > 127.0.0.1.43458: response 
18:38:52.185398  127.0.0.1.43458 > 127.0.0.1.5001: 

:-)

Signed-off-by: Andrea Bittau 
Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller

[DCCP] CCID2: Initial CCID2 (TCP-Like) implementation

2006-03-21T01:41:47+00:00

Original work by Andrea Bittau, Arnaldo Melo cleaned up and fixed several
issues on the merge process.

For now CCID2 was turned the default for all SOCK_DCCP connections, but this
will be remedied soon with the merge of the feature negotiation code.

Signed-off-by: Andrea Bittau 
Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03T21:11:21+00:00

To help in reducing the number of include dependencies, several files were
touched as they were getting needed headers indirectly for stuff they use.

Thanks also to Alan Menegotto for pointing out that net/dccp/proto.c had
linux/dccp.h include twice.

Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller

[IP_SOCKGLUE]: Remove most of the tcp specific calls

2006-01-03T21:10:58+00:00

As DCCP needs to be called in the same spots.

Now we have a member in inet_sock (is_icsk), set at sock creation time from
struct inet_protosw->flags (if INET_PROTOSW_ICSK is set, like for TCP and
DCCP) to see if a struct sock instance is a inet_connection_sock for places
like the ones in ip_sockglue.c (v4 and v6) where we previously were looking if
sk_type was SOCK_STREAM, that is insufficient because we now use the same code
for DCCP, that has sk_type SOCK_DCCP.

Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller

[DCCP]: Introduce CCID getsockopt for the CCIDs

2005-09-18T07:19:32+00:00

Allocation for the optnames is similar to the DCCP options, with a
range for rx and tx half connection CCIDs.

Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller