X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=fab619470fd3415cbb43bd58a60ddcab1a3f4710;hb=fca2ffb3a05ed8f04121781a56c75e80611b6f8d;hp=0f8570937367ceb3c2f0affb1b005dec3a30282c;hpb=b0ec0f279ea4537cb421eba807254aba8f1971f2;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 0f857093..fab61947 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -373,34 +373,22 @@ bridge_configure_once(const struct ovsrec_open_vswitch *cfg) svec_init(&dpif_types); dp_enumerate_types(&dpif_types); for (i = 0; i < dpif_types.n; i++) { - struct dpif *dpif; - int retval; size_t j; dp_enumerate_names(dpif_types.names[i], &dpif_names); - /* For each dpif... */ + /* Delete each dpif whose name is not in 'bridge_names'. */ for (j = 0; j < dpif_names.n; j++) { - retval = dpif_open(dpif_names.names[j], dpif_types.names[i], &dpif); - if (!retval) { - struct svec all_names; - size_t k; - - /* ...check whether any of its names is in 'bridge_names'. */ - svec_init(&all_names); - dpif_get_all_names(dpif, &all_names); - for (k = 0; k < all_names.n; k++) { - if (svec_contains(&bridge_names, all_names.names[k])) { - goto found; - } + if (!svec_contains(&bridge_names, dpif_names.names[j])) { + struct dpif *dpif; + int retval; + + retval = dpif_open(dpif_names.names[j], dpif_types.names[i], + &dpif); + if (!retval) { + dpif_delete(dpif); + dpif_close(dpif); } - - /* No. Delete the dpif. */ - dpif_delete(dpif); - - found: - svec_destroy(&all_names); - dpif_close(dpif); } } } @@ -608,16 +596,16 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) LIST_FOR_EACH (br, node, &all_bridges) { struct dpif_port_dump dump; struct shash want_ifaces; - struct odp_port odp_port; + struct dpif_port dpif_port; bridge_get_all_ifaces(br, &want_ifaces); - DPIF_PORT_FOR_EACH (&odp_port, &dump, br->dpif) { - if (!shash_find(&want_ifaces, odp_port.devname) - && strcmp(odp_port.devname, br->name)) { - int retval = dpif_port_del(br->dpif, odp_port.port); + DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { + if (!shash_find(&want_ifaces, dpif_port.name) + && strcmp(dpif_port.name, br->name)) { + int retval = dpif_port_del(br->dpif, dpif_port.port_no); if (retval) { VLOG_ERR("failed to remove %s interface from %s: %s", - odp_port.devname, dpif_name(br->dpif), + dpif_port.name, dpif_name(br->dpif), strerror(retval)); } } @@ -625,21 +613,16 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) shash_destroy(&want_ifaces); } LIST_FOR_EACH (br, node, &all_bridges) { - struct dpif_port { - char *type; /* Network device type, e.g. "system". */ - uint32_t port_no; /* Port number within datapath. */ - }; struct shash cur_ifaces, want_ifaces; struct dpif_port_dump dump; - struct odp_port odp_port; + struct dpif_port dpif_port; /* Get the set of interfaces currently in this datapath. */ shash_init(&cur_ifaces); - DPIF_PORT_FOR_EACH (&odp_port, &dump, br->dpif) { + DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { struct dpif_port *port_info = xmalloc(sizeof *port_info); - port_info->port_no = odp_port.port; - port_info->type = xstrdup(odp_port.type); - shash_add(&cur_ifaces, odp_port.devname, port_info); + dpif_port_clone(port_info, &dpif_port); + shash_add(&cur_ifaces, dpif_port.name, port_info); } /* Get the set of interfaces we want on this datapath. */ @@ -733,7 +716,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) shash_from_ovs_idl_map(iface->cfg->key_options, iface->cfg->value_options, iface->cfg->n_options, &args); - netdev_reconfigure(iface->netdev, &args); + netdev_set_config(iface->netdev, &args); shash_destroy(&args); } } @@ -741,7 +724,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) SHASH_FOR_EACH (node, &cur_ifaces) { struct dpif_port *port_info = node->data; - free(port_info->type); + dpif_port_destroy(port_info); free(port_info); } shash_destroy(&cur_ifaces); @@ -2041,7 +2024,7 @@ static void bridge_fetch_dp_ifaces(struct bridge *br) { struct dpif_port_dump dump; - struct odp_port odp_port; + struct dpif_port dpif_port; size_t i, j; /* Reset all interface numbers. */ @@ -2054,17 +2037,17 @@ bridge_fetch_dp_ifaces(struct bridge *br) } hmap_clear(&br->ifaces); - DPIF_PORT_FOR_EACH (&odp_port, &dump, br->dpif) { - struct iface *iface = iface_lookup(br, odp_port.devname); + DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { + struct iface *iface = iface_lookup(br, dpif_port.name); if (iface) { if (iface->dp_ifidx >= 0) { VLOG_WARN("%s reported interface %s twice", - dpif_name(br->dpif), odp_port.devname); - } else if (iface_from_dp_ifidx(br, odp_port.port)) { + dpif_name(br->dpif), dpif_port.name); + } else if (iface_from_dp_ifidx(br, dpif_port.port_no)) { VLOG_WARN("%s reported interface %"PRIu16" twice", - dpif_name(br->dpif), odp_port.port); + dpif_name(br->dpif), dpif_port.port_no); } else { - iface->dp_ifidx = odp_port.port; + iface->dp_ifidx = dpif_port.port_no; hmap_insert(&br->ifaces, &iface->dp_ifidx_node, hash_int(iface->dp_ifidx, 0)); } @@ -2648,16 +2631,16 @@ compose_actions(struct bridge *br, const struct flow *flow, uint16_t vlan, const struct dst *dst = &set.dsts[i]; if (dst->vlan != cur_vlan) { if (dst->vlan == OFP_VLAN_NONE) { - nl_msg_put_flag(actions, ODPAT_STRIP_VLAN); + nl_msg_put_flag(actions, ODP_ACTION_ATTR_STRIP_VLAN); } else { ovs_be16 tci; tci = htons(dst->vlan & VLAN_VID_MASK); tci |= flow->vlan_tci & htons(VLAN_PCP_MASK); - nl_msg_put_be16(actions, ODPAT_SET_DL_TCI, tci); + nl_msg_put_be16(actions, ODP_ACTION_ATTR_SET_DL_TCI, tci); } cur_vlan = dst->vlan; } - nl_msg_put_u32(actions, ODPAT_OUTPUT, dst->dp_ifidx); + nl_msg_put_u32(actions, ODP_ACTION_ATTR_OUTPUT, dst->dp_ifidx); } dst_set_free(&set); } @@ -2951,7 +2934,7 @@ bridge_account_flow_ofhook_cb(const struct flow *flow, tag_type tags, return; } NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) { - if (nl_attr_type(a) == ODPAT_OUTPUT) { + if (nl_attr_type(a) == ODP_ACTION_ATTR_OUTPUT) { struct port *out_port = port_from_dp_ifidx(br, nl_attr_get_u32(a)); if (out_port && out_port->n_ifaces >= 2 && out_port->bond_mode == BM_SLB) {