Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SCTP]: Switch ->from_addr_param() to net-endian.

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2006-11-20 17:11:13 -08:00 committed by David S. Miller
parent 5ab7b859ab
commit dd86d136f9
6 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,7 +575,7 @@ struct sctp_af {
struct sock *sk); struct sock *sk);
void (*from_addr_param) (union sctp_addr *, void (*from_addr_param) (union sctp_addr *,
union sctp_addr_param *, union sctp_addr_param *,
__u16 port, int iif); __be16 port, int iif);
int (*to_addr_param) (const union sctp_addr *, int (*to_addr_param) (const union sctp_addr *,
union sctp_addr_param *); union sctp_addr_param *);
int (*addr_valid) (union sctp_addr *, int (*addr_valid) (union sctp_addr *,

6
net/sctp/bind_addr.c
View File

@ -264,7 +264,6 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list,
int retval = 0; int retval = 0;
int len; int len;
struct sctp_af *af; struct sctp_af *af;
union sctp_addr tmp;
/* Convert the raw address to standard address format */ /* Convert the raw address to standard address format */
while (addrs_len) { while (addrs_len) {
@ -278,9 +277,8 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list,
break; break;
} }
af->from_addr_param(&addr, rawaddr, port, 0); af->from_addr_param(&addr, rawaddr, htons(port), 0);
flip_to_n(&tmp, &addr); retval = sctp_add_bind_addr(bp, &addr, 1, gfp);
retval = sctp_add_bind_addr(bp, &tmp, 1, gfp);
if (retval) { if (retval) {
/* Can't finish building the list, clean up. */ /* Can't finish building the list, clean up. */
sctp_bind_addr_clean(bp); sctp_bind_addr_clean(bp);

6
net/sctp/input.c
View File

@ -914,7 +914,6 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct sk_buff *skb,
sctp_init_chunk_t *init; sctp_init_chunk_t *init;
struct sctp_transport *transport; struct sctp_transport *transport;
struct sctp_af *af; struct sctp_af *af;
union sctp_addr tmp2;
ch = (sctp_chunkhdr_t *) skb->data; ch = (sctp_chunkhdr_t *) skb->data;
@ -961,10 +960,9 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct sk_buff *skb,
if (!af) if (!af)
continue; continue;
af->from_addr_param(paddr, params.addr, ntohs(sh->source), 0); af->from_addr_param(paddr, params.addr, sh->source, 0);
flip_to_n(&tmp2, paddr);
asoc = __sctp_lookup_association(laddr, &tmp2, &transport); asoc = __sctp_lookup_association(laddr, paddr, &transport);
if (asoc) if (asoc)
return asoc; return asoc;
} }

2
net/sctp/ipv6.c
View File

@ -408,7 +408,7 @@ static void sctp_v6_to_sk_daddr(union sctp_addr *addr, struct sock *sk)
/* Initialize a sctp_addr from an address parameter. */ /* Initialize a sctp_addr from an address parameter. */
static void sctp_v6_from_addr_param(union sctp_addr *addr, static void sctp_v6_from_addr_param(union sctp_addr *addr,
union sctp_addr_param *param, union sctp_addr_param *param,
__u16 port, int iif) __be16 port, int iif)
{ {
addr->v6.sin6_family = AF_INET6; addr->v6.sin6_family = AF_INET6;
addr->v6.sin6_port = port; addr->v6.sin6_port = port;

2
net/sctp/protocol.c
View File

@ -292,7 +292,7 @@ static void sctp_v4_to_sk_daddr(union sctp_addr *addr, struct sock *sk)
/* Initialize a sctp_addr from an address parameter. */ /* Initialize a sctp_addr from an address parameter. */
static void sctp_v4_from_addr_param(union sctp_addr *addr, static void sctp_v4_from_addr_param(union sctp_addr *addr,
union sctp_addr_param *param, union sctp_addr_param *param,
__u16 port, int iif) __be16 port, int iif)
{ {
addr->v4.sin_family = AF_INET; addr->v4.sin_family = AF_INET;
addr->v4.sin_port = port; addr->v4.sin_port = port;

29
net/sctp/sm_make_chunk.c
View File

@ -2021,7 +2021,6 @@ static int sctp_process_param(struct sctp_association *asoc,
sctp_scope_t scope; sctp_scope_t scope;
time_t stale; time_t stale;
struct sctp_af *af; struct sctp_af *af;
union sctp_addr tmp;
/* We maintain all INIT parameters in network byte order all the /* We maintain all INIT parameters in network byte order all the
* time. This allows us to not worry about whether the parameters * time. This allows us to not worry about whether the parameters
@ -2034,11 +2033,10 @@ static int sctp_process_param(struct sctp_association *asoc,
/* Fall through. */ /* Fall through. */
case SCTP_PARAM_IPV4_ADDRESS: case SCTP_PARAM_IPV4_ADDRESS:
af = sctp_get_af_specific(param_type2af(param.p->type)); af = sctp_get_af_specific(param_type2af(param.p->type));
af->from_addr_param(&addr, param.addr, asoc->peer.port, 0); af->from_addr_param(&addr, param.addr, htons(asoc->peer.port), 0);
flip_to_n(&tmp, &addr);
scope = sctp_scope(peer_addr); scope = sctp_scope(peer_addr);
if (sctp_in_scope(&tmp, scope)) if (sctp_in_scope(&addr, scope))
if (!sctp_assoc_add_peer(asoc, &tmp, gfp, SCTP_UNCONFIRMED)) if (!sctp_assoc_add_peer(asoc, &addr, gfp, SCTP_UNCONFIRMED))
return 0; return 0;
break; break;
@ -2421,7 +2419,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
union sctp_addr addr; union sctp_addr addr;
struct list_head *pos; struct list_head *pos;
union sctp_addr_param *addr_param; union sctp_addr_param *addr_param;
union sctp_addr tmp, tmp_addr; union sctp_addr tmp;
addr_param = (union sctp_addr_param *) addr_param = (union sctp_addr_param *)
((void *)asconf_param + sizeof(sctp_addip_param_t)); ((void *)asconf_param + sizeof(sctp_addip_param_t));
@ -2430,8 +2428,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
if (unlikely(!af)) if (unlikely(!af))
return SCTP_ERROR_INV_PARAM; return SCTP_ERROR_INV_PARAM;
af->from_addr_param(&addr, addr_param, asoc->peer.port, 0); af->from_addr_param(&addr, addr_param, htons(asoc->peer.port), 0);
flip_to_n(&tmp_addr, &addr);
switch (asconf_param->param_hdr.type) { switch (asconf_param->param_hdr.type) {
case SCTP_PARAM_ADD_IP: case SCTP_PARAM_ADD_IP:
/* ADDIP 4.3 D9) If an endpoint receives an ADD IP address /* ADDIP 4.3 D9) If an endpoint receives an ADD IP address
@ -2441,7 +2438,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
* Due to Resource Shortage'. * Due to Resource Shortage'.
*/ */
peer = sctp_assoc_add_peer(asoc, &tmp_addr, GFP_ATOMIC, SCTP_UNCONFIRMED); peer = sctp_assoc_add_peer(asoc, &addr, GFP_ATOMIC, SCTP_UNCONFIRMED);
if (!peer) if (!peer)
return SCTP_ERROR_RSRC_LOW; return SCTP_ERROR_RSRC_LOW;
@ -2467,13 +2464,13 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
* Delete Source IP Address' * Delete Source IP Address'
*/ */
flip_to_n(&tmp, sctp_source(asconf)); flip_to_n(&tmp, sctp_source(asconf));
if (sctp_cmp_addr_exact(&tmp, &tmp_addr)) if (sctp_cmp_addr_exact(&tmp, &addr))
return SCTP_ERROR_DEL_SRC_IP; return SCTP_ERROR_DEL_SRC_IP;
sctp_assoc_del_peer(asoc, &tmp_addr); sctp_assoc_del_peer(asoc, &addr);
break; break;
case SCTP_PARAM_SET_PRIMARY: case SCTP_PARAM_SET_PRIMARY:
peer = sctp_assoc_lookup_paddr(asoc, &tmp_addr); peer = sctp_assoc_lookup_paddr(asoc, &addr);
if (!peer) if (!peer)
return SCTP_ERROR_INV_PARAM; return SCTP_ERROR_INV_PARAM;
@ -2591,15 +2588,13 @@ static int sctp_asconf_param_success(struct sctp_association *asoc,
struct sctp_transport *transport; struct sctp_transport *transport;
struct sctp_sockaddr_entry *saddr; struct sctp_sockaddr_entry *saddr;
int retval = 0; int retval = 0;
union sctp_addr tmp;
addr_param = (union sctp_addr_param *) addr_param = (union sctp_addr_param *)
((void *)asconf_param + sizeof(sctp_addip_param_t)); ((void *)asconf_param + sizeof(sctp_addip_param_t));
/* We have checked the packet before, so we do not check again. */ /* We have checked the packet before, so we do not check again. */
af = sctp_get_af_specific(param_type2af(addr_param->v4.param_hdr.type)); af = sctp_get_af_specific(param_type2af(addr_param->v4.param_hdr.type));
af->from_addr_param(&addr, addr_param, bp->port, 0); af->from_addr_param(&addr, addr_param, htons(bp->port), 0);
flip_to_n(&tmp, &addr);
switch (asconf_param->param_hdr.type) { switch (asconf_param->param_hdr.type) {
case SCTP_PARAM_ADD_IP: case SCTP_PARAM_ADD_IP:
@ -2607,7 +2602,7 @@ static int sctp_asconf_param_success(struct sctp_association *asoc,
sctp_write_lock(&asoc->base.addr_lock); sctp_write_lock(&asoc->base.addr_lock);
list_for_each(pos, &bp->address_list) { list_for_each(pos, &bp->address_list) {
saddr = list_entry(pos, struct sctp_sockaddr_entry, list); saddr = list_entry(pos, struct sctp_sockaddr_entry, list);
if (sctp_cmp_addr_exact(&saddr->a, &tmp)) if (sctp_cmp_addr_exact(&saddr->a, &addr))
saddr->use_as_src = 1; saddr->use_as_src = 1;
} }
sctp_write_unlock(&asoc->base.addr_lock); sctp_write_unlock(&asoc->base.addr_lock);
@ -2616,7 +2611,7 @@ static int sctp_asconf_param_success(struct sctp_association *asoc,
case SCTP_PARAM_DEL_IP: case SCTP_PARAM_DEL_IP:
sctp_local_bh_disable(); sctp_local_bh_disable();
sctp_write_lock(&asoc->base.addr_lock); sctp_write_lock(&asoc->base.addr_lock);
retval = sctp_del_bind_addr(bp, &tmp); retval = sctp_del_bind_addr(bp, &addr);
sctp_write_unlock(&asoc->base.addr_lock); sctp_write_unlock(&asoc->base.addr_lock);
sctp_local_bh_enable(); sctp_local_bh_enable();
list_for_each(pos, &asoc->peer.transport_addr_list) { list_for_each(pos, &asoc->peer.transport_addr_list) {