From 5317a14a3f0e8266ab803310f666ffef2366e10e Mon Sep 17 00:00:00 2001 From: Sam Tannous Date: Tue, 8 Jul 2014 15:15:51 -0400 Subject: [PATCH] dcbx tlv recd are printed as log_debug 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 Signed-off-by: Sam Tannous --- src/daemon/lldp-tlv.h | 1 + src/daemon/lldp.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/daemon/lldp-tlv.h b/src/daemon/lldp-tlv.h index 1af76f58..e16d72f4 100644 --- a/src/daemon/lldp-tlv.h +++ b/src/daemon/lldp-tlv.h @@ -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 diff --git a/src/daemon/lldp.c b/src/daemon/lldp.c index d564c57f..ae01ccc5 100644 --- a/src/daemon/lldp.c +++ b/src/daemon/lldp.c @@ -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++; } -- 2.39.5