diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-23 21:53:04 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-11-27 14:04:11 +0100 |
| commit | 10a46c5ae2a488dc933d2e4a510bfb5d033f72bb (patch) | |
| tree | 0263d7cf8a273fb7787b3748ee31d73b2ecdfbf9 /src/nm-policy.c | |
| parent | 3a907377ac360325e8dea3f5ff864ce55a4950c1 (diff) | |
| download | NetworkManager-10a46c5ae2a488dc933d2e4a510bfb5d033f72bb.tar.gz | |
core: merge IPv4 and IPv6 versions of nm_active_connection_get_default()
Diffstat (limited to 'src/nm-policy.c')
| -rw-r--r-- | src/nm-policy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c index c65e6d3a4a..71415c4ffa 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -819,8 +819,8 @@ update_system_hostname (NMPolicy *self, const char *msg) static void update_default_ac (NMPolicy *self, - NMActiveConnection *best, - void (*set_active_func)(NMActiveConnection*, gboolean)) + int addr_family, + NMActiveConnection *best) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self); const CList *tmp_list; @@ -832,12 +832,12 @@ update_default_ac (NMPolicy *self, */ nm_manager_for_each_active_connection (priv->manager, ac, tmp_list) { if (ac != best) - set_active_func (ac, FALSE); + nm_active_connection_set_default (ac, addr_family, FALSE); } /* Mark new default active connection */ if (best) - set_active_func (best, TRUE); + nm_active_connection_set_default (best, addr_family, TRUE); } static gpointer @@ -959,7 +959,7 @@ update_ip4_routing (NMPolicy *self, gboolean force_update) if (vpn) best = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (vpn)); - update_default_ac (self, best_ac, nm_active_connection_set_default); + update_default_ac (self, AF_INET, best_ac); if (!nm_g_object_ref_set (&priv->default_device4, best)) return; @@ -1042,7 +1042,7 @@ update_ip6_routing (NMPolicy *self, gboolean force_update) if (vpn) best = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (vpn)); - update_default_ac (self, best_ac, nm_active_connection_set_default6); + update_default_ac (self, AF_INET6, best_ac); if (!nm_g_object_ref_set (&priv->default_device6, best)) return; |