-/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
static void bridge_add_ports(struct bridge *,
const struct shash *wanted_ports);
-static void bridge_configure_flow_miss_model(const char *opt);
static void bridge_configure_datapath_id(struct bridge *);
static void bridge_configure_netflow(struct bridge *);
static void bridge_configure_forward_bpdu(struct bridge *);
static struct iface *iface_find(const char *name);
static struct iface *iface_from_ofp_port(const struct bridge *,
ofp_port_t ofp_port);
-static void iface_set_mac(struct iface *, const uint8_t *);
+static void iface_set_mac(const struct bridge *, const struct port *, struct iface *);
static void iface_set_ofport(const struct ovsrec_interface *, ofp_port_t ofport);
static void iface_clear_db_record(const struct ovsrec_interface *if_cfg);
static void iface_configure_qos(struct iface *, const struct ovsrec_qos *);
managers = xmalloc(sset_count(&targets) * sizeof *managers);
SSET_FOR_EACH (target, &targets) {
- struct sockaddr_in *sin = &managers[n_managers];
+ struct sockaddr_storage ss;
- if (stream_parse_target_with_default_port(target,
- OVSDB_OLD_PORT,
- sin)) {
- n_managers++;
+ if (stream_parse_target_with_default_port(target, OVSDB_OLD_PORT,
+ &ss)
+ && ss.ss_family == AF_INET) {
+ managers[n_managers++] = *(struct sockaddr_in *) &ss;
}
}
}
smap_get_int(&ovs_cfg->other_config, "n-handler-threads", 0),
smap_get_int(&ovs_cfg->other_config, "n-revalidator-threads", 0));
- bridge_configure_flow_miss_model(smap_get(&ovs_cfg->other_config,
- "force-miss-model"));
-
/* Destroy "struct bridge"s, "struct port"s, and "struct iface"s according
* to 'ovs_cfg', with only very minimal configuration otherwise.
*
port_configure(port);
LIST_FOR_EACH (iface, port_elem, &port->ifaces) {
+ iface_set_ofport(iface->cfg, iface->ofp_port);
iface_configure_cfm(iface);
iface_configure_qos(iface, port->cfg->qos);
- iface_set_mac(iface, port->cfg->fake_bridge ? br->ea : NULL);
+ iface_set_mac(br, port, iface);
ofproto_port_set_bfd(br->ofproto, iface->ofp_port,
&iface->cfg->bfd);
}
free(s.lacp_slaves);
}
-static void
-bridge_configure_flow_miss_model(const char *opt)
-{
- enum ofproto_flow_miss_model model = OFPROTO_HANDLE_MISS_AUTO;
-
- if (opt) {
- if (!strcmp(opt, "with-facets")) {
- model = OFPROTO_HANDLE_MISS_WITH_FACETS;
- } else if (!strcmp(opt, "without-facets")) {
- model = OFPROTO_HANDLE_MISS_WITHOUT_FACETS;
- }
- }
-
- ofproto_set_flow_miss_model(model);
-}
-
/* Pick local port hardware address and datapath ID for 'br'. */
static void
bridge_configure_datapath_id(struct bridge *br)
ovs_assert(!iface_lookup(br, iface_cfg->name));
error = iface_do_create(br, iface_cfg, port_cfg, &ofp_port, &netdev);
if (error) {
- iface_set_ofport(iface_cfg, OFPP_NONE);
iface_clear_db_record(iface_cfg);
return false;
}
hmap_insert(&br->ifaces, &iface->ofp_port_node,
hash_ofp_port(ofp_port));
- iface_set_ofport(iface->cfg, ofp_port);
-
/* Populate initial status in database. */
iface_refresh_stats(iface);
iface_refresh_status(iface);
}
static void
-bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN],
- struct iface **hw_addr_iface)
+find_local_hw_addr(const struct bridge *br, uint8_t ea[ETH_ADDR_LEN],
+ const struct port *fake_br, struct iface **hw_addr_iface)
{
struct hmapx mirror_output_ports;
- const char *hwaddr;
struct port *port;
bool found_addr = false;
int error;
int i;
- *hw_addr_iface = NULL;
-
- /* Did the user request a particular MAC? */
- hwaddr = smap_get(&br->cfg->other_config, "hwaddr");
- if (hwaddr && eth_addr_from_string(hwaddr, ea)) {
- if (eth_addr_is_multicast(ea)) {
- VLOG_ERR("bridge %s: cannot set MAC address to multicast "
- "address "ETH_ADDR_FMT, br->name, ETH_ADDR_ARGS(ea));
- } else if (eth_addr_is_zero(ea)) {
- VLOG_ERR("bridge %s: cannot set MAC address to zero", br->name);
- } else {
- return;
- }
- }
-
/* Mirror output ports don't participate in picking the local hardware
* address. ofproto can't help us find out whether a given port is a
* mirror output because we haven't configured mirrors yet, so we need to
continue;
}
+ /* For fake bridges we only choose from ports with the same tag */
+ if (fake_br && fake_br->cfg && fake_br->cfg->tag) {
+ if (!port->cfg->tag) {
+ continue;
+ }
+ if (*port->cfg->tag != *fake_br->cfg->tag) {
+ continue;
+ }
+ }
+
/* Grab MAC. */
error = netdev_get_etheraddr(iface->netdev, iface_ea);
if (error) {
hmapx_destroy(&mirror_output_ports);
}
+static void
+bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN],
+ struct iface **hw_addr_iface)
+{
+ const char *hwaddr;
+ *hw_addr_iface = NULL;
+
+ /* Did the user request a particular MAC? */
+ hwaddr = smap_get(&br->cfg->other_config, "hwaddr");
+ if (hwaddr && eth_addr_from_string(hwaddr, ea)) {
+ if (eth_addr_is_multicast(ea)) {
+ VLOG_ERR("bridge %s: cannot set MAC address to multicast "
+ "address "ETH_ADDR_FMT, br->name, ETH_ADDR_ARGS(ea));
+ } else if (eth_addr_is_zero(ea)) {
+ VLOG_ERR("bridge %s: cannot set MAC address to zero", br->name);
+ } else {
+ return;
+ }
+ }
+
+ /* Find a local hw address */
+ find_local_hw_addr(br, ea, NULL, hw_addr_iface);
+}
+
/* Choose and returns the datapath ID for bridge 'br' given that the bridge
* Ethernet address is 'bridge_ea'. If 'bridge_ea' is the Ethernet address of
* an interface on 'br', then that interface must be passed in as
/* If there's no local interface or no IP address, give up. */
local_iface = iface_from_ofp_port(br, OFPP_LOCAL);
- if (!local_iface || !c->local_ip || !inet_aton(c->local_ip, &ip)) {
+ if (!local_iface || !c->local_ip
+ || !inet_pton(AF_INET, c->local_ip, &ip)) {
return;
}
/* Configure the IP address and netmask. */
if (!c->local_netmask
- || !inet_aton(c->local_netmask, &mask)
+ || !inet_pton(AF_INET, c->local_netmask, &mask)
|| !mask.s_addr) {
mask.s_addr = guess_netmask(ip.s_addr);
}
/* Configure the default gateway. */
if (c->local_gateway
- && inet_aton(c->local_gateway, &gateway)
+ && inet_pton(AF_INET, c->local_gateway, &gateway)
&& gateway.s_addr) {
if (!netdev_add_router(netdev, gateway)) {
VLOG_INFO("bridge %s: configured gateway "IP_FMT,
/* Set Ethernet address of 'iface', if one is specified in the configuration
* file. */
static void
-iface_set_mac(struct iface *iface, const uint8_t *mac)
+iface_set_mac(const struct bridge *br, const struct port *port, struct iface *iface)
{
- uint8_t ea[ETH_ADDR_LEN];
+ uint8_t ea[ETH_ADDR_LEN], *mac = NULL;
+ struct iface *hw_addr_iface;
if (strcmp(iface->type, "internal")) {
return;
if (iface->cfg->mac && eth_addr_from_string(iface->cfg->mac, ea)) {
mac = ea;
+ } else if (port->cfg->fake_bridge) {
+ /* Fake bridge and no MAC set in the configuration. Pick a local one. */
+ find_local_hw_addr(br, ea, port, &hw_addr_iface);
+ mac = ea;
}
if (mac) {
iface_clear_db_record(const struct ovsrec_interface *if_cfg)
{
if (!ovsdb_idl_row_is_synthetic(&if_cfg->header_)) {
+ iface_set_ofport(if_cfg, OFPP_NONE);
ovsrec_interface_set_status(if_cfg, NULL);
ovsrec_interface_set_admin_state(if_cfg, NULL);
ovsrec_interface_set_duplex(if_cfg, NULL);