]> git.ipfire.org Git - thirdparty/lldpd.git/commitdiff
dcbx tlv recd are printed as log_debug
authorSam Tannous <stannous@cumulusnetworks.com>
Tue, 8 Jul 2014 19:15:51 +0000 (15:15 -0400)
committerVincent Bernat <vincent@bernat.im>
Tue, 8 Jul 2014 20:59:45 +0000 (22:59 +0200)
Changed dcbx tlv recd to be printed as log_debug
so that we dont flood daemon log (N3K sends dcbx
tlv by default.

Signed-off-by: Kanna Rajagopal <kanna@cumulusnetworks.com>
Signed-off-by: Sam Tannous <stannous@cumulusnetworks.com>
src/daemon/lldp-tlv.h
src/daemon/lldp.c

index 1af76f585116419768dcdc7b93adbc31d29d96b1..e16d72f4d2a43ee3b5b7d924dab58c84ddb66d7c 100644 (file)
@@ -36,6 +36,7 @@
 #define LLDP_TLV_ORG_DOT1      {0x00, 0x80, 0xc2}
 #define LLDP_TLV_ORG_DOT3      {0x00, 0x12, 0x0f}
 #define LLDP_TLV_ORG_MED       {0x00, 0x12, 0xbb}
+#define LLDP_TLV_ORG_DCBX      {0x00, 0x1b, 0x21}
 
 #define LLDP_TLV_DOT1_PVID     1
 #define LLDP_TLV_DOT1_PPVID    2
index d564c57f9c9e558fba5fbf13cff8df1c6d94ae0f..ae01ccc5078a00cfa6bfa1df6e4a352c98a45955 100644 (file)
@@ -482,6 +482,7 @@ lldp_decode(struct lldpd *cfg, char *frame, int s,
        const char dot1[] = LLDP_TLV_ORG_DOT1;
        const char dot3[] = LLDP_TLV_ORG_DOT3;
        const char med[] = LLDP_TLV_ORG_MED;
+       const char dcbx[] = LLDP_TLV_ORG_DCBX;
        char orgid[3];
        int length, gotend = 0, ttl_received = 0;
        int tlv_size, tlv_type, tlv_subtype;
@@ -988,8 +989,13 @@ lldp_decode(struct lldpd *cfg, char *frame, int s,
                                        hardware->h_rx_unrecognized_cnt++;
                                }
 #endif /* ENABLE_LLDPMED */
+                       } else if (memcmp(dcbx, orgid, sizeof(orgid)) == 0) {
+                               log_debug("lldp", "unsupported DCBX tlv received on %s - ignore",
+                                   hardware->h_ifname);
+                               hardware->h_rx_unrecognized_cnt++;
                        } else {
-                               log_info("lldp", "unknown org tlv received on %s",
+                               log_info("lldp", "unknown org tlv [%02x:%02x:%02x] received on %s",
+                                   orgid[0], orgid[1], orgid[2],
                                    hardware->h_ifname);
                                hardware->h_rx_unrecognized_cnt++;
                        }