projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-1.6.0 (1.6.90).
[openvswitch]
/
lib
/
ofp-parse.h
diff --git
a/lib/ofp-parse.h
b/lib/ofp-parse.h
index d55159aa6002f54411ddda761afc226b7f061af8..6eba0dda0f41405cdd12e5f4fc890436708e2218 100644
(file)
--- 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,12
+24,12
@@
#include <stdio.h>
#include "openflow/nicira-ext.h"
#include <stdio.h>
#include "openflow/nicira-ext.h"
-struct flow_mod;
-struct flow_stats_request;
struct list;
struct ofpbuf;
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,
bool verbose);
void parse_ofp_flow_mod_str(struct list *packets,
@@
-39,7
+39,10
@@
bool parse_ofp_flow_mod_file(struct list *packets,
enum nx_flow_format *cur, bool *flow_mod_table_id,
FILE *, uint16_t command);
enum nx_flow_format *cur, bool *flow_mod_table_id,
FILE *, uint16_t command);
-void parse_ofp_flow_stats_request_str(struct flow_stats_request *,
+void parse_ofp_flow_stats_request_str(struct
ofputil_
flow_stats_request *,
bool aggregate, char *string);
bool aggregate, char *string);
+
+void parse_ofp_actions(const char *, struct ofpbuf *actions);
+
#endif /* ofp-parse.h */
#endif /* ofp-parse.h */