shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

networkctl: Add support to display vlan ID

Browse Source
This commit is contained in:
Susant Sahani 2020-03-16 14:36:26 +01:00
parent f12d19b304
commit 2b2a1ae6fb
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/networkctl.c
View File

@ -148,6 +148,9 @@ typedef struct LinkInfo {
/* vxlan info */ /* vxlan info */
VxLanInfo vxlan_info; VxLanInfo vxlan_info;
/* vlan info */
uint16_t vlan_id;
/* ethtool info */ /* ethtool info */
int autonegotiation; int autonegotiation;
uint64_t speed; uint64_t speed;
@ -239,7 +242,8 @@ static int decode_netdev(sd_netlink_message *m, LinkInfo *info) {
(void) sd_netlink_message_read_u32(m, IFLA_VXLAN_LINK, &info->vxlan_info.link); (void) sd_netlink_message_read_u32(m, IFLA_VXLAN_LINK, &info->vxlan_info.link);
(void) sd_netlink_message_read_u16(m, IFLA_VXLAN_PORT, &info->vxlan_info.dest_port); (void) sd_netlink_message_read_u16(m, IFLA_VXLAN_PORT, &info->vxlan_info.dest_port);
} } else if (streq(received_kind, "vlan"))
(void) sd_netlink_message_read_u16(m, IFLA_VLAN_ID, &info->vlan_id);
strncpy(info->netdev_kind, received_kind, IFNAMSIZ); strncpy(info->netdev_kind, received_kind, IFNAMSIZ);
@ -1427,6 +1431,13 @@ static int link_status_one(
if (r < 0) if (r < 0)
return table_log_add_error(r); return table_log_add_error(r);
} }
} else if (streq_ptr(info->netdev_kind, "vlan") && info->vlan_id > 0) {
r = table_add_many(table,
TABLE_EMPTY,
TABLE_STRING, "VLan Id:",
TABLE_UINT16, info->vlan_id);
if (r < 0)
return table_log_add_error(r);
} }
if (info->has_wlan_link_info) { if (info->has_wlan_link_info) {