Merge pull request #6151 from speakinghedge/6150-LLDP-messages-containing-padding-are-dropped

accept LLDP messages containing padding
2017-06-23 09:57:23 +02:00
parent a462478539 8c7c7100b5
commit a877b1d9a7
1 changed files with 3 additions and 4 deletions
@@ -249,10 +249,9 @@ int lldp_neighbor_parse(sd_lldp_neighbor *n) {
                                log_lldp("End marker TLV not zero-sized, ignoring datagram.");
                                return -EBADMSG;
                        }
-                        if (left != 0) {
-                                log_lldp("Trailing garbage in datagram, ignoring datagram.");
-                                return -EBADMSG;
-                        }
+
+                        /* Note that after processing the SD_LLDP_TYPE_END left could still be > 0
+                         * as the message may contain padding (see IEEE 802.1AB-2016, sec. 8.5.12) */

                        goto end_marker;