fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 12:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: nettools: drop plugin logging of the lease options

Browse source 
as these are already logged in common dhcp-client code. Moreover, now
the log level of the lease options will move from INFO to DEBUG.
This commit is contained in:
Francesco Giudici 2019-07-30 14:22:21 +02:00
parent fff39e4a88
commit 6945ecb804
1 changed files with 17 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/dhcp/nm-dhcp-nettools.c
View file

@ -341,11 +341,6 @@ lease_get_u16 (NDhcp4ClientLease *lease,
return TRUE;
}
#define LOG_LEASE(domain, ...) \
G_STMT_START { \
_LOG2I ((domain), (iface), " "__VA_ARGS__); \
} G_STMT_END
static gboolean
lease_parse_address (NDhcp4ClientLease *lease,
const char *iface,
@ -402,7 +397,6 @@ lease_parse_address (NDhcp4ClientLease *lease,
nm_utils_inet4_ntop (a_address.s_addr, addr_str);
a_plen = nm_utils_ip4_netmask_to_prefix (a_netmask.s_addr);
LOG_LEASE (LOGD_DHCP4, "address %s/%u", addr_str, a_plen);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_NM_IP_ADDRESS,
@ -412,11 +406,6 @@ lease_parse_address (NDhcp4ClientLease *lease,
NM_DHCP_OPTION_DHCP4_SUBNET_MASK,
nm_utils_inet4_ntop (a_netmask.s_addr, addr_str));
LOG_LEASE (LOGD_DHCP4, "%s '%u' seconds (at %lld)",
nm_dhcp_option_request_string (_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_IP_ADDRESS_LEASE_TIME),
(guint) a_lifetime,
(long long) a_expiry);
nm_dhcp_option_add_option_u64 (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_IP_ADDRESS_LEASE_TIME,
@ -474,7 +463,6 @@ lease_parse_domain_name_servers (NDhcp4ClientLease *lease,
nm_ip4_config_add_nameserver (ip4_config, addr.s_addr);
}
LOG_LEASE (LOGD_DHCP4, "nameserver '%s'", str->str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_DOMAIN_NAME_SERVER,
@ -513,11 +501,6 @@ lease_parse_routes (NDhcp4ClientLease *lease,
nm_utils_inet4_ntop (dest.s_addr, dest_str);
nm_utils_inet4_ntop (gateway.s_addr, gateway_str);
LOG_LEASE (LOGD_DHCP4,
"classless static route %s/%d gw %s",
dest_str,
(int) plen,
gateway_str);
g_string_append_printf (nm_gstring_add_space_delimiter (str),
"%s/%d %s",
dest_str,
@ -562,11 +545,6 @@ lease_parse_routes (NDhcp4ClientLease *lease,
nm_utils_inet4_ntop (dest.s_addr, dest_str);
nm_utils_inet4_ntop (gateway.s_addr, gateway_str);
LOG_LEASE (LOGD_DHCP4,
"static route %s/%d gw %s",
dest_str,
(int) plen,
gateway_str);
g_string_append_printf (nm_gstring_add_space_delimiter (str),
"%s/%d %s",
dest_str,
@ -643,7 +621,6 @@ lease_parse_routes (NDhcp4ClientLease *lease,
}),
NULL);
}
LOG_LEASE (LOGD_DHCP4, "router %s", str->str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_ROUTER,
@ -665,7 +642,6 @@ lease_parse_mtu (NDhcp4ClientLease *lease,
if (mtu < 68)
return;
LOG_LEASE (LOGD_DHCP4, "mtu %u", mtu);
nm_dhcp_option_add_option_u64 (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_INTERFACE_MTU,
@ -691,7 +667,7 @@ lease_parse_metered (NDhcp4ClientLease *lease,
metered = !!memmem (data, n_data, "ANDROID_METERED", NM_STRLEN ("ANDROID_METERED"));
}
LOG_LEASE (LOGD_DHCP4, "%s", metered ? "metered" : "unmetered");
/* TODO: expose the vendor specific option when present */
nm_ip4_config_set_metered (ip4_config, metered);
}
@ -718,8 +694,10 @@ lease_parse_ntps (NDhcp4ClientLease *lease,
g_string_append (nm_gstring_add_space_delimiter (str), addr_str);
}
LOG_LEASE (LOGD_DHCP4, "ntp server '%s'", str->str);
nm_dhcp_option_add_option (options, _nm_dhcp_option_dhcp4_options, NM_DHCP_OPTION_DHCP4_NTP_SERVER, str->str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_NTP_SERVER,
str->str);
}
static void
@ -741,8 +719,10 @@ lease_parse_hostname (NDhcp4ClientLease *lease,
if (is_localhost(str->str))
return;
LOG_LEASE (LOGD_DHCP4, "hostname '%s'", str->str);
nm_dhcp_option_add_option (options, _nm_dhcp_option_dhcp4_options, NM_DHCP_OPTION_DHCP4_HOST_NAME, str->str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_HOST_NAME,
str->str);
}
static void
@ -774,8 +754,10 @@ lease_parse_domainname (NDhcp4ClientLease *lease,
g_string_append (nm_gstring_add_space_delimiter (str), *d);
nm_ip4_config_add_domain (ip4_config, *d);
}
LOG_LEASE (LOGD_DHCP4, "domain name '%s'", str->str);
nm_dhcp_option_add_option (options, _nm_dhcp_option_dhcp4_options, NM_DHCP_OPTION_DHCP4_DOMAIN_NAME, str->str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_DOMAIN_NAME,
str->str);
}
static void
@ -808,7 +790,6 @@ lease_parse_search_domains (NDhcp4ClientLease *lease,
g_string_append (nm_gstring_add_space_delimiter (str), domain->str);
nm_ip4_config_add_search (ip4_config, domain->str);
}
LOG_LEASE (LOGD_DHCP4, "domain search '%s'", str->str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_DOMAIN_SEARCH_LIST,
@ -830,8 +811,10 @@ lease_parse_root_path (NDhcp4ClientLease *lease,
return;
str = g_string_new_len ((char *)data, n_data);
LOG_LEASE (LOGD_DHCP4, "root path '%s'", str->str);
nm_dhcp_option_add_option (options, _nm_dhcp_option_dhcp4_options, NM_DHCP_OPTION_DHCP4_ROOT_PATH, str->str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_ROOT_PATH,
str->str);
}
static void
@ -849,7 +832,6 @@ lease_parse_wpad (NDhcp4ClientLease *lease,
return;
str = g_string_new_len ((char *)data, n_data);
LOG_LEASE (LOGD_DHCP4, "wpad '%s'", str->str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_PRIVATE_PROXY_AUTODISCOVERY,
@ -880,9 +862,6 @@ lease_parse_private_options (NDhcp4ClientLease *lease,
continue;
option_string = nm_utils_bin2hexstr_full (data, n_data, ':', FALSE, NULL);
LOG_LEASE (LOGD_DHCP4, "%s '%s'",
nm_dhcp_option_request_string (_nm_dhcp_option_dhcp4_options, i),
option_string);
if (options) {
nm_dhcp_option_take_option (options,
_nm_dhcp_option_dhcp4_options,