X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.h;h=c552caa51080636f7b27c51bd4576122b430280b;hb=0d6fc641dce2da799d386879a3338617370f2a6c;hp=d55159aa6002f54411ddda761afc226b7f061af8;hpb=ec610b7bf4f4890f50c2c7d2fbfe6120ad9312f1;p=sliver-openvswitch.git

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index d55159aa6..c552caa51 100644
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 2010, 2011, 2012 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,24 +22,23 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include "openflow/nicira-ext.h"
 
-struct flow_mod;
-struct flow_stats_request;
-struct list;
 struct ofpbuf;
+struct ofputil_flow_mod;
+struct ofputil_flow_stats_request;
 
-void parse_ofp_str(struct flow_mod *, struct ofpbuf *actions, const char *str_,
+void parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_,
                    bool verbose);
 
-void parse_ofp_flow_mod_str(struct list *packets,
-                            enum nx_flow_format *cur, bool *flow_mod_table_id,
-                            char *string, uint16_t command, bool verbose);
-bool parse_ofp_flow_mod_file(struct list *packets,
-                             enum nx_flow_format *cur, bool *flow_mod_table_id,
-                             FILE *, uint16_t command);
+void parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string,
+                            uint16_t command, bool verbose);
+void parse_ofp_flow_mod_file(const char *file_name, uint16_t command,
+                             struct ofputil_flow_mod **fms, size_t *n_fms);
 
-void parse_ofp_flow_stats_request_str(struct flow_stats_request *,
-                                      bool aggregate, char *string);
+void parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *,
+                                      bool aggregate, const char *string);
+
+
+void parse_ofp_actions(const char *, struct ofpbuf *actions);
 
 #endif /* ofp-parse.h */