diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-05-30 20:30:31 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-31 10:55:07 +0200 |
| commit | c06ff86e25db4fdb4e962baf812ed28d8d0c1050 (patch) | |
| tree | 293987d9da7865ca72373fb264c680f8c91fc99d /src/network/networkctl.c | |
| parent | Merge pull request #12705 from keszybz/varlink-json-fix-and-two-cleanups (diff) | |
| download | systemd-c06ff86e25db4fdb4e962baf812ed28d8d0c1050.tar.xz systemd-c06ff86e25db4fdb4e962baf812ed28d8d0c1050.zip | |
networkctl: do not show zero maximum MTU
Diffstat (limited to 'src/network/networkctl.c')
| -rw-r--r-- | src/network/networkctl.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 9461155e10..e769baa804 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -110,7 +110,6 @@ typedef struct LinkInfo { uint32_t rx_queues; bool has_mac_address:1; - bool has_mtu:1; bool has_tx_queues:1; bool has_rx_queues:1; } LinkInfo; @@ -162,14 +161,9 @@ static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns) { sd_netlink_message_read_ether_addr(m, IFLA_ADDRESS, &info->mac_address) >= 0 && memcmp(&info->mac_address, ÐER_ADDR_NULL, sizeof(struct ether_addr)) != 0; - info->has_mtu = - sd_netlink_message_read_u32(m, IFLA_MTU, &info->mtu) >= 0 && - info->mtu > 0; - - if (info->has_mtu) { - (void) sd_netlink_message_read_u32(m, IFLA_MIN_MTU, &info->min_mtu); - (void) sd_netlink_message_read_u32(m, IFLA_MAX_MTU, &info->max_mtu); - } + (void) sd_netlink_message_read_u32(m, IFLA_MTU, &info->mtu); + (void) sd_netlink_message_read_u32(m, IFLA_MIN_MTU, &info->min_mtu); + (void) sd_netlink_message_read_u32(m, IFLA_MAX_MTU, &info->max_mtu); info->has_rx_queues = sd_netlink_message_read_u32(m, IFLA_NUM_RX_QUEUES, &info->rx_queues) >= 0 && @@ -988,15 +982,27 @@ static int link_status_one( return r; } - if (info->has_mtu) { + if (info->mtu > 0) { + char min_str[DECIMAL_STR_MAX(uint32_t)], max_str[DECIMAL_STR_MAX(uint32_t)]; + + xsprintf(min_str, "%" PRIu32, info->min_mtu); + xsprintf(max_str, "%" PRIu32, info->max_mtu); + r = table_add_cell(table, NULL, TABLE_EMPTY, NULL); if (r < 0) return r; r = table_add_cell_full(table, NULL, TABLE_STRING, "MTU:", SIZE_MAX, SIZE_MAX, 0, 100, 0); if (r < 0) return r; - r = table_add_cell_stringf(table, NULL, "%" PRIu32 " (Minimum: %" PRIu32 ", Maximum: %" PRIu32 ")", - info->mtu, info->min_mtu, info->max_mtu); + r = table_add_cell_stringf(table, NULL, "%" PRIu32 "%s%s%s%s%s%s%s", + info->mtu, + info->min_mtu > 0 || info->max_mtu > 0 ? " (" : "", + info->min_mtu > 0 ? "Minimum: " : "", + info->min_mtu > 0 ? min_str : "", + info->min_mtu > 0 && info->max_mtu > 0 ? ", " : "", + info->max_mtu > 0 ? "Maximum: " : "", + info->max_mtu > 0 ? max_str : "", + info->min_mtu > 0 || info->max_mtu > 0 ? ")" : ""); if (r < 0) return r; } |