aboutsummaryrefslogtreecommitdiff
path: root/lib/ofp-print.h
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-06-30 10:04:09 -0700
committerBen Pfaff <blp@nicira.com>2011-06-30 10:04:09 -0700
commitb4b8c7812bdfdc5a6fda4251453d8e3409486b98 (patch)
treedf0184912e82dd6897fa4f89cfc0028033a356f4 /lib/ofp-print.h
parent8f93e93c807d3acd06fb3b367276f574164b1a9c (diff)
ofp-util: Simplify iteration through OpenFlow actions.
The existing actions_first() and actions_next() iterator functions are not much like the other iteration constructs found throughout the Open vSwitch tree. Also, they only work with actions that have already been validated, so there are cases where they cannot be used. This commit adds new macros for iterating through OpenFlow actions, one for actions that have been validated and one for actions that have not, and adapts the existing users. The following commit will further refine action parsing and add more users.
Diffstat (limited to 'lib/ofp-print.h')
-rw-r--r--lib/ofp-print.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ofp-print.h b/lib/ofp-print.h
index a362a65a..85030560 100644
--- a/lib/ofp-print.h
+++ b/lib/ofp-print.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
@@ -25,7 +25,7 @@
struct ofp_flow_mod;
struct ofp_match;
struct ds;
-struct ofp_action_header;
+union ofp_action;
#ifdef __cplusplus
extern "C" {
@@ -34,7 +34,7 @@ extern "C" {
void ofp_print(FILE *, const void *, size_t, int verbosity);
void ofp_print_packet(FILE *stream, const void *data, size_t len, size_t total_len);
-void ofp_print_actions(struct ds *, const struct ofp_action_header *, size_t);
+void ofp_print_actions(struct ds *, const union ofp_action *, size_t);
void ofp_print_match(struct ds *, const struct ofp_match *, int verbosity);
char *ofp_to_string(const void *, size_t, int verbosity);