test-classifier: Use get_unaligned_u32() from unaligned.h.

[openvswitch] / lib / ofp-parse.h

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index ea28e7ba7149efcb86ad7c234c1301635d45d422..a68796e5f489010ecc16201463a456f3de31b0b9 100644 (file)
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -4,30 +4,37 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
- *  
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- *  
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
-    
+ */
+
 /* OpenFlow protocol string to flow parser. */
 
 #ifndef OFP_PARSE_H
 #define OFP_PARSE_H 1
 
 #include <stdint.h>
+#include <stdio.h>
+
+#include "classifier.h"
 
-struct ofp_match;
-struct ofpbuf;
+struct parsed_flow {
+    struct cls_rule rule;
+    uint8_t table_idx;
+    uint16_t out_port;
+    uint16_t idle_timeout;
+    uint16_t hard_timeout;
+    uint64_t cookie;
+};
 
-void parse_ofp_str(char *string, struct ofp_match *match, 
-                   struct ofpbuf *actions, uint8_t *table_idx, 
-                   uint16_t *out_port, uint16_t *priority, 
-                   uint16_t *idle_timeout, uint16_t *hard_timeout, 
-                   uint64_t *cookie);
+void parse_ofp_str(struct parsed_flow *, struct ofpbuf *actions, char *string);
+struct ofpbuf *parse_ofp_flow_mod_str(char *string, uint16_t command);
+struct ofpbuf *parse_ofp_add_flow_file(FILE *);
 
 #endif /* ofp-parse.h */