|
@@ -45,7 +45,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
|
|
__be16 orig_sport, orig_dport;
|
|
|
__be32 daddr, nexthop;
|
|
|
- struct flowi4 fl4;
|
|
|
+ struct flowi4 *fl4;
|
|
|
struct rtable *rt;
|
|
|
int err;
|
|
|
struct ip_options_rcu *inet_opt;
|
|
@@ -70,7 +70,8 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|
|
|
|
|
orig_sport = inet->inet_sport;
|
|
|
orig_dport = usin->sin_port;
|
|
|
- rt = ip_route_connect(&fl4, nexthop, inet->inet_saddr,
|
|
|
+ fl4 = &inet->cork.fl.u.ip4;
|
|
|
+ rt = ip_route_connect(fl4, nexthop, inet->inet_saddr,
|
|
|
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,
|
|
|
IPPROTO_DCCP,
|
|
|
orig_sport, orig_dport, sk, true);
|
|
@@ -83,10 +84,10 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|
|
}
|
|
|
|
|
|
if (inet_opt == NULL || !inet_opt->opt.srr)
|
|
|
- daddr = fl4.daddr;
|
|
|
+ daddr = fl4->daddr;
|
|
|
|
|
|
if (inet->inet_saddr == 0)
|
|
|
- inet->inet_saddr = fl4.saddr;
|
|
|
+ inet->inet_saddr = fl4->saddr;
|
|
|
inet->inet_rcv_saddr = inet->inet_saddr;
|
|
|
|
|
|
inet->inet_dport = usin->sin_port;
|
|
@@ -106,7 +107,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|
|
if (err != 0)
|
|
|
goto failure;
|
|
|
|
|
|
- rt = ip_route_newports(&fl4, rt, orig_sport, orig_dport,
|
|
|
+ rt = ip_route_newports(fl4, rt, orig_sport, orig_dport,
|
|
|
inet->inet_sport, inet->inet_dport, sk);
|
|
|
if (IS_ERR(rt)) {
|
|
|
rt = NULL;
|