return 0;
}
+enum {
+ ALIAS_ATTR_ALIAS,
+ ALIAS_ATTR_DEV,
+ __ALIAS_ATTR_MAX,
+};
+
+static const struct blobmsg_policy alias_attrs[__ALIAS_ATTR_MAX] = {
+ [ALIAS_ATTR_ALIAS] = { "alias", BLOBMSG_TYPE_ARRAY },
+ [ALIAS_ATTR_DEV] = { "device", BLOBMSG_TYPE_STRING },
+};
+
+static int
+netifd_handle_alias(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct device *dev = NULL;
+ struct blob_attr *tb[__ALIAS_ATTR_MAX];
+ struct blob_attr *cur;
+ int rem;
+
+ blobmsg_parse(alias_attrs, __ALIAS_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+
+ if (!tb[ALIAS_ATTR_ALIAS])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ if ((cur = tb[ALIAS_ATTR_DEV]) != NULL) {
+ dev = device_get(blobmsg_data(cur), true);
+ if (!dev)
+ return UBUS_STATUS_NOT_FOUND;
+ }
+
+ blobmsg_for_each_attr(cur, tb[ALIAS_ATTR_ALIAS], rem) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+ goto error;
+
+ if (!blobmsg_check_attr(cur, NULL))
+ goto error;
+
+ alias_notify_device(blobmsg_data(cur), dev);
+ }
+ return 0;
+
+error:
+ device_free_unused(dev);
+ return UBUS_STATUS_INVALID_ARGUMENT;
+}
+
static struct ubus_method dev_object_methods[] = {
- UBUS_METHOD("status", netifd_dev_status, dev_policy)
+ UBUS_METHOD("status", netifd_dev_status, dev_policy),
+ UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
};
static struct ubus_object_type dev_object_type =
struct blob_attr *msg)
{
struct interface *iface;
+ struct device *dev;
iface = container_of(obj, struct interface, ubus);
blobmsg_add_string(&b, "l3_device", iface->l3_dev->dev->ifname);
}
- if (!(iface->proto_handler->flags & PROTO_FLAG_NODEV))
- blobmsg_add_string(&b, "device", iface->main_dev.dev->ifname);
+ dev = iface->main_dev.dev;
+ if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
+ blobmsg_add_string(&b, "device", dev->ifname);
if (!list_is_empty(&iface->errors))
netifd_add_interface_errors(&b, iface);
struct blob_attr *msg)
{
struct interface *iface;
- struct device *dev, *main_dev;
+ struct device *dev, *main_dev = NULL;
struct blob_attr *tb[__DEV_MAX];
bool add = !strncmp(method, "add", 3);
+ const char *devname;
int ret;
iface = container_of(obj, struct interface, ubus);
if (!tb[DEV_NAME])
return UBUS_STATUS_INVALID_ARGUMENT;
- main_dev = iface->main_dev.dev;
- if (!main_dev)
- return UBUS_STATUS_NOT_FOUND;
+ devname = blobmsg_data(tb[DEV_NAME]);
- if (!main_dev->hotplug_ops)
- return UBUS_STATUS_NOT_SUPPORTED;
+ device_lock();
- dev = device_get(blobmsg_data(tb[DEV_NAME]), add);
- if (!dev)
- return UBUS_STATUS_NOT_FOUND;
+ if (iface->main_dev.hotplug) {
+ dev = iface->main_dev.dev;
+
+ if (dev) {
+ if (!add && strcmp(dev->ifname, devname) != 0) {
+ ret = UBUS_STATUS_INVALID_ARGUMENT;
+ goto out;
+ }
+
+ interface_set_available(iface, false);
+ device_remove_user(&iface->main_dev);
+ }
+ } else
+ main_dev = iface->main_dev.dev;
+
+ dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
+ if (!dev && (main_dev || add)) {
+ ret = UBUS_STATUS_NOT_FOUND;
+ goto out;
+ }
+
+ if (!main_dev) {
+ if (add) {
+ device_add_user(&iface->main_dev, dev);
+ iface->main_dev.hotplug = true;
+ }
+ ret = 0;
+ goto out;
+ }
+
+ if (!main_dev->hotplug_ops) {
+ ret = UBUS_STATUS_NOT_SUPPORTED;
+ goto out;
+ }
if (main_dev != dev) {
if (add)
ret = UBUS_STATUS_INVALID_ARGUMENT;
}
- if (add)
- device_free_unused(dev);
+out:
+ device_unlock();
return ret;
}
return 0;
}
+static int
+netifd_handle_iface_prepare(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct interface *iface;
+ struct device *dev;
+ const struct device_hotplug_ops *ops;
+
+ iface = container_of(obj, struct interface, ubus);
+ dev = iface->main_dev.dev;
+ if (!dev)
+ return 0;
+
+ ops = dev->hotplug_ops;
+ if (!ops)
+ return 0;
+
+ return ops->prepare(dev);
+}
+
static struct ubus_method iface_object_methods[] = {
{ .name = "up", .handler = netifd_handle_up },
{ .name = "down", .handler = netifd_handle_down },
{ .name = "status", .handler = netifd_handle_status },
- { .name = "add_device", .handler = netifd_iface_handle_device,
- .policy = dev_policy, .n_policy = __DEV_MAX },
- { .name = "remove_device", .handler = netifd_iface_handle_device,
- .policy = dev_policy, .n_policy = __DEV_MAX },
+ { .name = "prepare", .handler = netifd_handle_iface_prepare },
+ UBUS_METHOD("add_device", netifd_iface_handle_device, dev_policy ),
+ UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_policy ),
{ .name = "notify_proto", .handler = netifd_iface_notify_proto },
{ .name = "remove", .handler = netifd_iface_remove }
};