Prepare Open vSwitch 1.1.2 release.

[sliver-openvswitch.git] / lib / ofp-parse.h

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index ea28e7b..c8cdade 100644 (file)
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -1,33 +1,43 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011 Nicira Networks.
  *
  * 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 <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
+#include "openflow/nicira-ext.h"
 
-struct ofp_match;
+struct flow_mod;
+struct flow_stats_request;
+struct list;
 struct ofpbuf;
 
-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 flow_mod *, uint8_t *table_idx,
+                   struct ofpbuf *actions, char *string);
+
+void parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur,
+                            char *string, uint16_t command);
+bool parse_ofp_flow_mod_file(struct list *packets, enum nx_flow_format *cur,
+                             FILE *, uint16_t command);
+
+void parse_ofp_flow_stats_request_str(struct flow_stats_request *,
+                                      bool aggregate, char *string);
 
 #endif /* ofp-parse.h */