Skip to content

Commit

Permalink
[SCTP] embedded sctp_addr: net-endian mirrors
Browse files Browse the repository at this point in the history
Add sctp_chunk->source, sctp_sockaddr_entry->a, sctp_transport->ipaddr
and sctp_transport->saddr, maintain them as net-endian mirrors of
their host-endian counterparts.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Al Viro authored and David S. Miller committed Dec 3, 2006
1 parent 09ef7fe commit 2a6fd78
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 7 deletions.
4 changes: 4 additions & 0 deletions include/net/sctp/structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@ struct sctp_chunk {
unsigned long sent_at;

/* What is the origin IP address for this chunk? */
union sctp_addr source;
union sctp_addr source_h;
/* Destination address for this chunk. */
union sctp_addr dest;
Expand Down Expand Up @@ -756,6 +757,7 @@ const union sctp_addr *sctp_source(const struct sctp_chunk *chunk);
/* This is a structure for holding either an IPv6 or an IPv4 address. */
struct sctp_sockaddr_entry {
struct list_head list;
union sctp_addr a;
union sctp_addr a_h;
__u8 use_as_src;
};
Expand Down Expand Up @@ -842,6 +844,7 @@ struct sctp_transport {
int dead;

/* This is the peer's IP address and port. */
union sctp_addr ipaddr;
union sctp_addr ipaddr_h;

/* These are the functions we call to handle LLP stuff. */
Expand Down Expand Up @@ -900,6 +903,7 @@ struct sctp_transport {
/* Destination */
struct dst_entry *dst;
/* Source address. */
union sctp_addr saddr;
union sctp_addr saddr_h;

/* When was the last time(in jiffies) that a data packet was sent on
Expand Down
2 changes: 2 additions & 0 deletions net/sctp/bind_addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,
if (!addr->a_h.v4.sin_port)
addr->a_h.v4.sin_port = bp->port;

flip_to_n(&addr->a, &addr->a_h);

addr->use_as_src = use_as_src;

INIT_LIST_HEAD(&addr->list);
Expand Down
9 changes: 5 additions & 4 deletions net/sctp/ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,11 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
/* Add the address to the local list. */
addr = t_new(struct sctp_sockaddr_entry, GFP_ATOMIC);
if (addr) {
addr->a_h.v6.sin6_family = AF_INET6;
addr->a_h.v6.sin6_port = 0;
addr->a_h.v6.sin6_addr = ifp->addr;
addr->a_h.v6.sin6_scope_id = dev->ifindex;
addr->a.v6.sin6_family = AF_INET6;
addr->a.v6.sin6_port = 0;
addr->a.v6.sin6_addr = ifp->addr;
addr->a.v6.sin6_scope_id = dev->ifindex;
addr->a_h = addr->a;
INIT_LIST_HEAD(&addr->list);
list_add_tail(&addr->list, addrlist);
}
Expand Down
7 changes: 4 additions & 3 deletions net/sctp/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,10 @@ static void sctp_v4_copy_addrlist(struct list_head *addrlist,
/* Add the address to the local list. */
addr = t_new(struct sctp_sockaddr_entry, GFP_ATOMIC);
if (addr) {
addr->a_h.v4.sin_family = AF_INET;
addr->a_h.v4.sin_port = 0;
addr->a_h.v4.sin_addr.s_addr = ifa->ifa_local;
addr->a.v4.sin_family = AF_INET;
addr->a.v4.sin_port = 0;
addr->a.v4.sin_addr.s_addr = ifa->ifa_local;
addr->a_h = addr->a;
list_add_tail(&addr->list, addrlist);
}
}
Expand Down
1 change: 1 addition & 0 deletions net/sctp/sm_make_chunk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,7 @@ void sctp_init_addrs(struct sctp_chunk *chunk, union sctp_addr *src,
union sctp_addr *dest)
{
memcpy(&chunk->source_h, src, sizeof(union sctp_addr));
flip_to_n(&chunk->source, &chunk->source_h);
memcpy(&chunk->dest, dest, sizeof(union sctp_addr));
}

Expand Down
3 changes: 3 additions & 0 deletions net/sctp/transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
{
/* Copy in the address. */
peer->ipaddr_h = *addr;
flip_to_n(&peer->ipaddr, &peer->ipaddr_h);
peer->af_specific = sctp_get_af_specific(addr->sa.sa_family);
peer->asoc = NULL;

peer->dst = NULL;
memset(&peer->saddr, 0, sizeof(union sctp_addr));
memset(&peer->saddr_h, 0, sizeof(union sctp_addr));

/* From 6.3.1 RTO Calculation:
Expand Down Expand Up @@ -258,6 +260,7 @@ void sctp_transport_route(struct sctp_transport *transport,
memcpy(&transport->saddr_h, saddr, sizeof(union sctp_addr));
else
af->get_saddr(asoc, dst, daddr, &transport->saddr_h);
flip_to_n(&transport->saddr, &transport->saddr_h);

transport->dst = dst;
if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
Expand Down

0 comments on commit 2a6fd78

Please sign in to comment.