]> err.no Git - linux-2.6/commitdiff
[SCTP]: sctp_transport_route() switched to net-endian.
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 21 Nov 2006 01:13:21 +0000 (17:13 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 3 Dec 2006 05:26:54 +0000 (21:26 -0800)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/sm_statefuns.c
net/sctp/transport.c

index 0848309773a5beb49340548f6e1e068e9efb0704..42377f75ee1cb6b23425148cfb834fef778cac3e 100644 (file)
@@ -5103,6 +5103,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
        __u16 sport;
        __u16 dport;
        __u32 vtag;
+       union sctp_addr tmp;
 
        /* Get the source and destination port from the inbound packet.  */
        sport = ntohs(chunk->sctp_hdr->dest);
@@ -5140,7 +5141,8 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
        /* Cache a route for the transport with the chunk's destination as
         * the source address.
         */
-       sctp_transport_route(transport, (union sctp_addr *)&chunk->dest,
+       flip_to_n(&tmp, &chunk->dest);
+       sctp_transport_route(transport, &tmp,
                             sctp_sk(sctp_get_ctl_sock()));
 
        packet = sctp_packet_init(&transport->packet, transport, sport, dport);
index 33e7d85f1119f6f7ea3e0d4ec6b99bf9cbbb5f02..d1b6834a3a4748216067140e426c8412a69aca3e 100644 (file)
@@ -253,19 +253,15 @@ void sctp_transport_route(struct sctp_transport *transport,
        struct sctp_af *af = transport->af_specific;
        union sctp_addr *daddr = &transport->ipaddr;
        struct dst_entry *dst;
-       union sctp_addr tmp;
-       flip_to_n(&tmp, saddr);
 
-       dst = af->get_dst(asoc, daddr, &tmp);
+       dst = af->get_dst(asoc, daddr, saddr);
 
-       if (saddr) {
-               memcpy(&transport->saddr_h, saddr, sizeof(union sctp_addr));
-               flip_to_n(&transport->saddr, &transport->saddr_h);
-       } else {
+       if (saddr)
+               memcpy(&transport->saddr, saddr, sizeof(union sctp_addr));
+       else
                af->get_saddr(asoc, dst, daddr, &transport->saddr);
-               flip_to_h(&transport->saddr_h, &transport->saddr);
-       }
 
+       flip_to_h(&transport->saddr_h, &transport->saddr);
        transport->dst = dst;
        if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
                return;