From: Diti Bhatia <dibhatia@cisco.com>
Date: Thu, 30 Jan 2014 20:46:22 +0000 (-0800)
Subject: Fix end of TLV in LLDP packet
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~531^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0198667e61eec4737e2deb72fcbb07d267a08a9d

Fix end of TLV in LLDP packet

Change-Id: Id4bc88bcf792758ff73f9d143481aca2a6ef3c95
Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
---

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java
index 95edca943b..6f5cf04a52 100644
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java
@@ -198,6 +198,9 @@ public class LLDP extends Packet {
         while (lldpSize > 0) {
             LLDPTLV tlv = new LLDPTLV();
             tlv.deserialize(data, lldpOffset, lldpSize);
+            if (tlv.getType() == 0 && tlv.getLength() == 0) {
+               break;
+            }
             int tlvSize = tlv.getTLVSize(); // Size of current TLV in bits
             lldpOffset += tlvSize;
             lldpSize -= tlvSize;