}
if (arg_legend)
- printf("%3s %-16s %-10s %-11s %-10s\n", "IDX", "LINK", "TYPE", "ADMIN", "OPERATIONAL");
+ printf("%3s %-16s %-10s %-11s %-10s\n", "IDX", "LINK", "TYPE", "SETUP", "OPERATIONAL");
c = decode_and_sort_links(reply, &links);
if (c < 0)
return rtnl_log_parse_error(c);
for (i = 0; i < c; i++) {
- _cleanup_free_ char *state = NULL, *operational_state = NULL;
+ _cleanup_free_ char *setup_state = NULL, *operational_state = NULL;
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
const char *on_color_oper = "", *off_color_oper = "",
*on_color = "", *off_color = "";
char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL;
- sd_network_get_link_state(links[i].ifindex, &state);
- sd_network_get_link_operational_state(links[i].ifindex, &operational_state);
+ sd_network_link_get_setup_state(links[i].ifindex, &setup_state);
+ sd_network_link_get_operational_state(links[i].ifindex, &operational_state);
sprintf(devid, "n%i", links[i].ifindex);
d = udev_device_new_from_device_id(udev, devid);
off_color_oper = ansi_highlight_off();
}
- if (streq_ptr(state, "configured")) {
+ if (streq_ptr(setup_state, "configured")) {
on_color = ansi_highlight_green();
off_color = ansi_highlight_off();
- } else if (streq_ptr(state, "configuring")) {
+ } else if (streq_ptr(setup_state, "configuring")) {
on_color = ansi_highlight_yellow();
off_color = ansi_highlight_off();
- } else if (streq_ptr(state, "failed") ||
- streq_ptr(state, "linger")) {
+ } else if (streq_ptr(setup_state, "failed") ||
+ streq_ptr(setup_state, "linger")) {
on_color = ansi_highlight_red();
off_color = ansi_highlight_off();
}
printf("%3i %-16s %-10s %s%-11s%s %s%-10s%s\n", links[i].ifindex,
- links[i].name, strna(t), on_color, strna(state), off_color,
+ links[i].name, strna(t), on_color, strna(setup_state), off_color,
on_color_oper, strna(operational_state), off_color_oper);
}
static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
_cleanup_strv_free_ char **dns = NULL, **ntp = NULL;
- _cleanup_free_ char *state = NULL, *operational_state = NULL;
+ _cleanup_free_ char *setup_state = NULL, *operational_state = NULL;
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
char devid[2 + DECIMAL_STR_MAX(int)];
sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu);
- sd_network_get_link_state(ifindex, &state);
- sd_network_get_link_operational_state(ifindex, &operational_state);
+ sd_network_link_get_setup_state(ifindex, &setup_state);
+ sd_network_link_get_operational_state(ifindex, &operational_state);
- sd_network_get_link_dns(ifindex, &dns);
- sd_network_get_link_ntp(ifindex, &ntp);
+ sd_network_link_get_dns(ifindex, &dns);
+ sd_network_link_get_ntp(ifindex, &ntp);
sprintf(devid, "n%i", ifindex);
d = udev_device_new_from_device_id(udev, devid);
" State: %s%s%s (%s)\n",
strna(t),
on_color, strna(operational_state), off_color,
- strna(state));
+ strna(setup_state));
if (path)
printf(" Path: %s\n", path);
_cleanup_free_ char *operational_state = NULL;
_cleanup_strv_free_ char **dns = NULL, **ntp = NULL;
_cleanup_free_ struct local_address *addresses = NULL;
+ const char *on_color_oper = "", *off_color_oper = "";
int i, c;
sd_network_get_operational_state(&operational_state);
- if (operational_state)
- printf(" State: %s\n", operational_state);
+ if (streq_ptr(operational_state, "routable")) {
+ on_color_oper = ansi_highlight_green();
+ off_color_oper = ansi_highlight_off();
+ } else if (streq_ptr(operational_state, "degraded")) {
+ on_color_oper = ansi_highlight_yellow();
+ off_color_oper = ansi_highlight_off();
+ }
+
+ printf(" State: %s%s%s\n", on_color_oper, strna(operational_state), off_color_oper);
c = local_addresses(rtnl, 0, &addresses);
for (i = 0; i < c; i++) {