The calculation that this function does will need to be used in a
context where no "struct iface" is available in an upcoming commit.
Signed-off-by: Ben Pfaff <blp@nicira.com>
static void iface_configure_lacp(struct iface *, struct lacp_slave_settings *);
static void iface_create(struct bridge *, struct if_cfg *, int ofp_port);
static void iface_configure_lacp(struct iface *, struct lacp_slave_settings *);
static void iface_create(struct bridge *, struct if_cfg *, int ofp_port);
-static void iface_refresh_type(struct iface *);
+static const char *iface_get_type(const struct ovsrec_interface *,
+ const struct ovsrec_bridge *);
static void iface_destroy(struct iface *);
static struct iface *iface_lookup(const struct bridge *, const char *name);
static struct iface *iface_find(const char *name);
static void iface_destroy(struct iface *);
static struct iface *iface_lookup(const struct bridge *, const char *name);
static struct iface *iface_find(const char *name);
hmap_insert(&br->iface_by_name, &iface->name_node,
hash_string(iface->name, 0));
list_push_back(&port->ifaces, &iface->port_elem);
hmap_insert(&br->iface_by_name, &iface->name_node,
hash_string(iface->name, 0));
list_push_back(&port->ifaces, &iface->port_elem);
- iface_refresh_type(iface);
+ iface->type = iface_get_type(iface->cfg, br->cfg);
if (ofp_port >= 0) {
iface_set_ofp_port(iface, ofp_port);
}
if (ofp_port >= 0) {
iface_set_ofp_port(iface, ofp_port);
}
+ /* Update iface->cfg and iface->type in interfaces that still exist.
+ * Add new interfaces to creation queue. */
SHASH_FOR_EACH (port_node, &new_ports) {
const struct ovsrec_port *port = port_node->data;
size_t i;
SHASH_FOR_EACH (port_node, &new_ports) {
const struct ovsrec_port *port = port_node->data;
size_t i;
if (iface) {
iface->cfg = cfg;
if (iface) {
iface->cfg = cfg;
- iface_refresh_type(iface);
+ iface->type = iface_get_type(cfg, br->cfg);
} else {
bridge_queue_if_cfg(br, cfg, port);
}
} else {
bridge_queue_if_cfg(br, cfg, port);
}
\f
/* Interface functions. */
\f
/* Interface functions. */
-static void
-iface_refresh_type(struct iface *iface)
-{
- /* Determine interface type. The local port always has type
- * "internal". Other ports take their type from the database and
- * default to "system" if none is specified. */
- iface->type = (!strcmp(iface->name, iface->port->bridge->name) ? "internal"
- : iface->cfg->type[0] ? iface->cfg->type
- : "system");
+/* Returns the correct network device type for interface 'iface' in bridge
+ * 'br'. */
+static const char *
+iface_get_type(const struct ovsrec_interface *iface,
+ const struct ovsrec_bridge *br)
+{
+ /* The local port always has type "internal". Other ports take their type
+ * from the database and default to "system" if none is specified. */
+ return (!strcmp(iface->name, br->name) ? "internal"
+ : iface->type[0] ? iface->type
+ : "system");