← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to net/ipv4/datagram.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv4/datagram.c
24
24
{
25
25
        struct inet_sock *inet = inet_sk(sk);
26
26
        struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;
 
27
        struct flowi4 *fl4;
27
28
        struct rtable *rt;
28
29
        __be32 saddr;
29
30
        int oif;
38
39
 
39
40
        sk_dst_reset(sk);
40
41
 
 
42
        lock_sock(sk);
 
43
 
41
44
        oif = sk->sk_bound_dev_if;
42
45
        saddr = inet->inet_saddr;
43
46
        if (ipv4_is_multicast(usin->sin_addr.s_addr)) {
46
49
                if (!saddr)
47
50
                        saddr = inet->mc_addr;
48
51
        }
49
 
        rt = ip_route_connect(usin->sin_addr.s_addr, saddr,
 
52
        fl4 = &inet->cork.fl.u.ip4;
 
53
        rt = ip_route_connect(fl4, usin->sin_addr.s_addr, saddr,
50
54
                              RT_CONN_FLAGS(sk), oif,
51
55
                              sk->sk_protocol,
52
56
                              inet->inet_sport, usin->sin_port, sk, true);
54
58
                err = PTR_ERR(rt);
55
59
                if (err == -ENETUNREACH)
56
60
                        IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
57
 
                return err;
 
61
                goto out;
58
62
        }
59
63
 
60
64
        if ((rt->rt_flags & RTCF_BROADCAST) && !sock_flag(sk, SOCK_BROADCAST)) {
61
65
                ip_rt_put(rt);
62
 
                return -EACCES;
 
66
                err = -EACCES;
 
67
                goto out;
63
68
        }
64
69
        if (!inet->inet_saddr)
65
 
                inet->inet_saddr = rt->rt_src;  /* Update source address */
 
70
                inet->inet_saddr = fl4->saddr;  /* Update source address */
66
71
        if (!inet->inet_rcv_saddr) {
67
 
                inet->inet_rcv_saddr = rt->rt_src;
 
72
                inet->inet_rcv_saddr = fl4->saddr;
68
73
                if (sk->sk_prot->rehash)
69
74
                        sk->sk_prot->rehash(sk);
70
75
        }
71
 
        inet->inet_daddr = rt->rt_dst;
 
76
        inet->inet_daddr = fl4->daddr;
72
77
        inet->inet_dport = usin->sin_port;
73
78
        sk->sk_state = TCP_ESTABLISHED;
74
79
        inet->inet_id = jiffies;
75
80
 
76
81
        sk_dst_set(sk, &rt->dst);
77
 
        return 0;
 
82
        err = 0;
 
83
out:
 
84
        release_sock(sk);
 
85
        return err;
78
86
}
79
87
EXPORT_SYMBOL(ip4_datagram_connect);