mirror of
https://github.com/systemd/systemd.git
synced 2024-11-05 23:51:28 +03:00
networkctl: Display address is a DHCP4 address
CLoses https://github.com/systemd/systemd/issues/10839
This commit is contained in:
parent
611224d9fe
commit
cdf01b36db
@ -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];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user