diff options
| author | Michael Biebl <biebl@debian.org> | 2025-02-12 13:46:50 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2025-02-12 13:46:50 +0100 |
| commit | 8bdf070ff046f482f6eb5e2b15ebc216f5d1e3da (patch) | |
| tree | f706478d189d54c6532e8863d4b0d5ff5575af60 /src/core/ppp | |
| parent | 818258cf34b83fbc754633295e1052d4752d7b15 (diff) | |
New upstream version 1.51.90 upstream/1.51.90
Diffstat (limited to 'src/core/ppp')
| -rw-r--r-- | src/core/ppp/nm-ppp-manager.c | 6 | ||||
| -rw-r--r-- | src/core/ppp/nm-ppp-mgr.c | 6 | ||||
| -rw-r--r-- | src/core/ppp/nm-pppd-compat.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/core/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c index fbc5d075..2eebd17d 100644 --- a/src/core/ppp/nm-ppp-manager.c +++ b/src/core/ppp/nm-ppp-manager.c @@ -547,7 +547,7 @@ impl_ppp_manager_set_ip4_config(NMDBusObject *obj, nm_l3_config_data_set_mtu(l3cd, mtu); - address = (NMPlatformIP4Address){ + address = (NMPlatformIP4Address) { .plen = 32, }; @@ -583,7 +583,7 @@ impl_ppp_manager_set_ip4_config(NMDBusObject *obj, if (g_variant_lookup(config_dict, NM_PPP_IP4_CONFIG_DNS, "au", &iter)) { while (g_variant_iter_next(iter, "u", &u32)) - nm_l3_config_data_add_nameserver_detail(l3cd, AF_INET, &u32, NULL); + nm_l3_config_data_add_nameserver_addr(l3cd, AF_INET, &u32); g_variant_iter_free(iter); } @@ -662,7 +662,7 @@ impl_ppp_manager_set_ip6_config(NMDBusObject *obj, nm_l3_config_data_set_mtu(l3cd, mtu); - address = (NMPlatformIP6Address){ + address = (NMPlatformIP6Address) { .plen = 64, .addr_source = NM_IP_CONFIG_SOURCE_PPP, }; diff --git a/src/core/ppp/nm-ppp-mgr.c b/src/core/ppp/nm-ppp-mgr.c index 91d9a021..9f6e8835 100644 --- a/src/core/ppp/nm-ppp-mgr.c +++ b/src/core/ppp/nm-ppp-mgr.c @@ -208,11 +208,11 @@ _set_state_failed(NMPppMgr *self, NMPppMgrState state, NMPppMgrState *out_old_st self->ifindex = 0; nm_clear_l3cd(&self->ip_data_4.l3cd); nm_clear_l3cd(&self->ip_data_6.l3cd); - self->ip_data_4 = (NMPppMgrIPData){ + self->ip_data_4 = (NMPppMgrIPData) { .ip_received = FALSE, .ip_enabled = FALSE, }; - self->ip_data_6 = (NMPppMgrIPData){ + self->ip_data_6 = (NMPppMgrIPData) { .ip_received = FALSE, .ip_enabled = FALSE, }; @@ -563,7 +563,7 @@ nm_ppp_mgr_start(const NMPppMgrConfig *config, GError **error) self = g_slice_new(NMPppMgr); - *self = (NMPppMgr){ + *self = (NMPppMgr) { .config = *config, .ppp_manager = ppp_manager, .idle_start = nm_g_idle_add_source(_idle_start_cb, self), diff --git a/src/core/ppp/nm-pppd-compat.c b/src/core/ppp/nm-pppd-compat.c index 04e26f22..c1416023 100644 --- a/src/core/ppp/nm-pppd-compat.c +++ b/src/core/ppp/nm-pppd-compat.c @@ -164,14 +164,14 @@ nm_pppd_compat_get_ipcp_options(NMPppdCompatIPCPOptions *out_got, NMPppdCompatIP nm_assert(out_got); nm_assert(out_his); - *out_got = (NMPppdCompatIPCPOptions){ + *out_got = (NMPppdCompatIPCPOptions) { .ouraddr = got->ouraddr, .hisaddr = got->hisaddr, .dnsaddr = {got->dnsaddr[0], got->dnsaddr[1]}, .winsaddr = {got->winsaddr[0], got->winsaddr[1]}, }; - *out_his = (NMPppdCompatIPCPOptions){ + *out_his = (NMPppdCompatIPCPOptions) { .ouraddr = his->ouraddr, .hisaddr = his->hisaddr, .dnsaddr = {his->dnsaddr[0], his->dnsaddr[1]}, @@ -191,11 +191,11 @@ nm_pppd_compat_get_ipv6cp_options(NMPppdCompatIPV6CPOptions *out_got, nm_assert(out_got); nm_assert(out_his); - *out_got = (NMPppdCompatIPV6CPOptions){}; + *out_got = (NMPppdCompatIPV6CPOptions) {}; memcpy(&out_got->ourid, &got->ourid, sizeof(guint64)); memcpy(&out_got->hisid, &got->hisid, sizeof(guint64)); - *out_his = (NMPppdCompatIPV6CPOptions){}; + *out_his = (NMPppdCompatIPV6CPOptions) {}; memcpy(&out_his->ourid, &his->ourid, sizeof(guint64)); memcpy(&out_his->hisid, &his->hisid, sizeof(guint64)); } |