/*
- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
-#include "openflow/nicira-ext.h"
-struct flow_mod;
-struct flow_stats_request;
-struct list;
+struct flow;
struct ofpbuf;
+struct ofputil_flow_mod;
+struct ofputil_flow_monitor_request;
+struct ofputil_flow_stats_request;
-void parse_ofp_str(struct flow_mod *, int command, 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_ofpacts(const char *, struct ofpbuf *ofpacts);
+
+char *parse_ofp_exact_flow(struct flow *, const char *);
+
+void parse_flow_monitor_request(struct ofputil_flow_monitor_request *,
+ const char *);
#endif /* ofp-parse.h */