-/* 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 *);
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);
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);
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);