diff options
| author |   Ulrich Weber <ulrich.weber@gmail.com> | 2020-01-14 15:19:43 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-15 23:13:09 +0100 |
| commit | 43d28c612f4c02a3fdea3d906170faece8ada9e1 (patch) | |
| tree | 8e55f0018c1b6623a5951731fc5d5e5e057f986f /drivers/net | |
| parent | Merge tag 'batadv-next-for-davem-20200114' of git://git.open-mesh.org/linux-merge (diff) | |
| download | linux-dev-43d28c612f4c02a3fdea3d906170faece8ada9e1.tar.xz linux-dev-43d28c612f4c02a3fdea3d906170faece8ada9e1.zip | |
pptp: support sockets bound to an interface
use sk_bound_dev_if for route lookup as already done
in most of the other ip_route_output_ports() calls.
Since most PPPoA providers use 10.0.0.138 as default gateway IP
this will allow connections to multiple PPTP providers with the
same IP address over different interfaces.
Signed-off-by: Ulrich Weber <ulrich.weber@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ppp/pptp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c index e1fabb3e3246..acccb747aeda 100644 --- a/drivers/net/ppp/pptp.c +++ b/drivers/net/ppp/pptp.c @@ -155,7 +155,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) opt->dst_addr.sin_addr.s_addr, opt->src_addr.sin_addr.s_addr, 0, 0, IPPROTO_GRE, - RT_TOS(0), 0); + RT_TOS(0), sk->sk_bound_dev_if); if (IS_ERR(rt)) goto tx_error; @@ -444,7 +444,8 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, opt->dst_addr.sin_addr.s_addr, opt->src_addr.sin_addr.s_addr, 0, 0, - IPPROTO_GRE, RT_CONN_FLAGS(sk), 0); + IPPROTO_GRE, RT_CONN_FLAGS(sk), + sk->sk_bound_dev_if); if (IS_ERR(rt)) { error = -EHOSTUNREACH; goto end; |