discover/status: Use full URL in parse status message

[petitboot] / discover / device-handler.h

diff --git a/discover/device-handler.h b/discover/device-handler.h
index 5dbc349fadb93aa541f6c684abd57bb9972fc7e7..874133db16032adc28f7af27872f9b576f19d12c 100644 (file)
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -4,6 +4,7 @@
 #include <stdbool.h>
 
 #include <list/list.h>
+#include <types/types.h>
 
 struct device_handler;
 struct discover_device;
@@ -13,16 +14,7 @@ struct boot_command;
 struct event;
 struct device;
 struct waitset;
-
-enum conf_method {
-       CONF_METHOD_LOCAL_FILE, /* discover by looking at local files on this
-                                  block device */
-
-       CONF_METHOD_DHCP,       /* configuration from a DHCP response */
-
-       CONF_METHOD_UNKNOWN = -1,
-};
-
+struct config;
 
 struct discover_device {
        struct device           *device;
@@ -34,8 +26,11 @@ struct discover_device {
        const char              *label;
 
        char                    *mount_path;
+       char                    *root_path;
        const char              *device_path;
+       struct ramdisk_device   *ramdisk;
        bool                    mounted;
+       bool                    mounted_rw;
        bool                    unmount;
 
        bool                    notified;
@@ -53,20 +48,29 @@ struct discover_boot_option {
        struct resource         *boot_image;
        struct resource         *initrd;
        struct resource         *dtb;
+       struct resource         *args_sig_file;
        struct resource         *icon;
 };
 
 
 struct discover_context {
+       struct device_handler   *handler;
        struct parser           *parser;
        struct event            *event;
        struct discover_device  *device;
        struct list             boot_options;
        struct pb_url           *conf_url;
-       enum conf_method        method;
        void                    *test_data;
 };
 
+struct ramdisk_device {
+       const char      *path;
+       char            *snapshot;
+       char            *origin;
+       char            *base;
+       uint64_t        sectors;
+};
+
 struct device_handler *device_handler_init(struct discover_server *server,
                struct waitset *waitset, int dry_run);
 
@@ -75,19 +79,36 @@ void device_handler_destroy(struct device_handler *devices);
 int device_handler_get_device_count(const struct device_handler *handler);
 const struct discover_device *device_handler_get_device(
        const struct device_handler *handler, unsigned int index);
+struct network *device_handler_get_network(
+               const struct device_handler *handler);
 
 struct discover_device *discover_device_create(struct device_handler *handler,
-               const char *id);
+               const char *uuid, const char *id);
 void device_handler_add_device(struct device_handler *handler,
                struct discover_device *device);
+void device_handler_add_ramdisk(struct device_handler *handler,
+               const char *path);
+struct ramdisk_device *device_handler_get_ramdisk(
+               struct device_handler *handler);
+void device_handler_release_ramdisk(struct discover_device *device);
 int device_handler_discover(struct device_handler *handler,
-               struct discover_device *dev, enum conf_method method);
-int device_handler_conf(struct device_handler *handler,
-               struct discover_device *dev, struct pb_url *url,
-               enum conf_method method);
+               struct discover_device *dev);
+int device_handler_dhcp(struct device_handler *handler,
+               struct discover_device *dev, struct event *event);
 void device_handler_remove(struct device_handler *handler,
                struct discover_device *device);
 
+void device_handler_status(struct device_handler *handler,
+               struct status *status);
+void device_handler_status_info(struct device_handler *handler,
+               const char *fmt, ...);
+void device_handler_status_err(struct device_handler *handler,
+               const char *fmt, ...);
+void device_handler_status_dev_info(struct device_handler *handler,
+               struct discover_device *dev, const char *fmt, ...);
+void device_handler_status_dev_err(struct device_handler *handler,
+               struct discover_device *dev, const char *fmt, ...);
+
 struct discover_context *device_handler_discover_context_create(
                struct device_handler *handler,
                struct discover_device *device);
@@ -123,5 +144,14 @@ const char *discover_device_get_param(struct discover_device *device,
 void device_handler_boot(struct device_handler *handler,
                struct boot_command *cmd);
 void device_handler_cancel_default(struct device_handler *handler);
+void device_handler_update_config(struct device_handler *handler,
+               struct config *config);
+void device_handler_process_url(struct device_handler *handler,
+               const char *url, const char *mac, const char *ip);
+void device_handler_reinit(struct device_handler *handler);
+
+int device_request_write(struct discover_device *dev, bool *release);
+void device_release_write(struct discover_device *dev, bool release);
+void device_sync_snapshots(struct device_handler *handler, const char *device);
 
 #endif /* _DEVICE_HANDLER_H */