discover_server_notify_boot_status(handler->server, status);
}
+static void _device_handler_vstatus(struct device_handler *handler,
+ enum status_type type, const char *fmt, va_list ap)
+{
+ struct status status;
+
+ status.type = type;
+ status.message = talloc_vasprintf(handler, fmt, ap);
+
+ device_handler_status(handler, &status);
+
+ talloc_free(status.message);
+}
+
+static void _device_handler_vdevstatus(struct device_handler *handler,
+ struct discover_device *device, enum status_type type,
+ const char *fmt, va_list ap)
+{
+ char *msg;
+
+ msg = talloc_asprintf(handler, "[%s] %s",
+ device ? device->device->id : "unknown", fmt);
+ _device_handler_vstatus(handler, type, msg, ap);
+ talloc_free(msg);
+}
+
+void device_handler_status_dev_info(struct device_handler *handler,
+ struct discover_device *dev, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vdevstatus(handler, dev, STATUS_INFO, fmt, ap);
+ va_end(ap);
+}
+
+void device_handler_status_dev_err(struct device_handler *handler,
+ struct discover_device *dev, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vdevstatus(handler, dev, STATUS_ERROR, fmt, ap);
+ va_end(ap);
+}
+
+void device_handler_status_info(struct device_handler *handler,
+ const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vstatus(handler, STATUS_INFO, fmt, ap);
+ va_end(ap);
+}
+
+void device_handler_status_err(struct device_handler *handler,
+ const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vstatus(handler, STATUS_ERROR, fmt, ap);
+ va_end(ap);
+}
+
static void device_handler_boot_status_cb(void *arg, struct status *status)
{
device_handler_status(arg, status);
struct discover_device *dev)
{
struct discover_context *ctx;
- struct status *status;
int rc;
- status = talloc_zero(handler, struct status);
- status->type = STATUS_INFO;
- /*
- * TRANSLATORS: this string will be passed the type and identifier
- * of the device. For example, the first parameter could be "Disk",
- * (which will be translated accordingly) and the second a Linux device
- * identifier like 'sda1' (which will not be translated)
- */
- status->message = talloc_asprintf(status, _("Processing %s device %s"),
- device_type_display_name(dev->device->type),
- dev->device->id);
- device_handler_status(handler, status);
+ device_handler_status_dev_info(handler, dev,
+ /*
+ * TRANSLATORS: this string will be passed the type of the
+ * device (eg "disk" or "network"), which will be translated
+ * accordingly.
+ */
+ _("Processing new %s device"),
+ device_type_display_name(dev->device->type));
process_boot_option_queue(handler);
device_handler_discover_context_commit(handler, ctx);
out:
- /*
- * TRANSLATORS: the format specifier in this string is a Linux
- * device identifier, like 'sda1'
- */
- status->message = talloc_asprintf(status,_("Processing %s complete"),
- dev->device->id);
- device_handler_status(handler, status);
+ device_handler_status_dev_info(handler, dev, _("Processing complete"));
- talloc_free(status);
talloc_unlink(handler, ctx);
return 0;
struct discover_device *dev, struct event *event)
{
struct discover_context *ctx;
- struct status *status;
-
- status = talloc_zero(handler, struct status);
- status->type = STATUS_INFO;
- /*
- * TRANSLATORS: this format specifier will be the name of a network
- * device, like 'eth0'.
- */
- status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
- dev->device->id);
- device_handler_status(handler, status);
+
+ device_handler_status_dev_info(handler, dev,
+ _("Processing dhcp event"));
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
device_handler_discover_context_commit(handler, ctx);
- /*
- * TRANSLATORS: this format specifier will be the name of a network
- * device, like 'eth0'.
- */
- status->message = talloc_asprintf(status,_("Processing %s complete"),
- dev->device->id);
- device_handler_status(handler, status);
+ device_handler_status_dev_info(handler, dev, _("Processing complete"));
- talloc_free(status);
talloc_unlink(handler, ctx);
return 0;
void device_handler_cancel_default(struct device_handler *handler)
{
- struct status status;
-
if (handler->timeout_waiter)
waiter_remove(handler->timeout_waiter);
handler->default_boot_option = NULL;
- status.type = STATUS_INFO;
- status.message = _("Default boot cancelled");
-
- device_handler_status(handler, &status);
+ device_handler_status_info(handler, _("Default boot cancelled"));
}
void device_handler_update_config(struct device_handler *handler,
{
struct discover_context *ctx;
struct discover_device *dev;
- struct status *status;
struct pb_url *pb_url;
struct event *event;
struct param *param;
- status = talloc(handler, struct status);
- status->type = STATUS_ERROR;
-
if (!handler->network) {
- status->message = talloc_asprintf(handler,
- _("No network configured"));
- goto msg;
+ device_handler_status_err(handler, _("No network configured"));
+ return;
}
event = talloc(handler, struct event);
pb_url = pb_url_parse(event, event->params->value);
if (!pb_url || (pb_url->scheme != pb_url_file && !pb_url->host)) {
- status->message = talloc_asprintf(handler,
- _("Invalid config URL!"));
- goto msg;
+ device_handler_status_err(handler, _("Invalid config URL!"));
+ return;
}
if (pb_url->scheme == pb_url_file)
event->device = device_from_addr(event, pb_url);
if (!event->device) {
- status->message = talloc_asprintf(status,
+ device_handler_status_err(handler,
_("Unable to route to host %s"),
pb_url->host);
- goto msg;
+ return;
}
dev = discover_device_create(handler, mac, event->device);
device_handler_discover_context_commit(handler, ctx);
talloc_unlink(handler, ctx);
-
- status->type = STATUS_INFO;
- status->message = talloc_asprintf(status, _("Config file %s parsed"),
- pb_url->file);
-msg:
- device_handler_status(handler, status);
- talloc_free(status);
}
#ifndef PETITBOOT_TEST
projects / petitboot / blobdiff