}
}
-/* Compares 'args' to those used to those used by 'dev'. Returns true
- * if the arguments are the same, false otherwise. Does not update the
- * values stored in 'dev'. */
-static bool
-compare_device_args(const struct netdev_dev *dev, const struct shash *args)
-{
- const struct shash_node **new_args;
- bool result = true;
- int i;
-
- if (shash_count(args) != dev->n_args) {
- return false;
- }
-
- new_args = shash_sort(args);
- for (i = 0; i < dev->n_args; i++) {
- if (strcmp(dev->args[i].key, new_args[i]->name) ||
- strcmp(dev->args[i].value, new_args[i]->data)) {
- result = false;
- goto finish;
- }
- }
-
-finish:
- free(new_args);
- return result;
-}
-
-static int
-compare_args(const void *a_, const void *b_)
-{
- const struct arg *a = a_;
- const struct arg *b = b_;
- return strcmp(a->key, b->key);
-}
-
void
update_device_args(struct netdev_dev *dev, const struct shash *args)
{
- struct shash_node *node;
- int i;
-
- if (dev->n_args) {
- for (i = 0; i < dev->n_args; i++) {
- free(dev->args[i].key);
- free(dev->args[i].value);
- }
-
- free(dev->args);
- dev->n_args = 0;
- }
-
- if (!args || shash_is_empty(args)) {
- return;
- }
-
- dev->n_args = shash_count(args);
- dev->args = xmalloc(dev->n_args * sizeof *dev->args);
-
- i = 0;
- SHASH_FOR_EACH(node, args) {
- dev->args[i].key = xstrdup(node->name);
- dev->args[i].value = xstrdup(node->data);
- i++;
- }
-
- qsort(dev->args, dev->n_args, sizeof *dev->args, compare_args);
+ smap_destroy(&dev->args);
+ smap_clone(&dev->args, args);
}
/* Opens the network device named 'name' (e.g. "eth0") and returns zero if
return error;
}
assert(netdev_dev->netdev_class == class);
- update_device_args(netdev_dev, options->args);
} else if (!shash_is_empty(options->args) &&
- !compare_device_args(netdev_dev, options->args)) {
+ !smap_equal(&netdev_dev->args, options->args)) {
VLOG_WARN("%s: attempted to open already open netdev with "
"different arguments", options->name);
/* Reconfigures the device 'netdev' with 'args'. 'args' may be empty
* or NULL if none are needed. */
int
-netdev_reconfigure(struct netdev *netdev, const struct shash *args)
+netdev_set_config(struct netdev *netdev, const struct shash *args)
{
struct shash empty_args = SHASH_INITIALIZER(&empty_args);
struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
args = &empty_args;
}
- if (netdev_dev->netdev_class->reconfigure) {
- if (!compare_device_args(netdev_dev, args)) {
+ if (netdev_dev->netdev_class->set_config) {
+ if (!smap_equal(&netdev_dev->args, args)) {
update_device_args(netdev_dev, args);
- return netdev_dev->netdev_class->reconfigure(netdev_dev, args);
+ return netdev_dev->netdev_class->set_config(netdev_dev, args);
}
} else if (!shash_is_empty(args)) {
- VLOG_WARN("%s: arguments provided to device that does not have a "
- "reconfigure function", netdev_get_name(netdev));
+ VLOG_WARN("%s: arguments provided to device whose configuration "
+ "cannot be changed", netdev_get_name(netdev));
}
return 0;
}
+/* Returns the current configuration for 'netdev'. This is either the
+ * configuration passed to netdev_open() or netdev_set_config(), or it is a
+ * configuration retrieved from the device itself if no configuration was
+ * passed to those functions.
+ *
+ * 'netdev' retains ownership of the returned configuration. */
+const struct shash *
+netdev_get_config(const struct netdev *netdev)
+{
+ return &netdev_get_dev(netdev)->args;
+}
+
/* Closes and destroys 'netdev'. */
void
netdev_close(struct netdev *netdev)
return netdev;
}
\f
-/* Initializes 'netdev_dev' as a netdev device named 'name' of the
- * specified 'netdev_class'.
+/* Initializes 'netdev_dev' as a netdev device named 'name' of the specified
+ * 'netdev_class'. This function is ordinarily called from a netdev provider's
+ * 'create' function.
+ *
+ * 'args' should be the arguments that were passed to the netdev provider's
+ * 'create'. If an empty set of arguments was passed, and 'name' is the name
+ * of a network device that existed before the 'create' call, then 'args' may
+ * instead be the configuration for that existing device.
*
* This function adds 'netdev_dev' to a netdev-owned shash, so it is
* very important that 'netdev_dev' only be freed after calling
* the refcount drops to zero. */
void
netdev_dev_init(struct netdev_dev *netdev_dev, const char *name,
+ const struct shash *args,
const struct netdev_class *netdev_class)
{
assert(!shash_find(&netdev_dev_shash, name));
netdev_dev->netdev_class = netdev_class;
netdev_dev->name = xstrdup(name);
netdev_dev->node = shash_add(&netdev_dev_shash, name, netdev_dev);
+ smap_clone(&netdev_dev->args, args);
}
/* Undoes the results of initialization.
assert(!netdev_dev->ref_cnt);
shash_delete(&netdev_dev_shash, netdev_dev->node);
- update_device_args(netdev_dev, NULL);
+ smap_destroy(&netdev_dev->args);
if (destroy) {
netdev_dev->netdev_class->destroy(netdev_dev);