shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00
Code

Merge pull request #12629 from ssahani/networkctl

Browse Source 
networkctl: MTU enhancements
This commit is contained in:
Yu Watanabe 2019-05-22 02:35:06 +09:00 committed by GitHub
commit b94fb24b2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/sd-netlink/netlink-types.c
View File

@ -560,6 +560,8 @@ static const NLType rtnl_link_types[] = {
/*
[IFLA_PHYS_PORT_ID] = { .type = NETLINK_TYPE_BINARY, .len = MAX_PHYS_PORT_ID_LEN },
*/
[IFLA_MIN_MTU] = { .type = NETLINK_TYPE_U32 },
[IFLA_MAX_MTU] = { .type = NETLINK_TYPE_U32 },
};
static const NLTypeSystem rtnl_link_type_system = {

18
src/network/networkctl.c
View File

@ -101,9 +101,13 @@ typedef struct LinkInfo {
unsigned short iftype;
struct ether_addr mac_address;
uint32_t mtu;
uint32_t min_mtu;
uint32_t max_mtu;
bool has_mac_address:1;
bool has_mtu:1;
bool has_min_mtu:1;
bool has_max_mtu:1;
} LinkInfo;
static int link_info_compare(const LinkInfo *a, const LinkInfo *b) {
@ -154,9 +158,17 @@ static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns) {
memcmp(&info->mac_address, &ETHER_ADDR_NULL, sizeof(struct ether_addr)) != 0;
info->has_mtu =
sd_netlink_message_read_u32(m, IFLA_MTU, &info->mtu) &&
sd_netlink_message_read_u32(m, IFLA_MTU, &info->mtu) >= 0 &&
info->mtu > 0;
info->has_min_mtu =
sd_netlink_message_read_u32(m, IFLA_MIN_MTU, &info->min_mtu) >= 0 &&
info->min_mtu > 0;
info->has_max_mtu =
sd_netlink_message_read_u32(m, IFLA_MAX_MTU, &info->max_mtu) >= 0 &&
info->min_mtu > 0;
return 1;
}
@ -779,6 +791,10 @@ static int link_status_one(
if (info->has_mtu)
printf(" MTU: %" PRIu32 "\n", info->mtu);
if (info->has_min_mtu)
printf(" Minimum MTU: %" PRIu32 "\n", info->min_mtu);
if (info->has_max_mtu)
printf(" Maximum MTU: %" PRIu32 "\n", info->max_mtu);
(void) dump_addresses(rtnl, " Address: ", info->ifindex);
(void) dump_gateways(rtnl, hwdb, " Gateway: ", info->ifindex);