shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-05 23:51:28 +03:00
Code

networkctl: Display address is a DHCP4 address

Browse Source 
CLoses https://github.com/systemd/systemd/issues/10839
This commit is contained in:
Susant Sahani 2019-09-09 19:57:40 +05:30
parent 611224d9fe
commit cdf01b36db
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/networkctl.c
View File

@ -678,6 +678,7 @@ static int dump_addresses(
int ifindex) { int ifindex) {
_cleanup_free_ struct local_address *local = NULL; _cleanup_free_ struct local_address *local = NULL;
_cleanup_free_ char *dhcp4_address = NULL;
int r, n, i; int r, n, i;
assert(rtnl); assert(rtnl);
@ -687,6 +688,8 @@ static int dump_addresses(
if (n < 0) if (n < 0)
return n; return n;
(void) sd_network_link_get_dhcp4_address(ifindex, &dhcp4_address);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
_cleanup_free_ char *pretty = NULL; _cleanup_free_ char *pretty = NULL;
@ -700,6 +703,15 @@ static int dump_addresses(
if (r < 0) if (r < 0)
return r; 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) { if (ifindex <= 0) {
char name[IF_NAMESIZE+1]; char name[IF_NAMESIZE+1];