Fix issue when parsing MatchField actset (antrea-io#29)

Add support for parsing MatchField OXM_FIELD_ACTSET_OUTPUT in class OXM_CLASS_OPENFLOW_BASIC After switching OpenFlow 1.5, the match field "act_set" is moved from class `OXM_CLASS_EXPERIMENTER` to `OXM_CLASS_OPENFLOW_BASIC` Signed-off-by: wenyingd <[email protected]>
joyent · Nov 22, 2022 · 2ade3b2 · 2ade3b2
1 parent 3c49dad
commit 2ade3b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.9.1
+v0.9.2
diff --git a/openflow15/match.go b/openflow15/match.go
@@ -410,6 +410,8 @@ func DecodeMatchField(class uint16, field uint8, length uint8, hasMask bool, dat
 			val = new(Ipv6ExtHdrField)
 		case OXM_FIELD_TCP_FLAGS:
 			val = new(TcpFlagsField)
+		case OXM_FIELD_ACTSET_OUTPUT:
+			val = new(ActsetOutputField)
 		default:
 			err := fmt.Errorf("unhandled Field: %d in Class: %d", field, class)
 			klog.ErrorS(err, "Received bad pkt class", "data", data)
@@ -611,8 +613,6 @@ func DecodeMatchField(class uint16, field uint8, length uint8, hasMask bool, dat
 		switch field {
 		case OXM_FIELD_TCP_FLAGS:
 			val = new(TcpFlagsField)
-		case OXM_FIELD_ACTSET_OUTPUT:
-			val = new(ActsetOutputField)
 		default:
 			err := fmt.Errorf("unknown field for experimenter: %v", field)
 			klog.ErrorS(err, "Received invalid field", "data", data)
@@ -629,7 +629,7 @@ func DecodeMatchField(class uint16, field uint8, length uint8, hasMask bool, dat
 	}
 }
 
-//  ofp_match_type 1.5
+// ofp_match_type 1.5
 const (
 	MatchType_Standard = iota /* Deprecated. */
 	MatchType_OXM