Bug fix WRT closed issue #471. ethertype range check for valid LLC lengths...

Bug fix WRT closed issue #471. ethertype range check for valid LLC lengths expanded to include 17-1535 inclusive and <17 as invalid.

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

@@ -582,17 +582,20 @@ IFloodlightModule, IInfoProvider {
 			return handleLldp((LLDP) bsn.getPayload(), sw, inPort, false, cntx);
 		} else if (eth.getPayload() instanceof LLDP) {
 			return handleLldp((LLDP) eth.getPayload(), sw, inPort, true, cntx);
-		} else if (eth.getEtherType() < 1500) {
-			long destMac = eth.getDestinationMACAddress().getLong();
-			if ((destMac & LINK_LOCAL_MASK) == LINK_LOCAL_VALUE) {
-				ctrLinkLocalDrops.increment();
-				if (log.isTraceEnabled()) {
-					log.trace("Ignoring packet addressed to 802.1D/Q "
-							+ "reserved address.");
-				}
-				return Command.STOP;
-			}
-		}
+		} else if (eth.getEtherType() < 1536 && eth.getEtherType() >= 17) {
+	        long destMac = eth.getDestinationMACAddress().getLong();
+	        if ((destMac & LINK_LOCAL_MASK) == LINK_LOCAL_VALUE) {
+	            ctrLinkLocalDrops.increment();
+	            if (log.isTraceEnabled()) {
+	                log.trace("Ignoring packet addressed to 802.1D/Q "
+	                        + "reserved address.");
+	            }
+	            return Command.STOP;
+	        }
+	    } else if (eth.getEtherType() < 17) {
+	        log.error("Received invalid ethertype of {}.", eth.getEtherType());
+	        return Command.STOP;
+	    }
 
 		if (ignorePacketInFromSource(eth.getSourceMACAddress())) {
 			ctrIgnoreSrcMacDrops.increment();