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

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index a68796e5..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.
@@ -19,22 +19,27 @@
 #ifndef OFP_PARSE_H
 #define OFP_PARSE_H 1
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include "openflow/nicira-ext.h"
 
-#include "classifier.h"
+struct list;
+struct ofpbuf;
+struct ofputil_flow_mod;
+struct ofputil_flow_stats_request;
 
-struct parsed_flow {
-    struct cls_rule rule;
-    uint8_t table_idx;
-    uint16_t out_port;
-    uint16_t idle_timeout;
-    uint16_t hard_timeout;
-    uint64_t cookie;
-};
+void parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_,
+                   bool verbose);
 
-void parse_ofp_str(struct parsed_flow *, struct ofpbuf *actions, char *string);
-struct ofpbuf *parse_ofp_flow_mod_str(char *string, uint16_t command);
-struct ofpbuf *parse_ofp_add_flow_file(FILE *);
+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 */