X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.h;h=707f5d8e735a475e5575234e3b8c135a47d26608;hb=9366380ae854726888c228830301cf9a54fbee4c;hp=5ad7d20ffa7a5b46cf1f04868c10740384e51ede;hpb=049c8dc2128f3d336c4b791bb34ec806ddac6b4b;p=sliver-openvswitch.git

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index 5ad7d20ff..707f5d8e7 100644
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -19,18 +19,43 @@
 #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_meter_mod;
 
-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);
-struct ofpbuf *parse_ofp_flow_mod_str(char *string, uint16_t command);
-struct ofpbuf *parse_ofp_add_flow_file(FILE *);
+char *parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string,
+                            uint16_t command)
+    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)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *,
+                                       bool aggregate, const char *string)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofpacts(const char *, struct ofpbuf *ofpacts)
+    WARN_UNUSED_RESULT;
+
+char *parse_ofp_exact_flow(struct flow *, const char *);
+
+char *parse_ofp_meter_mod_str(struct ofputil_meter_mod *, const char *string,
+			      int command)
+    WARN_UNUSED_RESULT;
+
+char *parse_flow_monitor_request(struct ofputil_flow_monitor_request *,
+                                const char *)
+    WARN_UNUSED_RESULT;
 
 #endif /* ofp-parse.h */