2014-05-02 09:54:27 +03:00
|
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2013, 2014 Alexandru Copot <alex.mihai.c@gmail.com>, with support from IXIA.
|
|
|
|
|
* Copyright (c) 2013, 2014 Daniel Baluta <dbaluta@ixiacom.com>
|
2016-07-29 16:52:04 -07:00
|
|
|
|
* Copyright (c) 2014, 2015, 2016 Nicira, Inc.
|
2014-05-02 09:54:27 +03:00
|
|
|
|
*
|
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
|
* You may obtain a copy of the License at:
|
|
|
|
|
*
|
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
*
|
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
|
* limitations under the License.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef BUNDLES_H
|
|
|
|
|
#define BUNDLES_H 1
|
|
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
|
|
#include "connmgr.h"
|
2015-06-01 15:47:58 -07:00
|
|
|
|
#include "ofproto-provider.h"
|
2016-04-04 21:32:10 -04:00
|
|
|
|
#include "openvswitch/ofp-msgs.h"
|
|
|
|
|
#include "openvswitch/ofp-util.h"
|
2015-06-01 15:47:58 -07:00
|
|
|
|
#include "util.h"
|
2014-05-02 09:54:27 +03:00
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-06-01 18:07:39 -07:00
|
|
|
|
struct ofp_bundle_entry {
|
|
|
|
|
struct ovs_list node;
|
2016-07-29 16:52:04 -07:00
|
|
|
|
enum ofptype type; /* OFPTYPE_FLOW_MOD, OFPTYPE_PORT_MOD, or
|
|
|
|
|
* OFPTYPE_GROUP_MOD. */
|
2015-06-01 18:07:39 -07:00
|
|
|
|
union {
|
2016-08-15 14:57:12 -07:00
|
|
|
|
struct ofproto_flow_mod ofm;
|
ofproto: Add struct ofproto_flow_mod.
It is cleaner to not use ofp_bundle_entry for non-bundle flow mods.
To address this, the new struct ofproto_flow_mod combines an
ofputil_flow_mod and the necessary execution context for executing the
start, revert, and finish phases of the flow mod, which all were
previously members of struct ofp_bundle_entry.
This also simplifies many of the function prototypes introduced with
the OF 1.4 bundles code. However, in case of learn action execution
this approach requires a new copy of the ofputil_flow_mod. This could
be avoided by making struct ofproto_flow_mod more complex, but it
seems not worth the complication.
As part of carving out the execution context from ofp_bundle_entry to
ofproto_flow_mod, the 'version' member is now also in
ofproto_flow_mod, as it makes sense for flow mods, but not for port
mods. Now that the functions operate on the version also get the full
execution context, they use 'version' instead of
'ofproto->tables_version'. This allows ofproto->tables_version to be
changed only when a new version is committed.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2015-07-06 11:45:54 -07:00
|
|
|
|
struct ofproto_port_mod opm;
|
2016-07-29 16:52:04 -07:00
|
|
|
|
struct ofproto_group_mod ogm;
|
2015-06-01 18:07:39 -07:00
|
|
|
|
};
|
2015-06-01 15:47:58 -07:00
|
|
|
|
|
|
|
|
|
/* OpenFlow header and some of the message contents for error reporting. */
|
|
|
|
|
struct ofp_header ofp_msg[DIV_ROUND_UP(64, sizeof(struct ofp_header))];
|
2015-06-01 18:07:39 -07:00
|
|
|
|
};
|
2014-05-02 09:54:27 +03:00
|
|
|
|
|
2015-05-29 11:28:38 -07:00
|
|
|
|
enum bundle_state {
|
|
|
|
|
BS_OPEN,
|
|
|
|
|
BS_CLOSED
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ofp_bundle {
|
|
|
|
|
struct hmap_node node; /* In struct ofconn's "bundles" hmap. */
|
|
|
|
|
uint32_t id;
|
|
|
|
|
uint16_t flags;
|
|
|
|
|
enum bundle_state state;
|
|
|
|
|
|
|
|
|
|
/* List of 'struct bundle_message's */
|
|
|
|
|
struct ovs_list msg_list;
|
|
|
|
|
};
|
|
|
|
|
|
2015-06-01 18:07:39 -07:00
|
|
|
|
static inline struct ofp_bundle_entry *ofp_bundle_entry_alloc(
|
2015-06-01 15:47:58 -07:00
|
|
|
|
enum ofptype type, const struct ofp_header *oh);
|
2015-06-01 18:07:39 -07:00
|
|
|
|
static inline void ofp_bundle_entry_free(struct ofp_bundle_entry *);
|
2014-05-02 09:54:27 +03:00
|
|
|
|
|
2015-06-01 18:07:39 -07:00
|
|
|
|
enum ofperr ofp_bundle_open(struct ofconn *, uint32_t id, uint16_t flags);
|
|
|
|
|
enum ofperr ofp_bundle_close(struct ofconn *, uint32_t id, uint16_t flags);
|
|
|
|
|
enum ofperr ofp_bundle_discard(struct ofconn *, uint32_t id);
|
|
|
|
|
enum ofperr ofp_bundle_add_message(struct ofconn *, uint32_t id,
|
|
|
|
|
uint16_t flags, struct ofp_bundle_entry *);
|
2015-05-29 11:28:38 -07:00
|
|
|
|
|
2015-06-01 15:47:58 -07:00
|
|
|
|
void ofp_bundle_remove__(struct ofconn *, struct ofp_bundle *, bool success);
|
2015-06-01 18:07:39 -07:00
|
|
|
|
|
|
|
|
|
static inline struct ofp_bundle_entry *
|
2015-06-01 15:47:58 -07:00
|
|
|
|
ofp_bundle_entry_alloc(enum ofptype type, const struct ofp_header *oh)
|
2015-06-01 18:07:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct ofp_bundle_entry *entry = xmalloc(sizeof *entry);
|
2014-05-02 09:54:27 +03:00
|
|
|
|
|
2015-06-01 18:07:39 -07:00
|
|
|
|
entry->type = type;
|
2014-05-02 09:54:27 +03:00
|
|
|
|
|
2015-06-01 15:47:58 -07:00
|
|
|
|
/* Max 64 bytes for error reporting. */
|
|
|
|
|
memcpy(entry->ofp_msg, oh, MIN(ntohs(oh->length), sizeof entry->ofp_msg));
|
|
|
|
|
|
2015-06-01 18:07:39 -07:00
|
|
|
|
return entry;
|
|
|
|
|
}
|
2014-05-02 09:54:27 +03:00
|
|
|
|
|
2015-06-01 15:47:58 -07:00
|
|
|
|
static inline void
|
|
|
|
|
ofp_bundle_entry_free(struct ofp_bundle_entry *entry)
|
2015-06-01 18:07:39 -07:00
|
|
|
|
{
|
|
|
|
|
if (entry) {
|
|
|
|
|
if (entry->type == OFPTYPE_FLOW_MOD) {
|
2016-08-15 14:57:12 -07:00
|
|
|
|
ofproto_flow_mod_uninit(&entry->ofm);
|
2016-07-29 16:52:04 -07:00
|
|
|
|
} else if (entry->type == OFPTYPE_GROUP_MOD) {
|
|
|
|
|
ofputil_uninit_group_mod(&entry->ogm.gm);
|
2015-06-01 18:07:39 -07:00
|
|
|
|
}
|
|
|
|
|
free(entry);
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-05-02 09:54:27 +03:00
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#endif
|