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

dhcp/nettools: refactor parsing of DHCP lease (hostname)

Browse Source
This commit is contained in:
Thomas Haller
2021-02-10 08:44:27 +01:00
parent 89773b8739
commit 67110d1711
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/dhcp/nm-dhcp-nettools.c
View File

@@ -15,6 +15,7 @@
#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-glib-aux/nm-dedup-multi.h"
#include "nm-std-aux/unaligned.h" #include "nm-std-aux/unaligned.h"
#include "nm-glib-aux/nm-str-buf.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-config.h" #include "nm-config.h"
@@ -716,29 +717,6 @@ lease_parse_ntps(NDhcp4ClientLease *lease, GHashTable *options)
str->str); str->str);
} }
static void
lease_parse_hostname(NDhcp4ClientLease *lease, GHashTable *options)
{
nm_auto_free_gstring GString *str = NULL;
uint8_t * data;
size_t n_data;
int r;
r = n_dhcp4_client_lease_query(lease, NM_DHCP_OPTION_DHCP4_HOST_NAME, &data, &n_data);
if (r)
return;
str = g_string_new_len((char *) data, n_data);
if (nm_utils_is_localhost(str->str))
return;
nm_dhcp_option_add_option(options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_HOST_NAME,
str->str);
}
static void static void
lease_parse_domainname(NDhcp4ClientLease *lease, NMIP4Config *ip4_config, GHashTable *options) lease_parse_domainname(NDhcp4ClientLease *lease, NMIP4Config *ip4_config, GHashTable *options)
{ {
@@ -938,10 +916,12 @@ lease_to_ip4_config(NMDedupMultiIndex *multi_idx,
GHashTable ** out_options, GHashTable ** out_options,
GError ** error) GError ** error)
{ {
nm_auto_str_buf NMStrBuf sbuf = NM_STR_BUF_INIT(0, FALSE);
gs_unref_object NMIP4Config *ip4_config = NULL; gs_unref_object NMIP4Config *ip4_config = NULL;
gs_unref_hashtable GHashTable *options = NULL; gs_unref_hashtable GHashTable *options = NULL;
guint8 * l_data; guint8 * l_data;
gsize l_data_len; gsize l_data_len;
const char * v_str;
guint16 v_u16; guint16 v_u16;
gboolean v_bool; gboolean v_bool;
int r; int r;
@@ -978,7 +958,19 @@ lease_to_ip4_config(NMDedupMultiIndex *multi_idx,
(r == 0) && memmem(l_data, l_data_len, "ANDROID_METERED", NM_STRLEN("ANDROID_METERED")); (r == 0) && memmem(l_data, l_data_len, "ANDROID_METERED", NM_STRLEN("ANDROID_METERED"));
nm_ip4_config_set_metered(ip4_config, v_bool); nm_ip4_config_set_metered(ip4_config, v_bool);
lease_parse_hostname(lease, options); r = n_dhcp4_client_lease_query(lease, NM_DHCP_OPTION_DHCP4_HOST_NAME, &l_data, &l_data_len);
if (r == 0) {
nm_str_buf_reset(&sbuf);
nm_str_buf_append_len(&sbuf, (const char *) l_data, l_data_len);
v_str = nm_str_buf_get_str(&sbuf);
if (!nm_utils_is_localhost(v_str)) {
nm_dhcp_option_add_option(options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_HOST_NAME,
v_str);
}
}
lease_parse_ntps(lease, options); lease_parse_ntps(lease, options);
lease_parse_root_path(lease, options); lease_parse_root_path(lease, options);
lease_parse_wpad(lease, options); lease_parse_wpad(lease, options);