revalidator: Fix ukey stats cache updating.

[sliver-openvswitch.git] / lib / bundle.h

diff --git a/lib/bundle.h b/lib/bundle.h
index 12497f7..dceb6e5 100644 (file)
--- a/lib/bundle.h
+++ b/lib/bundle.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 Nicira Networks.
+/* Copyright (c) 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,34 +21,33 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "compiler.h"
+#include "ofp-errors.h"
 #include "openflow/nicira-ext.h"
 #include "openvswitch/types.h"
 
 struct ds;
 struct flow;
+struct flow_wildcards;
+struct ofpact_bundle;
 struct ofpbuf;
 
 /* NXAST_BUNDLE helper functions.
  *
  * See include/openflow/nicira-ext.h for NXAST_BUNDLE specification. */
 
-uint16_t bundle_execute(const struct nx_action_bundle *, const struct flow *,
-                        bool (*slave_enabled)(uint16_t ofp_port, void *aux),
+ofp_port_t bundle_execute(const struct ofpact_bundle *, const struct flow *,
+                        struct flow_wildcards *wc,
+                        bool (*slave_enabled)(ofp_port_t ofp_port, void *aux),
                         void *aux);
-void bundle_execute_load(const struct nx_action_bundle *, struct flow *,
-                         bool (*slave_enabled)(uint16_t ofp_port, void *aux),
-                         void *aux);
-int bundle_check(const struct nx_action_bundle *, int max_ports,
-                 const struct flow *);
-void bundle_parse(struct ofpbuf *, const char *);
-void bundle_parse_load(struct ofpbuf *b, const char *);
-void bundle_format(const struct nx_action_bundle *, struct ds *);
-
-/* Returns the 'i'th slave in 'nab'. */
-static inline uint16_t
-bundle_get_slave(const struct nx_action_bundle *nab, size_t i)
-{
-    return ntohs(((ovs_be16 *)(nab + 1))[i]);
-}
+enum ofperr bundle_from_openflow(const struct nx_action_bundle *,
+                                 struct ofpbuf *ofpact);
+enum ofperr bundle_check(const struct ofpact_bundle *, ofp_port_t max_ports,
+                         const struct flow *);
+void bundle_to_nxast(const struct ofpact_bundle *, struct ofpbuf *of10);
+char *bundle_parse(const char *, struct ofpbuf *ofpacts) WARN_UNUSED_RESULT;
+char *bundle_parse_load(const char *, struct ofpbuf *ofpacts)
+    WARN_UNUSED_RESULT;
+void bundle_format(const struct ofpact_bundle *, struct ds *);
 
 #endif /* bundle.h */