colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: merge branch 'th/libnm-strv-props-2'

Browse Source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1788
This commit is contained in:
Thomas Haller
2023-11-16 08:33:47 +01:00
parent 339f99c08e 8079e8969d
commit d57a47adec
6 changed files with 207 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libnm-core-impl/nm-setting-connection.c
View File

@@ -881,10 +881,9 @@ nm_setting_connection_add_secondary(NMSettingConnection *setting, const char *se
priv = NM_SETTING_CONNECTION_GET_PRIVATE(setting); priv = NM_SETTING_CONNECTION_GET_PRIVATE(setting);
if (nm_strvarray_find_first(priv->secondaries.arr, sec_uuid) >= 0) if (!nm_strvarray_ensure_and_add_unique(&priv->secondaries.arr, sec_uuid))
return FALSE; return FALSE;
nm_strvarray_add(nm_strvarray_ensure(&priv->secondaries.arr), sec_uuid);
_notify(setting, PROP_SECONDARIES); _notify(setting, PROP_SECONDARIES);
return TRUE; return TRUE;
} }
@@ -907,7 +906,7 @@ nm_setting_connection_remove_secondary(NMSettingConnection *setting, guint32 idx
g_return_if_fail(idx < nm_g_array_len(priv->secondaries.arr)); g_return_if_fail(idx < nm_g_array_len(priv->secondaries.arr));
g_array_remove_index(priv->secondaries.arr, idx); nm_strvarray_remove_index(priv->secondaries.arr, idx);
_notify(setting, PROP_SECONDARIES); _notify(setting, PROP_SECONDARIES);
} }
@@ -930,11 +929,11 @@ nm_setting_connection_remove_secondary_by_value(NMSettingConnection *setting, co
priv = NM_SETTING_CONNECTION_GET_PRIVATE(setting); priv = NM_SETTING_CONNECTION_GET_PRIVATE(setting);
if (nm_strvarray_remove_first(priv->secondaries.arr, sec_uuid)) { if (!nm_strvarray_remove_first(priv->secondaries.arr, sec_uuid))
_notify(setting, PROP_SECONDARIES); return FALSE;
return TRUE;
} _notify(setting, PROP_SECONDARIES);
return FALSE; return TRUE;
} }
/** /**

122
src/libnm-core-impl/nm-setting-ip-config.c
View File

@@ -4231,7 +4231,7 @@ nm_setting_ip_config_get_num_dns_searches(NMSettingIPConfig *setting)
{ {
g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), 0); g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), 0);
return NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dns_search->len; return nm_g_array_len(NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dns_search.arr);
} }
/** /**
@@ -4239,19 +4239,18 @@ nm_setting_ip_config_get_num_dns_searches(NMSettingIPConfig *setting)
* @setting: the #NMSettingIPConfig * @setting: the #NMSettingIPConfig
* @idx: index number of the DNS search domain to return * @idx: index number of the DNS search domain to return
* *
* Since 1.46, access at index "len" is allowed and returns NULL.
*
* Returns: the DNS search domain at index @idx * Returns: the DNS search domain at index @idx
**/ **/
const char * const char *
nm_setting_ip_config_get_dns_search(NMSettingIPConfig *setting, int idx) nm_setting_ip_config_get_dns_search(NMSettingIPConfig *setting, int idx)
{ {
NMSettingIPConfigPrivate *priv;
g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), NULL); g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), NULL);
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting); return nm_strvarray_get_idxnull_or_greturn(
g_return_val_if_fail(idx >= 0 && idx < priv->dns_search->len, NULL); NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dns_search.arr,
idx);
return priv->dns_search->pdata[idx];
} }
/** /**
@@ -4268,19 +4267,16 @@ gboolean
nm_setting_ip_config_add_dns_search(NMSettingIPConfig *setting, const char *dns_search) nm_setting_ip_config_add_dns_search(NMSettingIPConfig *setting, const char *dns_search)
{ {
NMSettingIPConfigPrivate *priv; NMSettingIPConfigPrivate *priv;
guint i;
g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), FALSE); g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), FALSE);
g_return_val_if_fail(dns_search != NULL, FALSE); g_return_val_if_fail(dns_search != NULL, FALSE);
g_return_val_if_fail(dns_search[0] != '\0', FALSE); g_return_val_if_fail(dns_search[0] != '\0', FALSE);
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting); priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting);
for (i = 0; i < priv->dns_search->len; i++) {
if (!strcmp(dns_search, priv->dns_search->pdata[i]))
return FALSE;
}
g_ptr_array_add(priv->dns_search, g_strdup(dns_search)); if (!nm_strvarray_ensure_and_add_unique(&priv->dns_search.arr, dns_search))
return FALSE;
_notify(setting, PROP_DNS_SEARCH); _notify(setting, PROP_DNS_SEARCH);
return TRUE; return TRUE;
} }
@@ -4300,9 +4296,10 @@ nm_setting_ip_config_remove_dns_search(NMSettingIPConfig *setting, int idx)
g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting)); g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting));
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting); priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting);
g_return_if_fail(idx >= 0 && idx < priv->dns_search->len);
g_ptr_array_remove_index(priv->dns_search, idx); g_return_if_fail(idx >= 0 && idx < nm_g_array_len(priv->dns_search.arr));
nm_strvarray_remove_index(priv->dns_search.arr, idx);
_notify(setting, PROP_DNS_SEARCH); _notify(setting, PROP_DNS_SEARCH);
} }
@@ -4319,21 +4316,18 @@ gboolean
nm_setting_ip_config_remove_dns_search_by_value(NMSettingIPConfig *setting, const char *dns_search) nm_setting_ip_config_remove_dns_search_by_value(NMSettingIPConfig *setting, const char *dns_search)
{ {
NMSettingIPConfigPrivate *priv; NMSettingIPConfigPrivate *priv;
guint i;
g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), FALSE); g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), FALSE);
g_return_val_if_fail(dns_search != NULL, FALSE); g_return_val_if_fail(dns_search != NULL, FALSE);
g_return_val_if_fail(dns_search[0] != '\0', FALSE); g_return_val_if_fail(dns_search[0] != '\0', FALSE);
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting); priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting);
for (i = 0; i < priv->dns_search->len; i++) {
if (!strcmp(dns_search, priv->dns_search->pdata[i])) { if (!nm_strvarray_remove_first(priv->dns_search.arr, dns_search))
g_ptr_array_remove_index(priv->dns_search, i); return FALSE;
_notify(setting, PROP_DNS_SEARCH);
return TRUE; _notify(setting, PROP_DNS_SEARCH);
} return TRUE;
}
return FALSE;
} }
/** /**
@@ -4345,16 +4339,10 @@ nm_setting_ip_config_remove_dns_search_by_value(NMSettingIPConfig *setting, cons
void void
nm_setting_ip_config_clear_dns_searches(NMSettingIPConfig *setting) nm_setting_ip_config_clear_dns_searches(NMSettingIPConfig *setting)
{ {
NMSettingIPConfigPrivate *priv;
g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting)); g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting));
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting); if (nm_strvarray_clear(&NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dns_search.arr))
if (priv->dns_search->len != 0) {
g_ptr_array_set_size(priv->dns_search, 0);
_notify(setting, PROP_DNS_SEARCH); _notify(setting, PROP_DNS_SEARCH);
}
} }
/** /**
@@ -5363,8 +5351,10 @@ const char *const *
nm_setting_ip_config_get_dhcp_reject_servers(NMSettingIPConfig *setting, guint *out_len) nm_setting_ip_config_get_dhcp_reject_servers(NMSettingIPConfig *setting, guint *out_len)
{ {
g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), NULL); g_return_val_if_fail(NM_IS_SETTING_IP_CONFIG(setting), NULL);
return nm_strvarray_get_strv(&NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dhcp_reject_servers,
out_len); return nm_strvarray_get_strv(
&NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dhcp_reject_servers.arr,
out_len);
} }
/** /**
@@ -5379,13 +5369,11 @@ nm_setting_ip_config_get_dhcp_reject_servers(NMSettingIPConfig *setting, guint *
void void
nm_setting_ip_config_add_dhcp_reject_server(NMSettingIPConfig *setting, const char *server) nm_setting_ip_config_add_dhcp_reject_server(NMSettingIPConfig *setting, const char *server)
{ {
NMSettingIPConfigPrivate *priv;
g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting)); g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting));
g_return_if_fail(server != NULL); g_return_if_fail(server);
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting);
nm_strvarray_add(nm_strvarray_ensure(&priv->dhcp_reject_servers), server); nm_strvarray_ensure_and_add(&NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dhcp_reject_servers.arr,
server);
_notify(setting, PROP_DHCP_REJECT_SERVERS); _notify(setting, PROP_DHCP_REJECT_SERVERS);
} }
@@ -5404,10 +5392,12 @@ nm_setting_ip_config_remove_dhcp_reject_server(NMSettingIPConfig *setting, guint
NMSettingIPConfigPrivate *priv; NMSettingIPConfigPrivate *priv;
g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting)); g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting));
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting);
g_return_if_fail(priv->dhcp_reject_servers && idx < priv->dhcp_reject_servers->len);
g_array_remove_index(priv->dhcp_reject_servers, idx); priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting);
g_return_if_fail(idx < nm_g_array_len(priv->dhcp_reject_servers.arr));
nm_strvarray_remove_index(priv->dhcp_reject_servers.arr, idx);
_notify(setting, PROP_DHCP_REJECT_SERVERS); _notify(setting, PROP_DHCP_REJECT_SERVERS);
} }
@@ -5422,15 +5412,10 @@ nm_setting_ip_config_remove_dhcp_reject_server(NMSettingIPConfig *setting, guint
void void
nm_setting_ip_config_clear_dhcp_reject_servers(NMSettingIPConfig *setting) nm_setting_ip_config_clear_dhcp_reject_servers(NMSettingIPConfig *setting)
{ {
NMSettingIPConfigPrivate *priv;
g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting)); g_return_if_fail(NM_IS_SETTING_IP_CONFIG(setting));
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(setting); if (nm_strvarray_clear(&NM_SETTING_IP_CONFIG_GET_PRIVATE(setting)->dhcp_reject_servers.arr))
if (nm_g_array_len(priv->dhcp_reject_servers) != 0) {
nm_clear_pointer(&priv->dhcp_reject_servers, g_array_unref);
_notify(setting, PROP_DHCP_REJECT_SERVERS); _notify(setting, PROP_DHCP_REJECT_SERVERS);
}
} }
/** /**
@@ -5720,7 +5705,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
} }
/* Validate reject servers */ /* Validate reject servers */
if (priv->dhcp_reject_servers && priv->dhcp_reject_servers->len != 0) { if (priv->dhcp_reject_servers.arr && priv->dhcp_reject_servers.arr->len > 0) {
if (NM_SETTING_IP_CONFIG_GET_ADDR_FAMILY(setting) != AF_INET) { if (NM_SETTING_IP_CONFIG_GET_ADDR_FAMILY(setting) != AF_INET) {
g_set_error_literal(error, g_set_error_literal(error,
NM_CONNECTION_ERROR, NM_CONNECTION_ERROR,
@@ -5733,17 +5718,17 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
return FALSE; return FALSE;
} }
for (i = 0; i < priv->dhcp_reject_servers->len; i++) { for (i = 0; i < priv->dhcp_reject_servers.arr->len; i++) {
if (!nm_inet_parse_with_prefix_str( if (!nm_inet_parse_with_prefix_str(
NM_SETTING_IP_CONFIG_GET_ADDR_FAMILY(setting), NM_SETTING_IP_CONFIG_GET_ADDR_FAMILY(setting),
nm_g_array_index(priv->dhcp_reject_servers, const char *, i), nm_g_array_index(priv->dhcp_reject_servers.arr, const char *, i),
NULL, NULL,
NULL)) { NULL)) {
g_set_error(error, g_set_error(error,
NM_CONNECTION_ERROR, NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY, NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid IP or subnet"), _("'%s' is not a valid IP or subnet"),
nm_g_array_index(priv->dhcp_reject_servers, const char *, i)); nm_g_array_index(priv->dhcp_reject_servers.arr, const char *, i));
g_prefix_error(error, g_prefix_error(error,
"%s.%s: ", "%s.%s: ",
nm_setting_get_name(setting), nm_setting_get_name(setting),
@@ -6132,9 +6117,12 @@ _nm_sett_info_property_override_create_array_ip_config(int addr_family)
.direct_offset = .direct_offset =
NM_STRUCT_OFFSET_ENSURE_TYPE(int, NMSettingIPConfigPrivate, replace_local_rule)); NM_STRUCT_OFFSET_ENSURE_TYPE(int, NMSettingIPConfigPrivate, replace_local_rule));
_nm_properties_override_gobj(properties_override, _nm_properties_override_gobj(
obj_properties[PROP_DNS_SEARCH], properties_override,
&nm_sett_info_propert_type_gprop_strv_oldstyle); obj_properties[PROP_DNS_SEARCH],
&nm_sett_info_propert_type_direct_strv,
.direct_offset =
NM_STRUCT_OFFSET_ENSURE_TYPE(NMValueStrv, NMSettingIPConfigPrivate, dns_search));
_nm_properties_override_gobj(properties_override, _nm_properties_override_gobj(properties_override,
obj_properties[PROP_DNS_OPTIONS], obj_properties[PROP_DNS_OPTIONS],
@@ -6142,7 +6130,11 @@ _nm_sett_info_property_override_create_array_ip_config(int addr_family)
_nm_properties_override_gobj(properties_override, _nm_properties_override_gobj(properties_override,
obj_properties[PROP_DHCP_REJECT_SERVERS], obj_properties[PROP_DHCP_REJECT_SERVERS],
&nm_sett_info_propert_type_gprop_strv_oldstyle); &nm_sett_info_propert_type_direct_strv,
.direct_offset =
NM_STRUCT_OFFSET_ENSURE_TYPE(NMValueStrv,
NMSettingIPConfigPrivate,
dhcp_reject_servers));
return properties_override; return properties_override;
} }
@@ -6159,9 +6151,6 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
case PROP_DNS: case PROP_DNS:
g_value_take_boxed(value, _nm_utils_ptrarray_to_strv(priv->dns)); g_value_take_boxed(value, _nm_utils_ptrarray_to_strv(priv->dns));
break; break;
case PROP_DNS_SEARCH:
g_value_take_boxed(value, _nm_utils_ptrarray_to_strv(priv->dns_search));
break;
case PROP_DNS_OPTIONS: case PROP_DNS_OPTIONS:
g_value_take_boxed(value, g_value_take_boxed(value,
priv->dns_options ? _nm_utils_ptrarray_to_strv(priv->dns_options) priv->dns_options ? _nm_utils_ptrarray_to_strv(priv->dns_options)
@@ -6179,9 +6168,6 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
(NMUtilsCopyFunc) nm_ip_route_dup, (NMUtilsCopyFunc) nm_ip_route_dup,
(GDestroyNotify) nm_ip_route_unref)); (GDestroyNotify) nm_ip_route_unref));
break; break;
case PROP_DHCP_REJECT_SERVERS:
g_value_set_boxed(value, nm_strvarray_get_strv_non_empty(priv->dhcp_reject_servers, NULL));
break;
default: default:
_nm_setting_property_get_property_direct(object, prop_id, value, pspec); _nm_setting_property_get_property_direct(object, prop_id, value, pspec);
break; break;
@@ -6209,10 +6195,6 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps
} }
break; break;
} }
case PROP_DNS_SEARCH:
g_ptr_array_unref(priv->dns_search);
priv->dns_search = nm_strv_to_ptrarray(g_value_get_boxed(value));
break;
case PROP_DNS_OPTIONS: case PROP_DNS_OPTIONS:
strv = g_value_get_boxed(value); strv = g_value_get_boxed(value);
if (!strv) { if (!strv) {
@@ -6244,9 +6226,6 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps
(NMUtilsCopyFunc) nm_ip_route_dup, (NMUtilsCopyFunc) nm_ip_route_dup,
(GDestroyNotify) nm_ip_route_unref); (GDestroyNotify) nm_ip_route_unref);
break; break;
case PROP_DHCP_REJECT_SERVERS:
nm_strvarray_set_strv(&priv->dhcp_reject_servers, g_value_get_boxed(value));
break;
default: default:
_nm_setting_property_set_property_direct(object, prop_id, value, pspec); _nm_setting_property_set_property_direct(object, prop_id, value, pspec);
break; break;
@@ -6260,9 +6239,8 @@ _nm_setting_ip_config_private_init(gpointer self, NMSettingIPConfigPrivate *priv
{ {
nm_assert(NM_IS_SETTING_IP_CONFIG(self)); nm_assert(NM_IS_SETTING_IP_CONFIG(self));
priv->dns_search = g_ptr_array_new_with_free_func(g_free); priv->addresses = g_ptr_array_new_with_free_func((GDestroyNotify) nm_ip_address_unref);
priv->addresses = g_ptr_array_new_with_free_func((GDestroyNotify) nm_ip_address_unref); priv->routes = g_ptr_array_new_with_free_func((GDestroyNotify) nm_ip_route_unref);
priv->routes = g_ptr_array_new_with_free_func((GDestroyNotify) nm_ip_route_unref);
} }
static void static void
@@ -6278,12 +6256,10 @@ finalize(GObject *object)
NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(self); NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE(self);
nm_g_ptr_array_unref(priv->dns); nm_g_ptr_array_unref(priv->dns);
g_ptr_array_unref(priv->dns_search);
nm_g_ptr_array_unref(priv->dns_options); nm_g_ptr_array_unref(priv->dns_options);
g_ptr_array_unref(priv->addresses); g_ptr_array_unref(priv->addresses);
g_ptr_array_unref(priv->routes); g_ptr_array_unref(priv->routes);
nm_g_ptr_array_unref(priv->routing_rules); nm_g_ptr_array_unref(priv->routing_rules);
nm_g_array_unref(priv->dhcp_reject_servers);
G_OBJECT_CLASS(nm_setting_ip_config_parent_class)->finalize(object); G_OBJECT_CLASS(nm_setting_ip_config_parent_class)->finalize(object);
} }

68
src/libnm-core-impl/nm-setting-match.c
View File

@@ -97,7 +97,7 @@ nm_setting_match_add_interface_name(NMSettingMatch *setting, const char *interfa
g_return_if_fail(NM_IS_SETTING_MATCH(setting)); g_return_if_fail(NM_IS_SETTING_MATCH(setting));
g_return_if_fail(interface_name); g_return_if_fail(interface_name);
nm_strvarray_add(nm_strvarray_ensure(&setting->interface_name.arr), interface_name); nm_strvarray_ensure_and_add(&setting->interface_name.arr, interface_name);
_notify(setting, PROP_INTERFACE_NAME); _notify(setting, PROP_INTERFACE_NAME);
} }
@@ -118,7 +118,7 @@ nm_setting_match_remove_interface_name(NMSettingMatch *setting, int idx)
g_return_if_fail(setting->interface_name.arr && idx >= 0 g_return_if_fail(setting->interface_name.arr && idx >= 0
&& idx < setting->interface_name.arr->len); && idx < setting->interface_name.arr->len);
g_array_remove_index(setting->interface_name.arr, idx); nm_strvarray_remove_index(setting->interface_name.arr, idx);
_notify(setting, PROP_INTERFACE_NAME); _notify(setting, PROP_INTERFACE_NAME);
} }
@@ -139,12 +139,11 @@ nm_setting_match_remove_interface_name_by_value(NMSettingMatch *setting, const c
g_return_val_if_fail(NM_IS_SETTING_MATCH(setting), FALSE); g_return_val_if_fail(NM_IS_SETTING_MATCH(setting), FALSE);
g_return_val_if_fail(interface_name, FALSE); g_return_val_if_fail(interface_name, FALSE);
if (nm_strvarray_remove_first(setting->interface_name.arr, interface_name)) { if (!nm_strvarray_remove_first(setting->interface_name.arr, interface_name))
_notify(setting, PROP_INTERFACE_NAME); return FALSE;
return TRUE;
}
return FALSE; _notify(setting, PROP_INTERFACE_NAME);
return TRUE;
} }
/** /**
@@ -160,10 +159,8 @@ nm_setting_match_clear_interface_names(NMSettingMatch *setting)
{ {
g_return_if_fail(NM_IS_SETTING_MATCH(setting)); g_return_if_fail(NM_IS_SETTING_MATCH(setting));
if (nm_g_array_len(setting->interface_name.arr) != 0) { if (nm_strvarray_clear(&setting->interface_name.arr))
nm_clear_pointer(&setting->interface_name.arr, g_array_unref);
_notify(setting, PROP_INTERFACE_NAME); _notify(setting, PROP_INTERFACE_NAME);
}
} }
/** /**
@@ -240,7 +237,7 @@ nm_setting_match_add_kernel_command_line(NMSettingMatch *setting, const char *ke
g_return_if_fail(NM_IS_SETTING_MATCH(setting)); g_return_if_fail(NM_IS_SETTING_MATCH(setting));
g_return_if_fail(kernel_command_line); g_return_if_fail(kernel_command_line);
nm_strvarray_add(nm_strvarray_ensure(&setting->kernel_command_line.arr), kernel_command_line); nm_strvarray_ensure_and_add(&setting->kernel_command_line.arr, kernel_command_line);
_notify(setting, PROP_KERNEL_COMMAND_LINE); _notify(setting, PROP_KERNEL_COMMAND_LINE);
} }
@@ -261,7 +258,7 @@ nm_setting_match_remove_kernel_command_line(NMSettingMatch *setting, guint idx)
g_return_if_fail(setting->kernel_command_line.arr g_return_if_fail(setting->kernel_command_line.arr
&& idx < setting->kernel_command_line.arr->len); && idx < setting->kernel_command_line.arr->len);
g_array_remove_index(setting->kernel_command_line.arr, idx); nm_strvarray_remove_index(setting->kernel_command_line.arr, idx);
_notify(setting, PROP_KERNEL_COMMAND_LINE); _notify(setting, PROP_KERNEL_COMMAND_LINE);
} }
@@ -283,12 +280,11 @@ nm_setting_match_remove_kernel_command_line_by_value(NMSettingMatch *setting,
g_return_val_if_fail(NM_IS_SETTING_MATCH(setting), FALSE); g_return_val_if_fail(NM_IS_SETTING_MATCH(setting), FALSE);
g_return_val_if_fail(kernel_command_line, FALSE); g_return_val_if_fail(kernel_command_line, FALSE);
if (nm_strvarray_remove_first(setting->kernel_command_line.arr, kernel_command_line)) { if (!nm_strvarray_remove_first(setting->kernel_command_line.arr, kernel_command_line))
_notify(setting, PROP_KERNEL_COMMAND_LINE); return FALSE;
return TRUE;
}
return FALSE; _notify(setting, PROP_KERNEL_COMMAND_LINE);
return TRUE;
} }
/** /**
@@ -304,10 +300,8 @@ nm_setting_match_clear_kernel_command_lines(NMSettingMatch *setting)
{ {
g_return_if_fail(NM_IS_SETTING_MATCH(setting)); g_return_if_fail(NM_IS_SETTING_MATCH(setting));
if (nm_g_array_len(setting->kernel_command_line.arr) != 0) { if (nm_strvarray_clear(&setting->kernel_command_line.arr))
nm_clear_pointer(&setting->kernel_command_line.arr, g_array_unref);
_notify(setting, PROP_KERNEL_COMMAND_LINE); _notify(setting, PROP_KERNEL_COMMAND_LINE);
}
} }
/** /**
@@ -381,7 +375,7 @@ nm_setting_match_add_driver(NMSettingMatch *setting, const char *driver)
g_return_if_fail(NM_IS_SETTING_MATCH(setting)); g_return_if_fail(NM_IS_SETTING_MATCH(setting));
g_return_if_fail(driver); g_return_if_fail(driver);
nm_strvarray_add(nm_strvarray_ensure(&setting->driver.arr), driver); nm_strvarray_ensure_and_add(&setting->driver.arr, driver);
_notify(setting, PROP_DRIVER); _notify(setting, PROP_DRIVER);
} }
@@ -401,7 +395,7 @@ nm_setting_match_remove_driver(NMSettingMatch *setting, guint idx)
g_return_if_fail(setting->driver.arr && idx < setting->driver.arr->len); g_return_if_fail(setting->driver.arr && idx < setting->driver.arr->len);
g_array_remove_index(setting->driver.arr, idx); nm_strvarray_remove_index(setting->driver.arr, idx);
_notify(setting, PROP_DRIVER); _notify(setting, PROP_DRIVER);
} }
@@ -422,12 +416,11 @@ nm_setting_match_remove_driver_by_value(NMSettingMatch *setting, const char *dri
g_return_val_if_fail(NM_IS_SETTING_MATCH(setting), FALSE); g_return_val_if_fail(NM_IS_SETTING_MATCH(setting), FALSE);
g_return_val_if_fail(driver, FALSE); g_return_val_if_fail(driver, FALSE);
if (nm_strvarray_remove_first(setting->driver.arr, driver)) { if (!nm_strvarray_remove_first(setting->driver.arr, driver))
_notify(setting, PROP_DRIVER); return FALSE;
return TRUE;
}
return FALSE; _notify(setting, PROP_DRIVER);
return TRUE;
} }
/** /**
@@ -443,10 +436,8 @@ nm_setting_match_clear_drivers(NMSettingMatch *setting)
{ {
g_return_if_fail(NM_IS_SETTING_MATCH(setting)); g_return_if_fail(NM_IS_SETTING_MATCH(setting));
if (nm_g_array_len(setting->driver.arr) != 0) { if (nm_strvarray_clear(&setting->driver.arr))
nm_clear_pointer(&setting->driver.arr, g_array_unref);
_notify(setting, PROP_DRIVER); _notify(setting, PROP_DRIVER);
}
} }
/** /**
@@ -520,7 +511,7 @@ nm_setting_match_add_path(NMSettingMatch *setting, const char *path)
g_return_if_fail(NM_IS_SETTING_MATCH(setting)); g_return_if_fail(NM_IS_SETTING_MATCH(setting));
g_return_if_fail(path); g_return_if_fail(path);
nm_strvarray_add(nm_strvarray_ensure(&setting->path.arr), path); nm_strvarray_ensure_and_add(&setting->path.arr, path);
_notify(setting, PROP_PATH); _notify(setting, PROP_PATH);
} }
@@ -540,7 +531,7 @@ nm_setting_match_remove_path(NMSettingMatch *setting, guint idx)
g_return_if_fail(setting->path.arr && idx < setting->path.arr->len); g_return_if_fail(setting->path.arr && idx < setting->path.arr->len);
g_array_remove_index(setting->path.arr, idx); nm_strvarray_remove_index(setting->path.arr, idx);
_notify(setting, PROP_PATH); _notify(setting, PROP_PATH);
} }
@@ -561,12 +552,11 @@ nm_setting_match_remove_path_by_value(NMSettingMatch *setting, const char *path)
g_return_val_if_fail(NM_IS_SETTING_MATCH(setting), FALSE); g_return_val_if_fail(NM_IS_SETTING_MATCH(setting), FALSE);
g_return_val_if_fail(path, FALSE); g_return_val_if_fail(path, FALSE);
if (nm_strvarray_remove_first(setting->path.arr, path)) { if (!nm_strvarray_remove_first(setting->path.arr, path))
_notify(setting, PROP_PATH); return FALSE;
return TRUE;
}
return FALSE; _notify(setting, PROP_PATH);
return TRUE;
} }
/** /**
@@ -582,10 +572,8 @@ nm_setting_match_clear_paths(NMSettingMatch *setting)
{ {
g_return_if_fail(NM_IS_SETTING_MATCH(setting)); g_return_if_fail(NM_IS_SETTING_MATCH(setting));
if (nm_g_array_len(setting->path.arr) != 0) { if (nm_strvarray_clear(&setting->path.arr))
nm_clear_pointer(&setting->path.arr, g_array_unref);
_notify(setting, PROP_PATH); _notify(setting, PROP_PATH);
}
} }
/** /**

66
src/libnm-core-impl/nm-setting-private.h
View File

@@ -20,6 +20,14 @@
/*****************************************************************************/ /*****************************************************************************/
/* This holds a property of type NM_VALUE_TYPE_STRV. You probably want
* to use nm_strvarray_*() API with this. */
typedef struct {
GArray *arr;
} NMValueStrv;
/*****************************************************************************/
struct _NMRefString; struct _NMRefString;
typedef struct { typedef struct {
@@ -166,31 +174,31 @@ struct _NMSettingIPConfigClass {
}; };
typedef struct { typedef struct {
GPtrArray *dns; /* array of IP address strings */ NMValueStrv dns_search; /* array of domain name strings */
GPtrArray *dns_search; /* array of domain name strings */ NMValueStrv dhcp_reject_servers;
GPtrArray *dns_options; /* array of DNS options */ GPtrArray *dns; /* array of IP address strings */
GPtrArray *addresses; /* array of NMIPAddress */ GPtrArray *dns_options; /* array of DNS options */
GPtrArray *routes; /* array of NMIPRoute */ GPtrArray *addresses; /* array of NMIPAddress */
GPtrArray *routing_rules; GPtrArray *routes; /* array of NMIPRoute */
GArray *dhcp_reject_servers; GPtrArray *routing_rules;
char *method; char *method;
char *gateway; char *gateway;
char *dhcp_hostname; char *dhcp_hostname;
char *dhcp_iaid; char *dhcp_iaid;
gint64 route_metric; gint64 route_metric;
int auto_route_ext_gw; int auto_route_ext_gw;
int replace_local_rule; int replace_local_rule;
gint32 required_timeout; gint32 required_timeout;
gint32 dad_timeout; gint32 dad_timeout;
gint32 dhcp_timeout; gint32 dhcp_timeout;
gint32 dns_priority; gint32 dns_priority;
guint32 route_table; guint32 route_table;
guint32 dhcp_hostname_flags; guint32 dhcp_hostname_flags;
bool ignore_auto_routes; bool ignore_auto_routes;
bool ignore_auto_dns; bool ignore_auto_dns;
bool dhcp_send_hostname; bool dhcp_send_hostname;
bool never_default; bool never_default;
bool may_fail; bool may_fail;
} NMSettingIPConfigPrivate; } NMSettingIPConfigPrivate;
void _nm_setting_ip_config_private_init(gpointer self, NMSettingIPConfigPrivate *priv); void _nm_setting_ip_config_private_init(gpointer self, NMSettingIPConfigPrivate *priv);
@@ -277,14 +285,6 @@ gboolean _nm_setting_clear_secrets(NMSetting *setting,
/*****************************************************************************/ /*****************************************************************************/
/* This holds a property of type NM_VALUE_TYPE_STRV. You probably want
* to use nm_strvarray_*() API with this. */
typedef struct {
GArray *arr;
} NMValueStrv;
/*****************************************************************************/
struct _NMRange { struct _NMRange {
int refcount; int refcount;
guint64 start; guint64 start;

18
src/libnm-core-impl/tests/test-general.c
View File

@@ -5335,7 +5335,8 @@ test_setting_ip4_changed_signal(void)
ASSERT_CHANGED(nm_setting_ip_config_add_dns_search(s_ip4, "foobar.com")); ASSERT_CHANGED(nm_setting_ip_config_add_dns_search(s_ip4, "foobar.com"));
ASSERT_CHANGED(nm_setting_ip_config_remove_dns_search(s_ip4, 0)); ASSERT_CHANGED(nm_setting_ip_config_remove_dns_search(s_ip4, 0));
NMTST_EXPECT_LIBNM_CRITICAL(NMTST_G_RETURN_MSG(idx >= 0 && idx < priv->dns_search->len)); NMTST_EXPECT_LIBNM_CRITICAL(
NMTST_G_RETURN_MSG(idx >= 0 && idx < nm_g_array_len(priv->dns_search.arr)));
ASSERT_UNCHANGED(nm_setting_ip_config_remove_dns_search(s_ip4, 1)); ASSERT_UNCHANGED(nm_setting_ip_config_remove_dns_search(s_ip4, 1));
g_test_assert_expected_messages(); g_test_assert_expected_messages();
@@ -5410,9 +5411,22 @@ test_setting_ip6_changed_signal(void)
ASSERT_CHANGED(nm_setting_ip_config_clear_dns(s_ip6)); ASSERT_CHANGED(nm_setting_ip_config_clear_dns(s_ip6));
ASSERT_CHANGED(nm_setting_ip_config_add_dns_search(s_ip6, "foobar.com")); ASSERT_CHANGED(nm_setting_ip_config_add_dns_search(s_ip6, "foobar.com"));
g_assert_cmpstr(nm_setting_ip_config_get_dns_search(s_ip6, 0), ==, "foobar.com");
g_assert_cmpstr(nm_setting_ip_config_get_dns_search(s_ip6, 1), ==, NULL);
NMTST_EXPECT_LIBNM_CRITICAL(NMTST_G_RETURN_MSG(_idx <= _len));
g_assert_cmpstr(nm_setting_ip_config_get_dns_search(s_ip6, -1), ==, NULL);
g_test_assert_expected_messages();
NMTST_EXPECT_LIBNM_CRITICAL(NMTST_G_RETURN_MSG(_idx <= _len));
g_assert_cmpstr(nm_setting_ip_config_get_dns_search(s_ip6, 2), ==, NULL);
g_test_assert_expected_messages();
ASSERT_CHANGED(nm_setting_ip_config_remove_dns_search(s_ip6, 0)); ASSERT_CHANGED(nm_setting_ip_config_remove_dns_search(s_ip6, 0));
NMTST_EXPECT_LIBNM_CRITICAL(NMTST_G_RETURN_MSG(idx >= 0 && idx < priv->dns_search->len)); NMTST_EXPECT_LIBNM_CRITICAL(
NMTST_G_RETURN_MSG(idx >= 0 && idx < nm_g_array_len(priv->dns_search.arr)));
ASSERT_UNCHANGED(nm_setting_ip_config_remove_dns_search(s_ip6, 1)); ASSERT_UNCHANGED(nm_setting_ip_config_remove_dns_search(s_ip6, 1));
g_test_assert_expected_messages(); g_test_assert_expected_messages();

90
src/libnm-glib-aux/nm-shared-utils.h
View File

@@ -2996,21 +2996,28 @@ nm_strvarray_ensure(GArray **p)
*p = g_array_new(TRUE, FALSE, sizeof(char *)); *p = g_array_new(TRUE, FALSE, sizeof(char *));
g_array_set_clear_func(*p, nm_indirect_g_free); g_array_set_clear_func(*p, nm_indirect_g_free);
} else } else
nm_assert(g_array_get_element_size(*p) == sizeof(char *)); nm_assert(sizeof(char *) == g_array_get_element_size(*p));
return *p; return *p;
} }
static inline void
nm_strvarray_add_take(GArray *array, char *str)
{
nm_assert(array);
nm_assert(sizeof(char *) == g_array_get_element_size(array));
/* The array is used as a NULL terminated strv array. Adding NULL is most
* likely a bug. Assert against it. */
nm_assert(str);
g_array_append_val(array, str);
}
static inline void static inline void
nm_strvarray_add(GArray *array, const char *str) nm_strvarray_add(GArray *array, const char *str)
{ {
char *s; nm_strvarray_add_take(array, g_strdup(str));
nm_assert(array);
nm_assert(g_array_get_element_size(array) == sizeof(char *));
s = g_strdup(str);
g_array_append_val(array, s);
} }
static inline const char * static inline const char *
@@ -3036,7 +3043,7 @@ nm_strvarray_get_idx(GArray *array, guint idx)
static inline const char *const * static inline const char *const *
nm_strvarray_get_strv_non_empty(GArray *arr, guint *length) nm_strvarray_get_strv_non_empty(GArray *arr, guint *length)
{ {
nm_assert(!arr || g_array_get_element_size(arr) == sizeof(char *)); nm_assert(!arr || sizeof(char *) == g_array_get_element_size(arr));
if (!arr || arr->len == 0) { if (!arr || arr->len == 0) {
NM_SET_OUT(length, 0); NM_SET_OUT(length, 0);
@@ -3052,7 +3059,7 @@ nm_strvarray_get_strv_non_empty_dup(GArray *arr, guint *length)
{ {
const char *const *strv; const char *const *strv;
nm_assert(!arr || g_array_get_element_size(arr) == sizeof(char *)); nm_assert(!arr || sizeof(char *) == g_array_get_element_size(arr));
if (!arr || arr->len == 0) { if (!arr || arr->len == 0) {
NM_SET_OUT(length, 0); NM_SET_OUT(length, 0);
@@ -3072,7 +3079,7 @@ nm_strvarray_get_strv(GArray **arr, guint *length)
return (const char *const *) arr; return (const char *const *) arr;
} }
nm_assert(g_array_get_element_size(*arr) == sizeof(char *)); nm_assert(sizeof(char *) == g_array_get_element_size(*arr));
NM_SET_OUT(length, (*arr)->len); NM_SET_OUT(length, (*arr)->len);
return &g_array_index(*arr, const char *, 0); return &g_array_index(*arr, const char *, 0);
@@ -3085,7 +3092,7 @@ nm_strvarray_set_strv(GArray **array, const char *const *strv)
array_old = g_steal_pointer(array); array_old = g_steal_pointer(array);
nm_assert(!array_old || g_array_get_element_size(array_old) == sizeof(char *)); nm_assert(!array_old || sizeof(char *) == g_array_get_element_size(array_old));
if (!strv || !strv[0]) if (!strv || !strv[0])
return; return;
@@ -3103,7 +3110,7 @@ nm_strvarray_find_first(GArray *strv, const char *needle)
nm_assert(needle); nm_assert(needle);
if (strv) { if (strv) {
nm_assert(g_array_get_element_size(strv) == sizeof(char *)); nm_assert(sizeof(char *) == g_array_get_element_size(strv));
for (i = 0; i < strv->len; i++) { for (i = 0; i < strv->len; i++) {
if (nm_streq(needle, g_array_index(strv, const char *, i))) if (nm_streq(needle, g_array_index(strv, const char *, i)))
return i; return i;
@@ -3112,6 +3119,8 @@ nm_strvarray_find_first(GArray *strv, const char *needle)
return -1; return -1;
} }
#define nm_strvarray_contains(strv, needle) (nm_strvarray_find_first((strv), (needle)) >= 0)
static inline gboolean static inline gboolean
nm_strvarray_remove_first(GArray *strv, const char *needle) nm_strvarray_remove_first(GArray *strv, const char *needle)
{ {
@@ -3126,11 +3135,42 @@ nm_strvarray_remove_first(GArray *strv, const char *needle)
return TRUE; return TRUE;
} }
#define nm_strvarray_remove_index(strv, idx) \
G_STMT_START \
{ \
GArray *const _strv = (strv); \
typeof(idx) _idx = (idx); \
\
nm_assert(_strv); \
nm_assert((uintmax_t) _idx < _strv->len); \
nm_assert(sizeof(char *) == g_array_get_element_size(_strv)); \
\
g_array_remove_index(_strv, (guint) _idx); \
} \
G_STMT_END
static inline void
nm_strvarray_ensure_and_add(GArray **p, const char *str)
{
nm_strvarray_add(nm_strvarray_ensure(p), str);
}
static inline gboolean
nm_strvarray_ensure_and_add_unique(GArray **p, const char *str)
{
nm_assert(p);
if (nm_strvarray_contains(*p, str))
return FALSE;
nm_strvarray_add(nm_strvarray_ensure(p), str);
return TRUE;
}
static inline int static inline int
nm_strvarray_cmp(const GArray *a, const GArray *b) nm_strvarray_cmp(const GArray *a, const GArray *b)
{ {
nm_assert(!a || sizeof(const char *const *) == g_array_get_element_size((GArray *) a)); nm_assert(!a || sizeof(char *) == g_array_get_element_size((GArray *) a));
nm_assert(!b || sizeof(const char *const *) == g_array_get_element_size((GArray *) b)); nm_assert(!b || sizeof(char *) == g_array_get_element_size((GArray *) b));
NM_CMP_SELF(a, b); NM_CMP_SELF(a, b);
@@ -3142,7 +3182,7 @@ nm_strvarray_cmp(const GArray *a, const GArray *b)
static inline int static inline int
_nm_strvarray_cmp_strv(const GArray *strv, const char *const *ss, gsize ss_len) _nm_strvarray_cmp_strv(const GArray *strv, const char *const *ss, gsize ss_len)
{ {
nm_assert(!strv || sizeof(const char *const *) == g_array_get_element_size((GArray *) strv)); nm_assert(!strv || sizeof(char *) == g_array_get_element_size((GArray *) strv));
return nm_strv_cmp_n(nm_g_array_data(strv), strv ? ((gssize) strv->len) : -1, ss, ss_len); return nm_strv_cmp_n(nm_g_array_data(strv), strv ? ((gssize) strv->len) : -1, ss, ss_len);
} }
@@ -3152,6 +3192,24 @@ _nm_strvarray_cmp_strv(const GArray *strv, const char *const *ss, gsize ss_len)
#define nm_strvarray_equal_strv(strv, ss, ss_len) \ #define nm_strvarray_equal_strv(strv, ss, ss_len) \
(nm_strvarray_cmp_strv((strv), (ss), (ss_len)) == 0) (nm_strvarray_cmp_strv((strv), (ss), (ss_len)) == 0)
static inline gboolean
nm_strvarray_clear(GArray **array)
{
gboolean cleared = FALSE;
nm_assert(array);
nm_assert(!*array || sizeof(char *) == g_array_get_element_size(*array));
if (*array) {
/* We always clear the GArray, but we return TRUE only if the
* array was non-empty before. */
if ((*array)->len > 0)
cleared = TRUE;
nm_clear_pointer(array, g_array_unref);
}
return cleared;
}
/*****************************************************************************/ /*****************************************************************************/
struct _NMVariantAttributeSpec { struct _NMVariantAttributeSpec {