#include "meta-flow.h"
#include "netdev.h"
#include "ofp-print.h"
+#include "ofp-util.h"
#include "ofpbuf.h"
#include "ofproto/ofproto.h"
#include "poll-loop.h"
static void iface_configure_lacp(struct iface *, struct lacp_slave_settings *);
static bool iface_create(struct bridge *, struct if_cfg *, int ofp_port);
+static bool iface_is_internal(const struct ovsrec_interface *iface,
+ const struct ovsrec_bridge *br);
static const char *iface_get_type(const struct ovsrec_interface *,
const struct ovsrec_bridge *);
static void iface_destroy(struct iface *);
free(dpid_string);
}
+/* Returns a bitmap of "enum ofputil_protocol"s that are allowed for use with
+ * 'br'. */
+static uint32_t
+bridge_get_allowed_versions(struct bridge *br)
+{
+ if (!br->cfg->n_protocols)
+ return 0;
+
+ return ofputil_versions_from_strings(br->cfg->protocols,
+ br->cfg->n_protocols);
+}
+
/* Set NetFlow configuration on 'br'. */
static void
bridge_configure_netflow(struct bridge *br)
* configured as the user requested, so we must destroy it. */
return false;
} else {
- /* It's the right type and configured correctly. keep it. */
+ /* It's the right type and configured correctly. Keep it. */
iface_set_ofp_port(iface, ofp_port);
return true;
}
br->name, iface_cfg->name, *ofp_portp);
}
- if (port_cfg->vlan_mode && !strcmp(port_cfg->vlan_mode, "splinter")) {
+ if ((port_cfg->vlan_mode && !strcmp(port_cfg->vlan_mode, "splinter"))
+ || iface_is_internal(iface_cfg, br->cfg)) {
netdev_turn_flags_on(netdev, NETDEV_UP, true);
}
n_ocs++;
}
- ofproto_set_controllers(br->ofproto, ocs, n_ocs, 0);
+ ofproto_set_controllers(br->ofproto, ocs, n_ocs,
+ bridge_get_allowed_versions(br));
free(ocs[0].target); /* From bridge_ofproto_controller_for_mgmt(). */
free(ocs);
\f
/* Interface functions. */
+static bool
+iface_is_internal(const struct ovsrec_interface *iface,
+ const struct ovsrec_bridge *br)
+{
+ /* The local port and "internal" ports are always "internal". */
+ return !strcmp(iface->type, "internal") || !strcmp(iface->name, br->name);
+}
+
/* Returns the correct network device type for interface 'iface' in bridge
* 'br'. */
static const char *
/* The local port always has type "internal". Other ports take
* their type from the database and default to "system" if none is
* specified. */
- if (!strcmp(iface->name, br->name)) {
+ if (iface_is_internal(iface, br)) {
type = "internal";
} else {
type = iface->type[0] ? iface->type : "system";