X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=6c271fb7acf80807d733d2b859b827537ff46a02;hb=998bb652ecb494af8aa38ed0ae4e653cd8dff709;hp=12bad0bb4e9159621f960dc6956c2e806348d024;hpb=abdfe47476cc1a192e329f428b3740a3fae8390d;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 12bad0bb..6c271fb7 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -57,6 +57,7 @@ #include "socket-util.h" #include "stream-ssl.h" #include "svec.h" +#include "system-stats.h" #include "timeval.h" #include "util.h" #include "unixctl.h" @@ -141,7 +142,7 @@ struct port { int updelay, downdelay; /* Delay before iface goes up/down, in ms. */ bool bond_compat_is_stale; /* Need to call port_update_bond_compat()? */ bool bond_fake_iface; /* Fake a bond interface for legacy compat? */ - long bond_next_fake_iface_update; /* Next update to fake bond stats. */ + long long int bond_next_fake_iface_update; /* Time of next update. */ int bond_rebalance_interval; /* Interval between rebalances, in ms. */ long long int bond_next_rebalance; /* Next rebalancing time. */ @@ -188,10 +189,10 @@ static struct list all_bridges = LIST_INITIALIZER(&all_bridges); /* OVSDB IDL used to obtain configuration. */ static struct ovsdb_idl *idl; -/* Each time this timer expires, the bridge fetches statistics for every - * interface and pushes them into the database. */ -#define IFACE_STATS_INTERVAL (5 * 1000) /* In milliseconds. */ -static long long int iface_stats_timer = LLONG_MIN; +/* Each time this timer expires, the bridge fetches systems and interface + * statistics and pushes them into the database. */ +#define STATS_INTERVAL (5 * 1000) /* In milliseconds. */ +static long long int stats_timer = LLONG_MIN; static struct bridge *bridge_create(const struct ovsrec_bridge *br_cfg); static void bridge_destroy(struct bridge *); @@ -244,7 +245,7 @@ static void mirror_reconfigure(struct bridge *); static void mirror_reconfigure_one(struct mirror *, struct ovsrec_mirror *); static bool vlan_is_mirrored(const struct mirror *, int vlan); -static struct iface *iface_create(struct port *port, +static struct iface *iface_create(struct port *port, const struct ovsrec_interface *if_cfg); static void iface_destroy(struct iface *); static struct iface *iface_lookup(const struct bridge *, const char *name); @@ -268,6 +269,19 @@ bridge_init(const char *remote) /* Create connection to database. */ idl = ovsdb_idl_create(remote, &ovsrec_idl_class); + ovsdb_idl_set_write_only(idl, &ovsrec_open_vswitch_col_cur_cfg); + ovsdb_idl_set_write_only(idl, &ovsrec_open_vswitch_col_statistics); + ovsdb_idl_omit(idl, &ovsrec_open_vswitch_col_external_ids); + + ovsdb_idl_omit(idl, &ovsrec_bridge_col_external_ids); + + ovsdb_idl_omit(idl, &ovsrec_port_col_external_ids); + ovsdb_idl_omit(idl, &ovsrec_port_col_fake_bridge); + + ovsdb_idl_set_write_only(idl, &ovsrec_interface_col_ofport); + ovsdb_idl_set_write_only(idl, &ovsrec_interface_col_statistics); + ovsdb_idl_omit(idl, &ovsrec_interface_col_external_ids); + /* Register unixctl commands. */ unixctl_command_register("fdb/show", bridge_unixctl_fdb_show, NULL); unixctl_command_register("bridge/dump-flows", bridge_unixctl_dump_flows, @@ -293,7 +307,7 @@ bridge_configure_once(const struct ovsrec_open_vswitch *cfg) } already_configured_once = true; - iface_stats_timer = time_msec() + IFACE_STATS_INTERVAL; + stats_timer = time_msec() + STATS_INTERVAL; /* Get all the configured bridges' names from 'cfg' into 'bridge_names'. */ svec_init(&bridge_names); @@ -344,19 +358,6 @@ bridge_configure_once(const struct ovsrec_open_vswitch *cfg) svec_destroy(&dpif_types); } -#ifdef HAVE_OPENSSL -static void -bridge_configure_ssl(const struct ovsrec_ssl *ssl) -{ - /* XXX SSL should be configurable on a per-bridge basis. */ - if (ssl) { - stream_ssl_set_private_key_file(ssl->private_key); - stream_ssl_set_certificate_file(ssl->certificate); - stream_ssl_set_ca_cert_file(ssl->ca_cert, ssl->bootstrap_ca_cert); - } -} -#endif - /* Attempt to create the network device 'iface_name' through the netdev * library. */ static int @@ -373,6 +374,20 @@ set_up_iface(const struct ovsrec_interface *iface_cfg, struct iface *iface, xstrdup(iface_cfg->value_options[i])); } + /* Include 'other_config' keys in hash of netdev options. The + * namespace of 'other_config' and 'options' must be disjoint. + * Prefer 'options' keys over 'other_config' keys. */ + for (i = 0; i < iface_cfg->n_other_config; i++) { + char *value = xstrdup(iface_cfg->value_other_config[i]); + if (!shash_add_once(&options, iface_cfg->key_other_config[i], + value)) { + VLOG_WARN("%s: \"other_config\" key %s conflicts with existing " + "\"other_config\" or \"options\" entry...ignoring", + iface_cfg->name, iface_cfg->key_other_config[i]); + free(value); + } + } + if (create) { struct netdev_options netdev_options; @@ -596,11 +611,6 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) shash_destroy(&old_br); shash_destroy(&new_br); -#ifdef HAVE_OPENSSL - /* Configure SSL. */ - bridge_configure_ssl(ovs_cfg->ssl); -#endif - /* Reconfigure all bridges. */ LIST_FOR_EACH (br, struct bridge, node, &all_bridges) { bridge_reconfigure_one(br); @@ -637,7 +647,6 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) struct odp_port *dpif_ports; size_t n_dpif_ports; struct shash cur_ifaces, want_ifaces; - struct shash_node *node; /* Get the set of interfaces currently in this datapath. */ dpif_port_list(br->dpif, &dpif_ports, &n_dpif_ports); @@ -757,7 +766,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) opts.collectors.n = nf_cfg->n_targets; opts.collectors.names = nf_cfg->targets; if (ofproto_set_netflow(br->ofproto, &opts)) { - VLOG_ERR("bridge %s: problem setting netflow collectors", + VLOG_ERR("bridge %s: problem setting netflow collectors", br->name); } } else { @@ -770,7 +779,6 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) struct ovsrec_controller **controllers; struct ofproto_sflow_options oso; size_t n_controllers; - size_t i; memset(&oso, 0, sizeof oso); @@ -1103,10 +1111,27 @@ iface_refresh_stats(struct iface *iface) ovsrec_interface_set_statistics(iface->cfg, keys, values, n); } +static void +refresh_system_stats(const struct ovsrec_open_vswitch *cfg) +{ + struct ovsdb_datum datum; + struct shash stats; + + shash_init(&stats); + get_system_stats(&stats); + + ovsdb_datum_from_shash(&datum, &stats); + ovsdb_idl_txn_write(&cfg->header_, &ovsrec_open_vswitch_col_statistics, + &datum); +} + void bridge_run(void) { + const struct ovsrec_open_vswitch *cfg; + bool datapath_destroyed; + bool database_changed; struct bridge *br; /* Let each bridge do the work that it needs to do. */ @@ -1122,8 +1147,9 @@ bridge_run(void) } /* (Re)configure if necessary. */ - if (ovsdb_idl_run(idl) || datapath_destroyed) { - const struct ovsrec_open_vswitch *cfg = ovsrec_open_vswitch_first(idl); + database_changed = ovsdb_idl_run(idl); + cfg = ovsrec_open_vswitch_first(idl); + if (database_changed || datapath_destroyed) { if (cfg) { struct ovsdb_idl_txn *txn = ovsdb_idl_txn_create(idl); @@ -1142,28 +1168,43 @@ bridge_run(void) } } - /* Refresh interface stats if necessary. */ - if (time_msec() >= iface_stats_timer) { - struct ovsdb_idl_txn *txn; +#ifdef HAVE_OPENSSL + /* Re-configure SSL. We do this on every trip through the main loop, + * instead of just when the database changes, because the contents of the + * key and certificate files can change without the database changing. */ + if (cfg && cfg->ssl) { + const struct ovsrec_ssl *ssl = cfg->ssl; - txn = ovsdb_idl_txn_create(idl); - LIST_FOR_EACH (br, struct bridge, node, &all_bridges) { - size_t i; + stream_ssl_set_key_and_cert(ssl->private_key, ssl->certificate); + stream_ssl_set_ca_cert_file(ssl->ca_cert, ssl->bootstrap_ca_cert); + } +#endif - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; - size_t j; + /* Refresh system and interface stats if necessary. */ + if (time_msec() >= stats_timer) { + if (cfg) { + struct ovsdb_idl_txn *txn; - for (j = 0; j < port->n_ifaces; j++) { - struct iface *iface = port->ifaces[j]; - iface_refresh_stats(iface); + txn = ovsdb_idl_txn_create(idl); + LIST_FOR_EACH (br, struct bridge, node, &all_bridges) { + size_t i; + + for (i = 0; i < br->n_ports; i++) { + struct port *port = br->ports[i]; + size_t j; + + for (j = 0; j < port->n_ifaces; j++) { + struct iface *iface = port->ifaces[j]; + iface_refresh_stats(iface); + } } } + refresh_system_stats(cfg); + ovsdb_idl_txn_commit(txn); + ovsdb_idl_txn_destroy(txn); /* XXX */ } - ovsdb_idl_txn_commit(txn); - ovsdb_idl_txn_destroy(txn); /* XXX */ - iface_stats_timer = time_msec() + IFACE_STATS_INTERVAL; + stats_timer = time_msec() + STATS_INTERVAL; } } @@ -1174,7 +1215,7 @@ bridge_wait(void) LIST_FOR_EACH (br, struct bridge, node, &all_bridges) { ofproto_wait(br->ofproto); - if (ofproto_has_controller(br->ofproto)) { + if (ofproto_has_primary_controller(br->ofproto)) { continue; } @@ -1182,7 +1223,7 @@ bridge_wait(void) bond_wait(br); } ovsdb_idl_wait(idl); - poll_timer_wait_until(iface_stats_timer); + poll_timer_wait_until(stats_timer); } /* Forces 'br' to revalidate all of its flows. This is appropriate when 'br''s @@ -1339,7 +1380,7 @@ bridge_unixctl_dump_flows(struct unixctl_conn *conn, { struct bridge *br; struct ds results; - + br = bridge_lookup(args); if (!br) { unixctl_command_reply(conn, 501, "Unknown bridge"); @@ -1420,7 +1461,6 @@ static void bridge_reconfigure_one(struct bridge *br) { struct shash old_ports, new_ports; - struct svec listeners, old_listeners; struct svec snoops, old_snoops; struct shash_node *node; enum ofproto_fail_mode fail_mode; @@ -1497,8 +1537,8 @@ bridge_reconfigure_one(struct bridge *br) || !strcmp(br->cfg->fail_mode, "standalone") ? OFPROTO_FAIL_STANDALONE : OFPROTO_FAIL_SECURE; - if ((ofproto_get_fail_mode(br->ofproto) != fail_mode) - && !ofproto_has_controller(br->ofproto)) { + if (ofproto_get_fail_mode(br->ofproto) != fail_mode + && !ofproto_has_primary_controller(br->ofproto)) { ofproto_flush_flows(br->ofproto); } ofproto_set_fail_mode(br->ofproto, fail_mode); @@ -1507,18 +1547,6 @@ bridge_reconfigure_one(struct bridge *br) * versa. (XXX Should we delete all flows if we are switching from one * controller to another?) */ - /* Configure OpenFlow management listener. */ - svec_init(&listeners); - svec_add_nocopy(&listeners, xasprintf("punix:%s/%s.mgmt", - ovs_rundir, br->name)); - svec_init(&old_listeners); - ofproto_get_listeners(br->ofproto, &old_listeners); - if (!svec_equal(&listeners, &old_listeners)) { - ofproto_set_listeners(br->ofproto, &listeners); - } - svec_destroy(&listeners); - svec_destroy(&old_listeners); - /* Configure OpenFlow controller connection snooping. */ svec_init(&snoops); svec_add_nocopy(&snoops, xasprintf("punix:%s/%s.snoop", @@ -1534,6 +1562,90 @@ bridge_reconfigure_one(struct bridge *br) mirror_reconfigure(br); } +/* Initializes 'oc' appropriately as a management service controller for + * 'br'. + * + * The caller must free oc->target when it is no longer needed. */ +static void +bridge_ofproto_controller_for_mgmt(const struct bridge *br, + struct ofproto_controller *oc) +{ + oc->target = xasprintf("punix:%s/%s.mgmt", ovs_rundir, br->name); + oc->max_backoff = 0; + oc->probe_interval = 60; + oc->band = OFPROTO_OUT_OF_BAND; + oc->accept_re = NULL; + oc->update_resolv_conf = false; + oc->rate_limit = 0; + oc->burst_limit = 0; +} + +/* Converts ovsrec_controller 'c' into an ofproto_controller in 'oc'. */ +static void +bridge_ofproto_controller_from_ovsrec(const struct ovsrec_controller *c, + struct ofproto_controller *oc) +{ + oc->target = c->target; + oc->max_backoff = c->max_backoff ? *c->max_backoff / 1000 : 8; + oc->probe_interval = c->inactivity_probe ? *c->inactivity_probe / 1000 : 5; + oc->band = (!c->connection_mode || !strcmp(c->connection_mode, "in-band") + ? OFPROTO_IN_BAND : OFPROTO_OUT_OF_BAND); + oc->accept_re = c->discover_accept_regex; + oc->update_resolv_conf = c->discover_update_resolv_conf; + oc->rate_limit = c->controller_rate_limit ? *c->controller_rate_limit : 0; + oc->burst_limit = (c->controller_burst_limit + ? *c->controller_burst_limit : 0); +} + +/* Configures the IP stack for 'br''s local interface properly according to the + * configuration in 'c'. */ +static void +bridge_configure_local_iface_netdev(struct bridge *br, + struct ovsrec_controller *c) +{ + struct netdev *netdev; + struct in_addr mask, gateway; + + struct iface *local_iface; + struct in_addr ip; + + /* Controller discovery does its own TCP/IP configuration later. */ + if (strcmp(c->target, "discover")) { + return; + } + + /* If there's no local interface or no IP address, give up. */ + local_iface = bridge_get_local_iface(br); + if (!local_iface || !c->local_ip || !inet_aton(c->local_ip, &ip)) { + return; + } + + /* Bring up the local interface. */ + netdev = local_iface->netdev; + netdev_turn_flags_on(netdev, NETDEV_UP, true); + + /* Configure the IP address and netmask. */ + if (!c->local_netmask + || !inet_aton(c->local_netmask, &mask) + || !mask.s_addr) { + mask.s_addr = guess_netmask(ip.s_addr); + } + if (!netdev_set_in4(netdev, ip, mask)) { + VLOG_INFO("bridge %s: configured IP address "IP_FMT", netmask "IP_FMT, + br->name, IP_ARGS(&ip.s_addr), IP_ARGS(&mask.s_addr)); + } + + /* Configure the default gateway. */ + if (c->local_gateway + && inet_aton(c->local_gateway, &gateway) + && gateway.s_addr) { + if (!netdev_add_router(netdev, gateway)) { + VLOG_INFO("bridge %s: configured gateway "IP_FMT, + br->name, IP_ARGS(&gateway.s_addr)); + } + } +} + static void bridge_reconfigure_remotes(struct bridge *br, const struct sockaddr_in *managers, @@ -1541,99 +1653,64 @@ bridge_reconfigure_remotes(struct bridge *br, { struct ovsrec_controller **controllers; size_t n_controllers; + bool had_primary; + + struct ofproto_controller *ocs; + size_t n_ocs; + size_t i; ofproto_set_extra_in_band_remotes(br->ofproto, managers, n_managers); + had_primary = ofproto_has_primary_controller(br->ofproto); n_controllers = bridge_get_controllers(br, &controllers); - if (ofproto_has_controller(br->ofproto) != (n_controllers != 0)) { - ofproto_flush_flows(br->ofproto); - } - if (!n_controllers) { - union ofp_action action; - flow_t flow; + ocs = xmalloc((n_controllers + 1) * sizeof *ocs); + n_ocs = 0; - /* Clear out controllers. */ - ofproto_set_controllers(br->ofproto, NULL, 0); - - /* If there are no controllers and the bridge is in standalone - * mode, set up a flow that matches every packet and directs - * them to OFPP_NORMAL (which goes to us). Otherwise, the - * switch is in secure mode and we won't pass any traffic until - * a controller has been defined and it tells us to do so. */ - if (ofproto_get_fail_mode(br->ofproto) == OFPROTO_FAIL_STANDALONE) { - memset(&action, 0, sizeof action); - action.type = htons(OFPAT_OUTPUT); - action.output.len = htons(sizeof action); - action.output.port = htons(OFPP_NORMAL); - memset(&flow, 0, sizeof flow); - ofproto_add_flow(br->ofproto, &flow, OVSFW_ALL, 0, &action, 1, 0); - } - } else { - struct ofproto_controller *ocs; - size_t i; + bridge_ofproto_controller_for_mgmt(br, &ocs[n_ocs++]); + for (i = 0; i < n_controllers; i++) { + struct ovsrec_controller *c = controllers[i]; - ocs = xmalloc(n_controllers * sizeof *ocs); - for (i = 0; i < n_controllers; i++) { - struct ovsrec_controller *c = controllers[i]; - struct ofproto_controller *oc = &ocs[i]; + if (!strncmp(c->target, "punix:", 6) + || !strncmp(c->target, "unix:", 5)) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - if (strcmp(c->target, "discover")) { - struct iface *local_iface; - struct in_addr ip; + /* Prevent remote ovsdb-server users from accessing arbitrary Unix + * domain sockets and overwriting arbitrary local files. */ + VLOG_ERR_RL(&rl, "%s: not adding Unix domain socket controller " + "\"%s\" due to possibility for remote exploit", + dpif_name(br->dpif), c->target); + continue; + } - local_iface = bridge_get_local_iface(br); - if (local_iface && c->local_ip - && inet_aton(c->local_ip, &ip)) { - struct netdev *netdev = local_iface->netdev; - struct in_addr mask, gateway; + bridge_configure_local_iface_netdev(br, c); + bridge_ofproto_controller_from_ovsrec(c, &ocs[n_ocs++]); + } - if (!c->local_netmask - || !inet_aton(c->local_netmask, &mask)) { - mask.s_addr = 0; - } - if (!c->local_gateway - || !inet_aton(c->local_gateway, &gateway)) { - gateway.s_addr = 0; - } + ofproto_set_controllers(br->ofproto, ocs, n_ocs); + free(ocs[0].target); /* From bridge_ofproto_controller_for_mgmt(). */ + free(ocs); - netdev_turn_flags_on(netdev, NETDEV_UP, true); - if (!mask.s_addr) { - mask.s_addr = guess_netmask(ip.s_addr); - } - if (!netdev_set_in4(netdev, ip, mask)) { - VLOG_INFO("bridge %s: configured IP address "IP_FMT", " - "netmask "IP_FMT, - br->name, IP_ARGS(&ip.s_addr), - IP_ARGS(&mask.s_addr)); - } + if (had_primary != ofproto_has_primary_controller(br->ofproto)) { + ofproto_flush_flows(br->ofproto); + } - if (gateway.s_addr) { - if (!netdev_add_router(netdev, gateway)) { - VLOG_INFO("bridge %s: configured gateway "IP_FMT, - br->name, IP_ARGS(&gateway.s_addr)); - } - } - } - } + /* If there are no controllers and the bridge is in standalone + * mode, set up a flow that matches every packet and directs + * them to OFPP_NORMAL (which goes to us). Otherwise, the + * switch is in secure mode and we won't pass any traffic until + * a controller has been defined and it tells us to do so. */ + if (!n_controllers + && ofproto_get_fail_mode(br->ofproto) == OFPROTO_FAIL_STANDALONE) { + union ofp_action action; + flow_t flow; - oc->target = c->target; - oc->max_backoff = c->max_backoff ? *c->max_backoff / 1000 : 8; - oc->probe_interval = (c->inactivity_probe - ? *c->inactivity_probe / 1000 : 5); - oc->band = (!c->connection_mode - || !strcmp(c->connection_mode, "in-band") - ? OFPROTO_IN_BAND - : OFPROTO_OUT_OF_BAND); - oc->accept_re = c->discover_accept_regex; - oc->update_resolv_conf = c->discover_update_resolv_conf; - oc->rate_limit = (c->controller_rate_limit - ? *c->controller_rate_limit : 0); - oc->burst_limit = (c->controller_burst_limit - ? *c->controller_burst_limit : 0); - } - ofproto_set_controllers(br->ofproto, ocs, n_controllers); - free(ocs); + memset(&action, 0, sizeof action); + action.type = htons(OFPAT_OUTPUT); + action.output.len = htons(sizeof action); + action.output.port = htons(OFPP_NORMAL); + memset(&flow, 0, sizeof flow); + ofproto_add_flow(br->ofproto, &flow, OVSFW_ALL, 0, &action, 1, 0); } } @@ -2314,7 +2391,7 @@ is_admissible(struct bridge *br, const flow_t *flow, bool have_packet, static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_WARN_RL(&rl, "bridge %s: received packet on unknown " - "interface %"PRIu16, br->name, flow->in_port); + "interface %"PRIu16, br->name, flow->in_port); } *in_portp = NULL; @@ -2472,11 +2549,12 @@ bridge_normal_ofhook_cb(const flow_t *flow, const struct ofpbuf *packet, struct bridge *br = br_; COVERAGE_INC(bridge_process_flow); + return process_flow(br, flow, packet, actions, tags, nf_output_iface); } static void -bridge_account_flow_ofhook_cb(const flow_t *flow, +bridge_account_flow_ofhook_cb(const flow_t *flow, tag_type tags, const union odp_action *actions, size_t n_actions, unsigned long long int n_bytes, void *br_) @@ -2484,20 +2562,24 @@ bridge_account_flow_ofhook_cb(const flow_t *flow, struct bridge *br = br_; const union odp_action *a; struct port *in_port; - tag_type tags = 0; + tag_type dummy = 0; int vlan; - /* Feed information from the active flows back into the learning table - * to ensure that table is always in sync with what is actually flowing - * through the datapath. */ - if (is_admissible(br, flow, false, &tags, &vlan, &in_port)) { + /* Feed information from the active flows back into the learning table to + * ensure that table is always in sync with what is actually flowing + * through the datapath. + * + * We test that 'tags' is nonzero to ensure that only flows that include an + * OFPP_NORMAL action are used for learning. This works because + * bridge_normal_ofhook_cb() always sets a nonzero tag value. */ + if (tags && is_admissible(br, flow, false, &dummy, &vlan, &in_port)) { update_learning_table(br, flow, vlan, in_port); } + /* Account for bond slave utilization. */ if (!br->has_bonded_ports) { return; } - for (a = actions; a < &actions[n_actions]; a++) { if (a->type == ODPAT_OUTPUT) { struct port *out_port = port_from_dp_ifidx(br, a->output.port); @@ -2770,7 +2852,6 @@ bond_rebalance_port(struct port *port) * smallest hashes instead of the biggest ones. There is little * reason behind this decision; we could use the opposite sort * order to shift away big hashes ahead of small ones. */ - size_t i; bool order_swapped; for (i = 0; i < from->n_hashes; i++) { @@ -3288,7 +3369,7 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) if (port->updelay < 0) { port->updelay = 0; } - port->updelay = cfg->bond_downdelay; + port->downdelay = cfg->bond_downdelay; if (port->downdelay < 0) { port->downdelay = 0; } @@ -3355,7 +3436,6 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) trunks = NULL; if (vlan < 0 && cfg->n_trunks) { size_t n_errors; - size_t i; trunks = bitmap_allocate(4096); n_errors = 0; @@ -3518,15 +3598,15 @@ port_update_bond_compat(struct port *port) /* We need to make the same determination as the Linux bonding * code to determine whether a slave should be consider "up". - * The Linux function bond_miimon_inspect() supports four + * The Linux function bond_miimon_inspect() supports four * BOND_LINK_* states: - * + * * - BOND_LINK_UP: carrier detected, updelay has passed. * - BOND_LINK_FAIL: carrier lost, downdelay in progress. * - BOND_LINK_DOWN: carrier lost, downdelay has passed. * - BOND_LINK_BACK: carrier detected, updelay in progress. * - * The function bond_info_show_slave() only considers BOND_LINK_UP + * The function bond_info_show_slave() only considers BOND_LINK_UP * to be "up" and anything else to be "down". */ slave->up = iface->enabled && iface->delay_expires == LLONG_MAX;