From 919fc9f3a21f4118f93560cecf138174515b5597 Mon Sep 17 00:00:00 2001
From: Ryan Izard <rizard@g.clemson.edu>
Date: Thu, 25 Dec 2014 17:33:28 -0500
Subject: [PATCH] Added back compile-test to the default in build.xml.

---
 build.xml                                                   | 2 +-
 .../staticflowentry/web/StaticFlowEntryPusherResource.java  | 2 +-
 src/main/java/net/floodlightcontroller/util/MatchUtils.java | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index e59e2f8d40..6c80f5411b 100644
--- a/build.xml
+++ b/build.xml
@@ -243,7 +243,7 @@
     </target>
     <target name="coverage" depends="instrument,test,coverage-report"/>
 
-    <target name="dist" depends="compile">
+    <target name="dist" depends="compile,compile-test">
         <jar destfile="${floodlight-jar}" filesetmanifest="mergewithoutmain">
             <manifest>
                 <attribute name="Main-Class" value="${main-class}"/>
diff --git a/src/main/java/net/floodlightcontroller/staticflowentry/web/StaticFlowEntryPusherResource.java b/src/main/java/net/floodlightcontroller/staticflowentry/web/StaticFlowEntryPusherResource.java
index c2cd26aa66..6c2d57ade1 100644
--- a/src/main/java/net/floodlightcontroller/staticflowentry/web/StaticFlowEntryPusherResource.java
+++ b/src/main/java/net/floodlightcontroller/staticflowentry/web/StaticFlowEntryPusherResource.java
@@ -176,7 +176,7 @@ private int checkFlow(Map<String, Object> rows) {
 			if (icmp6_type == true) {
 				//icmp_type must be set to 135/136 to set ipv6_nd_target
 				if (nd_target == true) {
-					if (!(icmp_type == 135 || icmp_type == 136)) {
+					if (!(icmp_type == 135 || icmp_type == 136)) { /* or 0x87 / 0x88 */
 						//invalid icmp6_type
 						state = 6;
 						return state;
diff --git a/src/main/java/net/floodlightcontroller/util/MatchUtils.java b/src/main/java/net/floodlightcontroller/util/MatchUtils.java
index f0828c9396..7dc1ad464a 100644
--- a/src/main/java/net/floodlightcontroller/util/MatchUtils.java
+++ b/src/main/java/net/floodlightcontroller/util/MatchUtils.java
@@ -428,7 +428,11 @@ public static Match fromString(String match, OFVersion ofVersion) throws Illegal
 				if (ver10 == true) {
 					throw new IllegalArgumentException("OF Version incompatible");
 				}
-				mb.setExact(MatchField.IPV6_FLABEL, IPv6FlowLabel.of(Integer.parseInt(key_value[1])));
+				if (key_value[1].startsWith("0x")) { 
+					mb.setExact(MatchField.IPV6_FLABEL, IPv6FlowLabel.of(Integer.parseInt(key_value[1].replaceFirst("0x", ""), 16)));
+				} else {
+					mb.setExact(MatchField.IPV6_FLABEL, IPv6FlowLabel.of(Integer.parseInt(key_value[1])));
+				}
 				break;
 //sanjivini