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

l3cfg: add nm_l3_config_data_clear_searches() API

Browse Source
This commit is contained in:
Thomas Haller
2020-09-15 18:58:38 +02:00
parent b850cea874
commit d69b8ecd34
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nm-l3-config-data.c
View File

@@ -1099,8 +1099,8 @@ nm_l3_config_data_add_nameserver (NML3ConfigData *self,
} }
gboolean gboolean
nm_l3_config_data_clear_nameserver (NML3ConfigData *self, nm_l3_config_data_clear_nameservers (NML3ConfigData *self,
int addr_family) int addr_family)
{ {
gs_unref_array GArray *old = NULL; gs_unref_array GArray *old = NULL;
@@ -1197,6 +1197,19 @@ nm_l3_config_data_add_search (NML3ConfigData *self,
return _check_and_add_domain (&self->searches_x[NM_IS_IPv4 (addr_family)], search); return _check_and_add_domain (&self->searches_x[NM_IS_IPv4 (addr_family)], search);
} }
gboolean
nm_l3_config_data_clear_searches (NML3ConfigData *self,
int addr_family)
{
gs_unref_ptrarray GPtrArray *old = NULL;
nm_assert (_NM_IS_L3_CONFIG_DATA (self, FALSE));
nm_assert_addr_family (addr_family);
old = g_steal_pointer (&self->searches_x[NM_IS_IPv4 (addr_family)]);
return (nm_g_ptr_array_len (old) > 0);
}
gboolean gboolean
nm_l3_config_data_add_dns_option (NML3ConfigData *self, nm_l3_config_data_add_dns_option (NML3ConfigData *self,
int addr_family, int addr_family,

7
src/nm-l3-config-data.h
View File

@@ -458,8 +458,8 @@ gboolean nm_l3_config_data_add_nameserver (NML3ConfigData *self,
int addr_family, int addr_family,
gconstpointer /* (const NMIPAddr *) */ nameserver); gconstpointer /* (const NMIPAddr *) */ nameserver);
gboolean nm_l3_config_data_clear_nameserver (NML3ConfigData *self, gboolean nm_l3_config_data_clear_nameservers (NML3ConfigData *self,
int addr_family); int addr_family);
gboolean nm_l3_config_data_add_nis_server (NML3ConfigData *self, gboolean nm_l3_config_data_add_nis_server (NML3ConfigData *self,
in_addr_t nis_server); in_addr_t nis_server);
@@ -479,6 +479,9 @@ const char *const*nm_l3_config_data_get_searches (const NML3ConfigData *self,
int addr_family, int addr_family,
guint *out_len); guint *out_len);
gboolean nm_l3_config_data_clear_searches (NML3ConfigData *self,
int addr_family);
gboolean nm_l3_config_data_add_search (NML3ConfigData *self, gboolean nm_l3_config_data_add_search (NML3ConfigData *self,
int addr_family, int addr_family,
const char *search); const char *search);