leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sctp: Store a flowi in transports to provide persistent keying.

Browse Source 
Several future simplifications are possible now because of this.

For example, the sctp_addr unions can simply refer directly to
the flowi information.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-05-06 16:32:47 -07:00
parent b57ae01a8a
commit 8663c938ce
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/sctp/structs.h
View File

@ -894,6 +894,7 @@ struct sctp_transport {
/* Is this structure kfree()able? */ /* Is this structure kfree()able? */
malloced:1; malloced:1;
struct flowi fl;
/* This is the peer's IP address and port. */ /* This is the peer's IP address and port. */
union sctp_addr ipaddr; union sctp_addr ipaddr;

9
net/sctp/transport.c
View File

@ -213,13 +213,11 @@ void sctp_transport_set_owner(struct sctp_transport *transport,
/* Initialize the pmtu of a transport. */ /* Initialize the pmtu of a transport. */
void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk) void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk)
{ {
struct flowi fl;
/* If we don't have a fresh route, look one up */ /* If we don't have a fresh route, look one up */
if (!transport->dst || transport->dst->obsolete > 1) { if (!transport->dst || transport->dst->obsolete > 1) {
dst_release(transport->dst); dst_release(transport->dst);
transport->af_specific->get_dst(transport, &transport->saddr, transport->af_specific->get_dst(transport, &transport->saddr,
&fl, sk); &transport->fl, sk);
} }
if (transport->dst) { if (transport->dst) {
@ -274,14 +272,13 @@ void sctp_transport_route(struct sctp_transport *transport,
{ {
struct sctp_association *asoc = transport->asoc; struct sctp_association *asoc = transport->asoc;
struct sctp_af *af = transport->af_specific; struct sctp_af *af = transport->af_specific;
struct flowi fl;
af->get_dst(transport, saddr, &fl, sctp_opt2sk(opt)); af->get_dst(transport, saddr, &transport->fl, sctp_opt2sk(opt));
if (saddr) if (saddr)
memcpy(&transport->saddr, saddr, sizeof(union sctp_addr)); memcpy(&transport->saddr, saddr, sizeof(union sctp_addr));
else else
af->get_saddr(opt, transport, &fl); af->get_saddr(opt, transport, &transport->fl);
if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) { if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
return; return;