aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 20:13:21 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:26:54 -0500
commitd448388bdaca946aa2b07973cb72a9b834e530bf (patch)
tree9189eec85228062327745cee6f121af9f98a9364 /net/sctp
parentcb7b4a0dcf67ae747406b58b1cdc875916019739 (diff)
[SCTP]: sctp_transport_route() switched to net-endian.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/sm_statefuns.c4
-rw-r--r--net/sctp/transport.c14
2 files changed, 8 insertions, 10 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 0848309773a5..42377f75ee1c 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -5103,6 +5103,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
5103 __u16 sport; 5103 __u16 sport;
5104 __u16 dport; 5104 __u16 dport;
5105 __u32 vtag; 5105 __u32 vtag;
5106 union sctp_addr tmp;
5106 5107
5107 /* Get the source and destination port from the inbound packet. */ 5108 /* Get the source and destination port from the inbound packet. */
5108 sport = ntohs(chunk->sctp_hdr->dest); 5109 sport = ntohs(chunk->sctp_hdr->dest);
@@ -5140,7 +5141,8 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
5140 /* Cache a route for the transport with the chunk's destination as 5141 /* Cache a route for the transport with the chunk's destination as
5141 * the source address. 5142 * the source address.
5142 */ 5143 */
5143 sctp_transport_route(transport, (union sctp_addr *)&chunk->dest, 5144 flip_to_n(&tmp, &chunk->dest);
5145 sctp_transport_route(transport, &tmp,
5144 sctp_sk(sctp_get_ctl_sock())); 5146 sctp_sk(sctp_get_ctl_sock()));
5145 5147
5146 packet = sctp_packet_init(&transport->packet, transport, sport, dport); 5148 packet = sctp_packet_init(&transport->packet, transport, sport, dport);
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 33e7d85f1119..d1b6834a3a47 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -253,19 +253,15 @@ void sctp_transport_route(struct sctp_transport *transport,
253 struct sctp_af *af = transport->af_specific; 253 struct sctp_af *af = transport->af_specific;
254 union sctp_addr *daddr = &transport->ipaddr; 254 union sctp_addr *daddr = &transport->ipaddr;
255 struct dst_entry *dst; 255 struct dst_entry *dst;
256 union sctp_addr tmp;
257 flip_to_n(&tmp, saddr);
258 256
259 dst = af->get_dst(asoc, daddr, &tmp); 257 dst = af->get_dst(asoc, daddr, saddr);
260 258
261 if (saddr) { 259 if (saddr)
262 memcpy(&transport->saddr_h, saddr, sizeof(union sctp_addr)); 260 memcpy(&transport->saddr, saddr, sizeof(union sctp_addr));
263 flip_to_n(&transport->saddr, &transport->saddr_h); 261 else
264 } else {
265 af->get_saddr(asoc, dst, daddr, &transport->saddr); 262 af->get_saddr(asoc, dst, daddr, &transport->saddr);
266 flip_to_h(&transport->saddr_h, &transport->saddr);
267 }
268 263
264 flip_to_h(&transport->saddr_h, &transport->saddr);
269 transport->dst = dst; 265 transport->dst = dst;
270 if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) { 266 if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
271 return; 267 return;