diff options
Diffstat (limited to 'src/nm-ip4-config.c')
| -rw-r--r-- | src/nm-ip4-config.c | 199 |
1 files changed, 170 insertions, 29 deletions
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 6ae81b57..573c479a 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -278,10 +278,12 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMIP4Config, PROP_ROUTE_DATA, PROP_ROUTES, PROP_GATEWAY, + PROP_NAMESERVER_DATA, PROP_NAMESERVERS, PROP_DOMAINS, PROP_SEARCHES, PROP_DNS_OPTIONS, + PROP_WINS_SERVER_DATA, PROP_WINS_SERVERS, PROP_DNS_PRIORITY, ); @@ -291,8 +293,9 @@ typedef struct { guint32 mtu; int ifindex; NMIPConfigSource mtu_source; - gint dns_priority; + int dns_priority; NMSettingConnectionMdns mdns; + NMSettingConnectionLlmnr llmnr; GArray *nameservers; GPtrArray *domains; GPtrArray *searches; @@ -509,8 +512,8 @@ _notify_addresses (NMIP4Config *self) nm_clear_g_variant (&priv->address_data_variant); nm_clear_g_variant (&priv->addresses_variant); - _notify (self, PROP_ADDRESS_DATA); - _notify (self, PROP_ADDRESSES); + nm_gobject_notify_together (self, PROP_ADDRESS_DATA, + PROP_ADDRESSES); } static void @@ -521,13 +524,13 @@ _notify_routes (NMIP4Config *self) nm_assert (priv->best_default_route == _nm_ip4_config_best_default_route_find (self)); nm_clear_g_variant (&priv->route_data_variant); nm_clear_g_variant (&priv->routes_variant); - _notify (self, PROP_ROUTE_DATA); - _notify (self, PROP_ROUTES); + nm_gobject_notify_together (self, PROP_ROUTE_DATA, + PROP_ROUTES); } /*****************************************************************************/ -static gint +static int _addresses_sort_cmp_get_prio (in_addr_t addr) { if (nm_utils_ip4_address_is_link_local (addr)) @@ -538,7 +541,7 @@ _addresses_sort_cmp_get_prio (in_addr_t addr) static int _addresses_sort_cmp (gconstpointer a, gconstpointer b, gpointer user_data) { - gint p1, p2; + int p1, p2; const NMPlatformIP4Address *a1 = NMP_OBJECT_CAST_IP4_ADDRESS (*((const NMPObject **) a)); const NMPlatformIP4Address *a2 = NMP_OBJECT_CAST_IP4_ADDRESS (*((const NMPObject **) b)); guint32 n1, n2; @@ -646,6 +649,37 @@ nm_ip4_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int i } void +nm_ip4_config_update_routes_metric (NMIP4Config *self, gint64 metric) +{ + gs_free NMPlatformIP4Route *routes = NULL; + gboolean need_update = FALSE; + const NMPlatformIP4Route *r; + NMDedupMultiIter iter; + guint num = 0, i = 0; + + nm_ip_config_iter_ip4_route_for_each (&iter, self, &r) { + if (r->metric != metric) + need_update = TRUE; + num++; + } + if (!need_update) + return; + + routes = g_new (NMPlatformIP4Route, num); + nm_ip_config_iter_ip4_route_for_each (&iter, self, &r) { + routes[i] = *r; + routes[i].metric = metric; + i++; + } + + g_object_freeze_notify (G_OBJECT (self)); + nm_ip4_config_reset_routes (self); + for (i = 0; i < num; i++) + nm_ip4_config_add_route (self, &routes[i], NULL); + g_object_thaw_notify (G_OBJECT (self)); +} + +void nm_ip4_config_add_dependent_routes (NMIP4Config *self, guint32 route_table, guint32 route_metric, @@ -883,6 +917,7 @@ void nm_ip4_config_merge_setting (NMIP4Config *self, NMSettingIPConfig *setting, NMSettingConnectionMdns mdns, + NMSettingConnectionLlmnr llmnr, guint32 route_table, guint32 route_metric) { @@ -1000,6 +1035,7 @@ nm_ip4_config_merge_setting (NMIP4Config *self, nm_ip4_config_set_dns_priority (self, priority); nm_ip4_config_mdns_set (self, mdns); + nm_ip4_config_llmnr_set (self, llmnr); g_object_thaw_notify (G_OBJECT (self)); } @@ -1220,6 +1256,10 @@ nm_ip4_config_merge (NMIP4Config *dst, nm_ip4_config_mdns_set (dst, NM_MAX (nm_ip4_config_mdns_get (src), nm_ip4_config_mdns_get (dst))); + /* LLMNR */ + nm_ip4_config_llmnr_set (dst, + NM_MAX (nm_ip4_config_llmnr_get (src), + nm_ip4_config_llmnr_get (dst))); g_object_thaw_notify (G_OBJECT (dst)); } @@ -1336,7 +1376,7 @@ nm_ip4_config_subtract (NMIP4Config *dst, { NMIP4ConfigPrivate *dst_priv; guint i; - gint idx; + int idx; const NMPlatformIP4Address *a; const NMPlatformIP4Route *r; NMDedupMultiIter ipconf_iter; @@ -1461,6 +1501,10 @@ nm_ip4_config_subtract (NMIP4Config *dst, if (nm_ip4_config_mdns_get (src) == nm_ip4_config_mdns_get (dst)) nm_ip4_config_mdns_set (dst, NM_SETTING_CONNECTION_MDNS_DEFAULT); + /* LLMNR */ + if (nm_ip4_config_llmnr_get (src) == nm_ip4_config_llmnr_get (dst)) + nm_ip4_config_llmnr_set (dst, NM_SETTING_CONNECTION_LLMNR_DEFAULT); + g_object_thaw_notify (G_OBJECT (dst)); } @@ -1562,6 +1606,7 @@ _nm_ip4_config_intersect_helper (NMIP4Config *dst, /* ignore NIS */ /* ignore WINS */ /* ignore mdns */ + /* ignore LLMNR */ if (update_dst) g_object_thaw_notify (G_OBJECT (dst)); @@ -1840,7 +1885,15 @@ nm_ip4_config_replace (NMIP4Config *dst, const NMIP4Config *src, gboolean *relev has_relevant_changes = TRUE; } - dst_priv->mdns = src_priv->mdns; + if (src_priv->mdns != dst_priv->mdns) { + dst_priv->mdns = src_priv->mdns; + has_relevant_changes = TRUE; + } + + if (src_priv->llmnr != dst_priv->llmnr) { + dst_priv->llmnr = src_priv->llmnr; + has_relevant_changes = TRUE; + } /* DNS priority */ if (src_priv->dns_priority != dst_priv->dns_priority) { @@ -2276,7 +2329,8 @@ nm_ip4_config_reset_nameservers (NMIP4Config *self) if (priv->nameservers->len != 0) { g_array_set_size (priv->nameservers, 0); - _notify (self, PROP_NAMESERVERS); + nm_gobject_notify_together (self, PROP_NAMESERVER_DATA, + PROP_NAMESERVERS); } } @@ -2293,7 +2347,8 @@ nm_ip4_config_add_nameserver (NMIP4Config *self, guint32 new) return; g_array_append_val (priv->nameservers, new); - _notify (self, PROP_NAMESERVERS); + nm_gobject_notify_together (self, PROP_NAMESERVER_DATA, + PROP_NAMESERVERS); } void @@ -2304,7 +2359,8 @@ nm_ip4_config_del_nameserver (NMIP4Config *self, guint i) g_return_if_fail (i < priv->nameservers->len); g_array_remove_index (priv->nameservers, i); - _notify (self, PROP_NAMESERVERS); + nm_gobject_notify_together (self, PROP_NAMESERVER_DATA, + PROP_NAMESERVERS); } guint @@ -2526,10 +2582,23 @@ nm_ip4_config_mdns_set (NMIP4Config *self, NM_IP4_CONFIG_GET_PRIVATE (self)->mdns = mdns; } +NMSettingConnectionLlmnr +nm_ip4_config_llmnr_get (const NMIP4Config *self) +{ + return NM_IP4_CONFIG_GET_PRIVATE (self)->llmnr; +} + +void +nm_ip4_config_llmnr_set (NMIP4Config *self, + NMSettingConnectionLlmnr llmnr) +{ + NM_IP4_CONFIG_GET_PRIVATE (self)->llmnr = llmnr; +} + /*****************************************************************************/ void -nm_ip4_config_set_dns_priority (NMIP4Config *self, gint priority) +nm_ip4_config_set_dns_priority (NMIP4Config *self, int priority) { NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self); @@ -2539,7 +2608,7 @@ nm_ip4_config_set_dns_priority (NMIP4Config *self, gint priority) } } -gint +int nm_ip4_config_get_dns_priority (const NMIP4Config *self) { const NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self); @@ -2622,7 +2691,8 @@ nm_ip4_config_reset_wins (NMIP4Config *self) if (priv->wins->len != 0) { g_array_set_size (priv->wins, 0); - _notify (self, PROP_WINS_SERVERS); + nm_gobject_notify_together (self, PROP_WINS_SERVER_DATA, + PROP_WINS_SERVERS); } } @@ -2639,7 +2709,8 @@ nm_ip4_config_add_wins (NMIP4Config *self, guint32 wins) return; g_array_append_val (priv->wins, wins); - _notify (self, PROP_WINS_SERVERS); + nm_gobject_notify_together (self, PROP_WINS_SERVER_DATA, + PROP_WINS_SERVERS); } void @@ -2650,7 +2721,8 @@ nm_ip4_config_del_wins (NMIP4Config *self, guint i) g_return_if_fail (i < priv->wins->len); g_array_remove_index (priv->wins, i); - _notify (self, PROP_WINS_SERVERS); + nm_gobject_notify_together (self, PROP_WINS_SERVER_DATA, + PROP_WINS_SERVERS); } guint @@ -2812,6 +2884,7 @@ nm_ip4_config_hash (const NMIP4Config *self, GChecksum *sum, gboolean dns_only) NMDedupMultiIter ipconf_iter; const NMPlatformIP4Address *address; const NMPlatformIP4Route *route; + int val; g_return_if_fail (self); g_return_if_fail (sum); @@ -2858,6 +2931,25 @@ nm_ip4_config_hash (const NMIP4Config *self, GChecksum *sum, gboolean dns_only) s = nm_ip4_config_get_dns_option (self, i); g_checksum_update (sum, (const guint8 *) s, strlen (s)); } + + val = nm_ip4_config_mdns_get (self); + if (val != NM_SETTING_CONNECTION_MDNS_DEFAULT) + g_checksum_update (sum, (const guint8 *) &val, sizeof (val)); + + val = nm_ip4_config_llmnr_get (self); + if (val != NM_SETTING_CONNECTION_LLMNR_DEFAULT) + g_checksum_update (sum, (const guint8 *) &val, sizeof (val)); + + /* FIXME(ip-config-checksum): the DNS priority should be considered relevant + * and added into the checksum as well, but this can't be done right now + * because in the DNS manager we rely on the fact that an empty + * configuration (i.e. just created) has a zero checksum. This is needed to + * avoid rewriting resolv.conf when there is no change. + * + * The DNS priority initial value depends on the connection type (VPN or + * not), so it's a bit difficult to add it to checksum maintaining the + * assumption of checksum(empty)=0 + */ } /** @@ -2913,6 +3005,7 @@ get_property (GObject *object, guint prop_id, NMDedupMultiIter ipconf_iter; const NMPlatformIP4Route *route; GVariantBuilder builder_data, builder_legacy; + guint i; switch (prop_id) { case PROP_IFINDEX: @@ -2931,7 +3024,7 @@ get_property (GObject *object, guint prop_id, head_entry = nm_ip4_config_lookup_addresses (self); if (head_entry) { gs_free const NMPObject **addresses = NULL; - guint naddr, i; + guint naddr; addresses = (const NMPObject **) nm_dedup_multi_objs_to_array_head (head_entry, NULL, NULL, &naddr); nm_assert (addresses && naddr); @@ -3067,6 +3160,26 @@ out_routes_cached: } else g_value_set_string (value, NULL); break; + case PROP_NAMESERVER_DATA: + g_variant_builder_init (&builder_data, G_VARIANT_TYPE ("aa{sv}")); + + for (i = 0; i < priv->nameservers->len; i++) { + GVariantBuilder nested_builder; + char addr_str[NM_UTILS_INET_ADDRSTRLEN]; + + nm_utils_inet4_ntop (g_array_index (priv->nameservers, in_addr_t, i), + addr_str); + + g_variant_builder_init (&nested_builder, G_VARIANT_TYPE ("a{sv}")); + g_variant_builder_add (&nested_builder, "{sv}", + "address", + g_variant_new_string (addr_str)); + g_variant_builder_add (&builder_data, "a{sv}", &nested_builder); + } + + g_value_take_variant (value, + g_variant_builder_end (&builder_data)); + break; case PROP_NAMESERVERS: g_value_take_variant (value, g_variant_new_fixed_array (G_VARIANT_TYPE_UINT32, @@ -3086,6 +3199,19 @@ out_routes_cached: case PROP_DNS_PRIORITY: g_value_set_int (value, priv->dns_priority); break; + case PROP_WINS_SERVER_DATA: + g_variant_builder_init (&builder_data, G_VARIANT_TYPE ("as")); + for (i = 0; i < priv->wins->len; i++) { + char addr_str[NM_UTILS_INET_ADDRSTRLEN]; + + g_variant_builder_add (&builder_data, + "s", + nm_utils_inet4_ntop (g_array_index (priv->wins, in_addr_t, i), + addr_str)); + } + g_value_take_variant (value, + g_variant_builder_end (&builder_data)); + break; case PROP_WINS_SERVERS: g_value_take_variant (value, g_variant_new_fixed_array (G_VARIANT_TYPE_UINT32, @@ -3139,6 +3265,7 @@ nm_ip4_config_init (NMIP4Config *self) NMP_OBJECT_TYPE_IP4_ROUTE); priv->mdns = NM_SETTING_CONNECTION_MDNS_DEFAULT; + priv->llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT; priv->nameservers = g_array_new (FALSE, FALSE, sizeof (guint32)); priv->domains = g_ptr_array_new_with_free_func (g_free); priv->searches = g_ptr_array_new_with_free_func (g_free); @@ -3193,17 +3320,19 @@ static const NMDBusInterfaceInfoExtended interface_info_ip4_config = { &nm_signal_info_property_changed_legacy, ), .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS ( - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Addresses", "aau", NM_IP4_CONFIG_ADDRESSES), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("AddressData", "aa{sv}", NM_IP4_CONFIG_ADDRESS_DATA), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Gateway", "s", NM_IP4_CONFIG_GATEWAY), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Routes", "aau", NM_IP4_CONFIG_ROUTES), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("RouteData", "aa{sv}", NM_IP4_CONFIG_ROUTE_DATA), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Nameservers", "au", NM_IP4_CONFIG_NAMESERVERS), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Domains", "as", NM_IP4_CONFIG_DOMAINS), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Searches", "as", NM_IP4_CONFIG_SEARCHES), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("DnsOptions", "as", NM_IP4_CONFIG_DNS_OPTIONS), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("DnsPriority", "i", NM_IP4_CONFIG_DNS_PRIORITY), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("WinsServers", "au", NM_IP4_CONFIG_WINS_SERVERS), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Addresses", "aau", NM_IP4_CONFIG_ADDRESSES), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("AddressData", "aa{sv}", NM_IP4_CONFIG_ADDRESS_DATA), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Gateway", "s", NM_IP4_CONFIG_GATEWAY), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Routes", "aau", NM_IP4_CONFIG_ROUTES), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("RouteData", "aa{sv}", NM_IP4_CONFIG_ROUTE_DATA), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("NameserverData", "aa{sv}", NM_IP4_CONFIG_NAMESERVER_DATA), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Nameservers", "au", NM_IP4_CONFIG_NAMESERVERS), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Domains", "as", NM_IP4_CONFIG_DOMAINS), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Searches", "as", NM_IP4_CONFIG_SEARCHES), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("DnsOptions", "as", NM_IP4_CONFIG_DNS_OPTIONS), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("DnsPriority", "i", NM_IP4_CONFIG_DNS_PRIORITY), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("WinsServerData", "as", NM_IP4_CONFIG_WINS_SERVER_DATA), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("WinsServers", "au", NM_IP4_CONFIG_WINS_SERVERS), ), ), .legacy_property_changed = TRUE, @@ -3262,6 +3391,12 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + obj_properties[PROP_NAMESERVER_DATA] = + g_param_spec_variant (NM_IP4_CONFIG_NAMESERVER_DATA, "", "", + G_VARIANT_TYPE ("aa{sv}"), + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); obj_properties[PROP_NAMESERVERS] = g_param_spec_variant (NM_IP4_CONFIG_NAMESERVERS, "", "", G_VARIANT_TYPE ("au"), @@ -3288,6 +3423,12 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) G_MININT32, G_MAXINT32, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + obj_properties[PROP_WINS_SERVER_DATA] = + g_param_spec_variant (NM_IP4_CONFIG_WINS_SERVER_DATA, "", "", + G_VARIANT_TYPE ("as"), + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); obj_properties[PROP_WINS_SERVERS] = g_param_spec_variant (NM_IP4_CONFIG_WINS_SERVERS, "", "", G_VARIANT_TYPE ("au"), |