fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-28 07:30:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppp: merge branch 'ppp-ip6-dns'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1254

(cherry picked from commit 31d7131126)

(cherry picked from commit 0c89c3a7bd)
This commit is contained in:
Beniamino Galvani 2022-06-09 16:22:47 +02:00
commit e7ad8a8b42
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/ppp/nm-ppp-manager.c
View file

@ -642,6 +642,7 @@ impl_ppp_manager_set_ip6_config(NMDBusObject *obj,
nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL;
NMPlatformIP6Address address;
struct in6_addr a;
guint32 mtu;
NMUtilsIPv6IfaceId iid = NM_UTILS_IPV6_IFACE_ID_INIT;
gboolean has_peer = FALSE;
gs_unref_variant GVariant *config_dict = NULL;
@ -652,13 +653,16 @@ impl_ppp_manager_set_ip6_config(NMDBusObject *obj,
nm_clear_g_source(&priv->ppp_timeout_handler);
if (!set_ip_config_common(self, config_dict, NULL))
if (!set_ip_config_common(self, config_dict, &mtu))
goto out;
l3cd = nm_l3_config_data_new(nm_platform_get_multi_idx(NM_PLATFORM_GET),
priv->ifindex,
NM_IP_CONFIG_SOURCE_PPP);
nm_l3_config_data_set_mtu(l3cd, mtu);
nm_l3_config_data_set_dns_priority(l3cd, AF_INET6, 0);
address = (NMPlatformIP6Address){
.plen = 64,
.addr_source = NM_IP_CONFIG_SOURCE_PPP,