X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-parse.h;h=6eba0dda0f41405cdd12e5f4fc890436708e2218;hb=dd1ba5b3f4425c8eba008d1a93b044da63466812;hp=ac8e6d2f1035eed3f579787a8e2921930fed725f;hpb=15f1f1b63ab5514f8dfafa8f4c90ecee44693e1d;p=openvswitch

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index ac8e6d2f..6eba0dda 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 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,18 +19,30 @@
 #ifndef OFP_PARSE_H
 #define OFP_PARSE_H 1
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include "openflow/nicira-ext.h"
 
-struct ofp_match;
+struct list;
 struct ofpbuf;
+struct ofputil_flow_mod;
+struct ofputil_flow_stats_request;
 
-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_add_flow_str(char *string);
-struct ofpbuf *parse_ofp_add_flow_file(FILE *);
+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_stats_request_str(struct ofputil_flow_stats_request *,
+                                      bool aggregate, char *string);
+
+
+void parse_ofp_actions(const char *, struct ofpbuf *actions);
 
 #endif /* ofp-parse.h */