From: Florent Fourcot <florent.fourcot@wifirst.fr>
Date: Mon, 4 Jul 2022 08:46:06 +0000 (+0200)
Subject: lldp: don't send vlan when without_vlans is set
X-Git-Tag: 1.0.15~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f5bc03e4d02472f3124cc30056a8ab91f9ba38f;p=thirdparty%2Flldpd.git

lldp: don't send vlan when without_vlans is set

Fixes: 8e9dbbf80918 "lldp: don't send VLANs when there are too many of them

On interface with a lot of vlans, we still have "Too big packet"
notification on version 1.0.14

It looks like retry does exactly the same packet than first try
---

diff --git a/src/daemon/protocols/lldp.c b/src/daemon/protocols/lldp.c
index 04cca90f..81397aaf 100644
--- a/src/daemon/protocols/lldp.c
+++ b/src/daemon/protocols/lldp.c
@@ -249,17 +249,19 @@ static int _lldp_send(struct lldpd *global,
 		}
 	}
 	/* VLANs */
-	TAILQ_FOREACH(vlan, &port->p_vlans, v_entries) {
-		vlans++;
-		if (!(
-		      POKE_START_LLDP_TLV(LLDP_TLV_ORG) &&
-		      POKE_BYTES(dot1, sizeof(dot1)) &&
-		      POKE_UINT8(LLDP_TLV_DOT1_VLANNAME) &&
-		      POKE_UINT16(vlan->v_vid) &&
-		      POKE_UINT8(strlen(vlan->v_name)) &&
-		      POKE_BYTES(vlan->v_name, strlen(vlan->v_name)) &&
-		      POKE_END_LLDP_TLV))
-			goto toobig;
+	if (!without_vlans) {
+		TAILQ_FOREACH(vlan, &port->p_vlans, v_entries) {
+			vlans++;
+			if (!(
+			      POKE_START_LLDP_TLV(LLDP_TLV_ORG) &&
+			      POKE_BYTES(dot1, sizeof(dot1)) &&
+			      POKE_UINT8(LLDP_TLV_DOT1_VLANNAME) &&
+			      POKE_UINT16(vlan->v_vid) &&
+			      POKE_UINT8(strlen(vlan->v_name)) &&
+			      POKE_BYTES(vlan->v_name, strlen(vlan->v_name)) &&
+			      POKE_END_LLDP_TLV))
+				goto toobig;
+		}
 	}
 	/* Protocol Identities */
 	TAILQ_FOREACH(pi, &port->p_pids, p_entries) {