X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.h;h=515ccd7027a2523f0e05b057b98bbf7fe946946f;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=ea28e7ba7149efcb86ad7c234c1301635d45d422;hpb=f22716dcca299b863dd72eb193fb1283c5f686da;p=sliver-openvswitch.git

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index ea28e7ba7..515ccd702 100644
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -1,33 +1,89 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc.
  *
  * 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 "compiler.h"
 
-struct ofp_match;
+struct flow;
 struct ofpbuf;
+struct ofputil_flow_mod;
+struct ofputil_flow_monitor_request;
+struct ofputil_flow_stats_request;
+struct ofputil_group_mod;
+struct ofputil_meter_mod;
+struct ofputil_table_mod;
+struct simap;
+enum ofputil_protocol;
+
+char *parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_,
+                    enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string,
+                             uint16_t command,
+                             enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_table_mod(struct ofputil_table_mod *,
+                          const char *table_id, const char *flow_miss_handling,
+                          enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_flow_mod_file(const char *file_name, uint16_t command,
+                              struct ofputil_flow_mod **fms, size_t *n_fms,
+                              enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *,
+                                       bool aggregate, const char *string,
+                                       enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofpacts(const char *, struct ofpbuf *ofpacts,
+                    enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_exact_flow(struct flow *flow, struct flow *mask, const char *s,
+                           const struct simap *portno_names);
+
+char *parse_ofp_meter_mod_str(struct ofputil_meter_mod *, const char *string,
+                              int command,
+                              enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
+
+char *parse_flow_monitor_request(struct ofputil_flow_monitor_request *,
+                                 const char *,
+                                 enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_group_mod_file(const char *file_name, uint16_t command,
+                               struct ofputil_group_mod **gms, size_t *n_gms,
+                               enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
 
-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);
+char *parse_ofp_group_mod_str(struct ofputil_group_mod *, uint16_t command,
+                              const char *string,
+                              enum ofputil_protocol *usable_protocols)
+    WARN_UNUSED_RESULT;
 
 #endif /* ofp-parse.h */