X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=ea8161ffaeedbb84f99f5257973d90c2db336e65;hb=250382a8fc839cb077b2636983a1c1de0d6b0e17;hp=2aeb3f76f8023b0c7ce7cb131147e2c0fc7aaeb0;hpb=a740f0de5bec1e62dfa64173e6925e7872c66560;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 2aeb3f76..ea8161ff 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -52,12 +52,12 @@ #include "sha1.h" #include "shash.h" #include "socket-util.h" +#include "stream-ssl.h" #include "svec.h" #include "timeval.h" #include "util.h" #include "unixctl.h" #include "vconn.h" -#include "vconn-ssl.h" #include "vswitchd/vswitch-idl.h" #include "xenserver.h" #include "xtoxll.h" @@ -366,11 +366,11 @@ bridge_configure_ssl(const struct ovsrec_ssl *ssl) } if (config_string_change(ssl->private_key, &private_key_file)) { - vconn_ssl_set_private_key_file(private_key_file); + stream_ssl_set_private_key_file(private_key_file); } if (config_string_change(ssl->certificate, &certificate_file)) { - vconn_ssl_set_certificate_file(certificate_file); + stream_ssl_set_certificate_file(certificate_file); } /* We assume that even if the filename hasn't changed, if the CA cert @@ -380,7 +380,7 @@ bridge_configure_ssl(const struct ovsrec_ssl *ssl) * restarted. We may want to address this in vconn's SSL library. */ if (config_string_change(ssl->ca_cert, &cacert_file) || (cacert_file && stat(cacert_file, &s) && errno == ENOENT)) { - vconn_ssl_set_ca_cert_file(cacert_file, ssl->bootstrap_ca_cert); + stream_ssl_set_ca_cert_file(cacert_file, ssl->bootstrap_ca_cert); } } #endif @@ -517,6 +517,7 @@ iterate_and_prune_ifaces(struct bridge *br, void bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) { + struct ovsdb_idl_txn *txn; struct shash old_br, new_br; struct shash_node *node; struct bridge *br, *next; @@ -524,6 +525,8 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) COVERAGE_INC(bridge_reconfigure); + txn = ovsdb_idl_txn_create(ovs_cfg->header_.table->idl); + /* Collect old and new bridges. */ shash_init(&old_br); shash_init(&new_br); @@ -652,6 +655,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) uint64_t dpid; struct iface *local_iface; struct iface *hw_addr_iface; + char *dpid_string; bridge_fetch_dp_ifaces(br); iterate_and_prune_ifaces(br, init_iface_netdev, NULL); @@ -674,6 +678,10 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) dpid = bridge_pick_datapath_id(br, ea, hw_addr_iface); ofproto_set_datapath_id(br->ofproto, dpid); + dpid_string = xasprintf("%012"PRIx64, dpid); + ovsrec_bridge_set_datapath_id(br->cfg, dpid_string); + free(dpid_string); + /* Set NetFlow configuration on this bridge. */ if (br->cfg->netflow) { struct ovsrec_netflow *nf_cfg = br->cfg->netflow; @@ -745,19 +753,39 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) LIST_FOR_EACH (br, struct bridge, node, &all_bridges) { iterate_and_prune_ifaces(br, set_iface_properties, NULL); } + + ovsrec_open_vswitch_set_cur_cfg(ovs_cfg, ovs_cfg->next_cfg); + + ovsdb_idl_txn_commit(txn); + ovsdb_idl_txn_destroy(txn); /* XXX */ +} + +static const char * +bridge_get_other_config(const struct ovsrec_bridge *br_cfg, const char *key) +{ + size_t i; + + for (i = 0; i < br_cfg->n_other_config; i++) { + if (!strcmp(br_cfg->key_other_config[i], key)) { + return br_cfg->value_other_config[i]; + } + } + return NULL; } static void bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], struct iface **hw_addr_iface) { + const char *hwaddr; size_t i, j; int error; *hw_addr_iface = NULL; /* Did the user request a particular MAC? */ - if (br->cfg->hwaddr && eth_addr_from_string(br->cfg->hwaddr, ea)) { + hwaddr = bridge_get_other_config(br->cfg, "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)); @@ -768,9 +796,8 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], } } - /* Otherwise choose the minimum MAC address among all of the interfaces. - * (Xen uses FE:FF:FF:FF:FF:FF for virtual interfaces so this will get the - * MAC of the physical interface in such an environment.) */ + /* Otherwise choose the minimum non-local MAC address among all of the + * interfaces. */ memset(ea, 0xff, sizeof ea); for (i = 0; i < br->n_ports; i++) { struct port *port = br->ports[i]; @@ -811,11 +838,8 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], } /* The local port doesn't count (since we're trying to choose its - * MAC address anyway). Other internal ports don't count because - * we really want a physical MAC if we can get it, and internal - * ports typically have randomly generated MACs. */ - if (iface->dp_ifidx == ODPP_LOCAL - || !strcmp(iface->cfg->type, "internal")) { + * MAC address anyway). */ + if (iface->dp_ifidx == ODPP_LOCAL) { continue; } @@ -831,6 +855,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], /* Compare against our current choice. */ if (!eth_addr_is_multicast(iface_ea) && + !eth_addr_is_local(iface_ea) && !eth_addr_is_reserved(iface_ea) && !eth_addr_is_zero(iface_ea) && memcmp(iface_ea, ea, ETH_ADDR_LEN) < 0) @@ -839,7 +864,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], *hw_addr_iface = iface; } } - if (eth_addr_is_multicast(ea) || eth_addr_is_vif(ea)) { + if (eth_addr_is_multicast(ea)) { memcpy(ea, br->default_ea, ETH_ADDR_LEN); *hw_addr_iface = NULL; VLOG_WARN("bridge %s: using default bridge Ethernet " @@ -872,10 +897,11 @@ bridge_pick_datapath_id(struct bridge *br, * stable from one run to the next, so that policy set on a datapath * "sticks". */ + const char *datapath_id; uint64_t dpid; - if (br->cfg->datapath_id - && dpid_from_string(br->cfg->datapath_id, &dpid)) { + datapath_id = bridge_get_other_config(br->cfg, "datapath-id"); + if (datapath_id && dpid_from_string(datapath_id, &dpid)) { return dpid; } @@ -1232,14 +1258,21 @@ bridge_reconfigure_one(const struct ovsrec_open_vswitch *ovs_cfg, br->name, name); } } + + /* If we have a controller, then we need a local port. Complain if the + * user didn't specify one. + * + * XXX perhaps we should synthesize a port ourselves in this case. */ if (bridge_get_controller(ovs_cfg, br)) { char local_name[IF_NAMESIZE]; int error; error = dpif_port_get_name(br->dpif, ODPP_LOCAL, local_name, sizeof local_name); - if (!error) { - shash_add_once(&new_ports, local_name, NULL); + if (!error && !shash_find(&new_ports, local_name)) { + VLOG_WARN("bridge %s: controller specified but no local port " + "(port named %s) defined", + br->name, local_name); } } @@ -1423,8 +1456,6 @@ bridge_reconfigure_controller(const struct ovsrec_open_vswitch *ovs_cfg, rate_limit = c->controller_rate_limit ? *c->controller_rate_limit : 0; burst_limit = c->controller_burst_limit ? *c->controller_burst_limit : 0; ofproto_set_rate_limit(br->ofproto, rate_limit, burst_limit); - - ofproto_set_remote_execution(br->ofproto, NULL, NULL); /* XXX */ } else { union ofp_action action; flow_t flow; @@ -1507,6 +1538,13 @@ bridge_fetch_dp_ifaces(struct bridge *br) port_array_set(&br->ifaces, p->port, iface); iface->dp_ifidx = p->port; } + + if (iface->cfg) { + int64_t ofport = (iface->dp_ifidx >= 0 + ? odp_port_to_ofp_port(iface->dp_ifidx) + : -1); + ovsrec_interface_set_ofport(iface->cfg, &ofport, 1); + } } } free(dpif_ports);