Merge "Fixing reactive forwarding not to forward LLDP & BDDP."

@@ -132,6 +132,11 @@ public class ReactiveForwarding {
             InboundPacket pkt = context.inPacket();
             InboundPacket pkt = context.inPacket();
             Ethernet ethPkt = pkt.parsed();
             Ethernet ethPkt = pkt.parsed();
 
 
+            // Bail if this is deemed to be a control packet.
+            if (isControlPacket(ethPkt)) {
+                return;
+            }
+
             HostId id = HostId.hostId(ethPkt.getDestinationMAC());
             HostId id = HostId.hostId(ethPkt.getDestinationMAC());
 
 
             // Do not process link-local addresses in any way.
             // Do not process link-local addresses in any way.
@@ -180,6 +185,13 @@ public class ReactiveForwarding {
             // Otherwise forward and be done with it.
             // Otherwise forward and be done with it.
             installRule(context, path.src().port());
             installRule(context, path.src().port());
         }
         }
+
+    }
+
+    // Indicates whether this is a control packet, e.g. LLDP, BDDP
+    private boolean isControlPacket(Ethernet eth) {
+        short type = eth.getEtherType();
+        return type == Ethernet.TYPE_LLDP || type == Ethernet.TYPE_BSN;
     }
     }
 
 
     // Selects a path from the given set that does not lead back to the
     // Selects a path from the given set that does not lead back to the

@@ -49,7 +49,6 @@
             <plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <phase>package</phase>
                         <phase>package</phase>

@@ -49,7 +49,8 @@
         <repository>
         <repository>
             <id>onlab-temp</id>
             <id>onlab-temp</id>
             <name>ON.lab temporary repository</name>
             <name>ON.lab temporary repository</name>
-            <url>http://mavenrepo.onlab.us:8081/nexus/content/groups/public</url>
+            <url>http://mavenrepo.onlab.us:8081/nexus/content/groups/public
+            </url>
             <snapshots>
             <snapshots>
                 <enabled>true</enabled>
                 <enabled>true</enabled>
             </snapshots>
             </snapshots>
@@ -421,6 +422,12 @@
                 </plugin>
                 </plugin>
 
 
                 <plugin>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
+
+                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
                     <artifactId>findbugs-maven-plugin</artifactId>
                     <version>3.0.0</version>
                     <version>3.0.0</version>