From 611224d9fef55db2cb95af239af61e28c8cae221 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Mon, 9 Sep 2019 19:57:14 +0530 Subject: sd-network: add support to get DHCP4 address --- src/libsystemd/sd-network/sd-network.c | 4 ++++ src/systemd/sd-network.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index a3c0542d7a..8ff9382d90 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c @@ -229,6 +229,10 @@ _public_ int sd_network_link_get_timezone(int ifindex, char **ret) { return network_link_get_string(ifindex, "TIMEZONE", ret); } +_public_ int sd_network_link_get_dhcp4_address(int ifindex, char **ret) { + return network_link_get_string(ifindex, "DHCP4_ADDRESS", ret); +} + _public_ int sd_network_link_get_dns(int ifindex, char ***ret) { return network_link_get_strv(ifindex, "DNS", ret); } diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h index c78f7c86bb..1cf4c2ec9d 100644 --- a/src/systemd/sd-network.h +++ b/src/systemd/sd-network.h @@ -110,6 +110,10 @@ int sd_network_link_get_network_file(int ifindex, char **filename); * IP addresses */ int sd_network_link_get_dns(int ifindex, char ***ret); +/* Get DHCP4 address for a given link. This is string representations of + * IPv4 address */ +int sd_network_link_get_dhcp4_address(int ifindex, char **ret); + /* Get NTP entries for a given link. These are domain names or string * representations of IP addresses */ int sd_network_link_get_ntp(int ifindex, char ***ret); -- cgit v1.2.1 From cdf01b36dbd5ac4ff9c733b71aab3d7cc6487bea Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Mon, 9 Sep 2019 19:57:40 +0530 Subject: networkctl: Display address is a DHCP4 address CLoses https://github.com/systemd/systemd/issues/10839 --- src/network/networkctl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 3100a2e04e..a7cccbc690 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -678,6 +678,7 @@ static int dump_addresses( int ifindex) { _cleanup_free_ struct local_address *local = NULL; + _cleanup_free_ char *dhcp4_address = NULL; int r, n, i; assert(rtnl); @@ -687,6 +688,8 @@ static int dump_addresses( if (n < 0) return n; + (void) sd_network_link_get_dhcp4_address(ifindex, &dhcp4_address); + for (i = 0; i < n; i++) { _cleanup_free_ char *pretty = NULL; @@ -700,6 +703,15 @@ static int dump_addresses( if (r < 0) return r; + if (dhcp4_address && streq(pretty, dhcp4_address)) { + _cleanup_free_ char *p = NULL; + + p = pretty; + pretty = strjoin(pretty , " (DHCP4)"); + if (!pretty) + return log_oom(); + } + if (ifindex <= 0) { char name[IF_NAMESIZE+1]; -- cgit v1.2.1