Compare commits

...

4 Commits

Author SHA1 Message Date
Anita Zhang a4f4a4e441
Merge pull request #15138 from ssahani/networkctl-vlan
networkctl: Add support to display vlan ID
2020-03-16 12:56:07 -07:00
Anita Zhang 272e6b8c62
Merge pull request #15139 from DaanDeMeyer/sd-bus-remove-unused-cite
sd-bus: Remove unused man cite of `sd_bus_slot_new_signal`.
2020-03-16 12:50:26 -07:00
Daan De Meyer aff618c769 sd-bus: Remove unused man cite of `sd_bus_slot_new_signal`. 2020-03-16 19:52:40 +01:00
Susant Sahani 2b2a1ae6fb networkctl: Add support to display vlan ID 2020-03-16 15:33:16 +01:00
2 changed files with 12 additions and 2 deletions

View File

@ -99,7 +99,6 @@
<citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_message_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_slot_new_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_call_method_async</refentrytitle><manvolnum>3</manvolnum></citerefentry>
</para>
</refsect1>

View File

@ -149,6 +149,9 @@ typedef struct LinkInfo {
/* vxlan info */
VxLanInfo vxlan_info;
/* vlan info */
uint16_t vlan_id;
/* ethtool info */
int autonegotiation;
uint64_t speed;
@ -240,7 +243,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_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);
@ -1439,6 +1443,13 @@ static int link_status_one(
if (r < 0)
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) {