diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-02-25 17:15:09 +0000 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-02-28 10:54:38 +0000 |
| commit | 44ef97148d2d0717237409de963d244cea0c3adf (patch) | |
| tree | d56a2ab8b9e6c933a2ab94d9c2aa4f2fc422a361 /mullvad-daemon/src | |
| parent | 94efa3bd621ede90485a5e5a9e8da933495ca2af (diff) | |
| download | mullvadvpn-44ef97148d2d0717237409de963d244cea0c3adf.tar.xz mullvadvpn-44ef97148d2d0717237409de963d244cea0c3adf.zip | |
Add {v4,v6}_gateway fields to TunnelMetadata
Diffstat (limited to 'mullvad-daemon/src')
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 9 | ||||
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index 07d7cd3e4f..6e2bdd4a79 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -391,7 +391,11 @@ impl Daemon { generic_options: tunnel_options.generic, } .into()), - MullvadEndpoint::Wireguard { peer, gateway } => { + MullvadEndpoint::Wireguard { + peer, + ipv4_gateway, + ipv6_gateway, + } => { let wg_data = self .account_history .get(&account_token)? @@ -408,7 +412,8 @@ impl Daemon { connection: wireguard::ConnectionConfig { tunnel, peer, - gateway, + ipv4_gateway, + ipv6_gateway: Some(ipv6_gateway), }, options: tunnel_options.wireguard, generic_options: tunnel_options.generic, diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index 68c7c4bb11..b38ba42cfc 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -423,7 +423,8 @@ impl RelaySelector { }; Some(MullvadEndpoint::Wireguard { peer: peer_config, - gateway: data.ipv4_gateway.into(), + ipv4_gateway: data.ipv4_gateway, + ipv6_gateway: data.ipv6_gateway, }) } |