X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-parse.h;h=80fca97ae450674119aacc883e90a4cc3dd4a670;hb=a5ac7299f8042c01fcdb60c5508047146baf3a16;hp=503148aeb77e409c6b7941e47fb0fa0ccfaf104f;hpb=88ca35eed0ce0bc65e45122c24e33f50e8339bb8;p=openvswitch

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index 503148ae..80fca97a 100644
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -24,17 +24,22 @@
 #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_flow_mod_str(struct list *packets, enum nx_flow_format *cur,
-                            char *string, uint16_t command);
-bool parse_ofp_add_flow_file(struct list *packets, enum nx_flow_format *cur,
-                             FILE *);
+void parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_,
+                   bool verbose);
 
-void parse_ofp_flow_stats_request_str(struct flow_stats_request *,
+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_stats_request_str(struct ofputil_flow_stats_request *,
                                       bool aggregate, char *string);
 
 #endif /* ofp-parse.h */