diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-12-21 17:29:37 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-12-21 17:30:01 +0100 |
| commit | dc8dc0cf8af15ad02fd7d836380f96dba1b44859 (patch) | |
| tree | 6ce4f2e20bb0151ca012191428b6d3bed6cf0430 | |
| parent | e6a92d5ea0e4b553a2760734da2a276b1cfcab6a (diff) | |
| download | systemd-dc8dc0cf8af15ad02fd7d836380f96dba1b44859.tar.gz | |
lldp: add 802.3 OUI subtype definitions
| -rw-r--r-- | src/libsystemd-network/test-lldp.c | 4 | ||||
| -rw-r--r-- | src/systemd/sd-lldp.h | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c index cb4545d901..b6c896f0a1 100644 --- a/src/libsystemd-network/test-lldp.c +++ b/src/libsystemd-network/test-lldp.c @@ -192,6 +192,8 @@ static void test_receive_oui_packet(sd_event *e) { 0x01, 0x02, 0xfe, 0x09, 0x00, 0x80, 0xc2, 0x07, /* Link aggregation: status 1, ID 0x00140012 */ 0x01, 0x00, 0x14, 0x00, 0x12, + 0xfe, 0x07, 0x00, 0x12, 0x0f, 0x02, /* 802.3 Power via MDI: PSE, MDI enabled */ + 0x07, 0x01, 0x00, 0x00, 0x00 /* End of LLDPDU */ }; @@ -220,6 +222,8 @@ static void test_receive_oui_packet(sd_event *e) { assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0); assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], SD_LLDP_OUI_802_1, SD_LLDP_OUI_802_1_SUBTYPE_LINK_AGGREGATION) > 0); assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0); + assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], SD_LLDP_OUI_802_3, SD_LLDP_OUI_802_3_SUBTYPE_POWER_VIA_MDI) > 0); + assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0); assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], SD_LLDP_TYPE_END) > 0); assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) == 0); diff --git a/src/systemd/sd-lldp.h b/src/systemd/sd-lldp.h index 820390afeb..13ee2d2750 100644 --- a/src/systemd/sd-lldp.h +++ b/src/systemd/sd-lldp.h @@ -107,6 +107,14 @@ enum { SD_LLDP_OUI_802_1_SUBTYPE_LINK_AGGREGATION = 7, }; +/* IEEE 802.1AB-2009 Annex F */ +enum { + SD_LLDP_OUI_802_3_SUBTYPE_MAC_PHY_CONFIG_STATUS = 1, + SD_LLDP_OUI_802_3_SUBTYPE_POWER_VIA_MDI = 2, + SD_LLDP_OUI_802_3_SUBTYPE_LINK_AGGREGATION = 3, + SD_LLDP_OUI_802_3_SUBTYPE_MAXIMUM_FRAME_SIZE = 4, +}; + typedef struct sd_lldp sd_lldp; typedef struct sd_lldp_neighbor sd_lldp_neighbor; |