discover: pxe: Avoid dereferencing null pointer

[petitboot] / discover / device-handler.h

diff --git a/discover/device-handler.h b/discover/device-handler.h
index f4022e764d2d57cf60ae282aabbe44155e6e05e6..771cd066a37697e5c99a73054b2a043341832820 100644 (file)
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -11,6 +11,7 @@ struct discover_device;
 struct discover_server;
 struct boot_option;
 struct boot_command;
+struct process_info;
 struct event;
 struct device;
 struct waitset;
@@ -44,6 +45,7 @@ struct discover_boot_option {
        struct discover_device  *device;
        struct boot_option      *option;
        struct list_item        list;
+       const char              *proxy;
 
        struct resource         *boot_image;
        struct resource         *initrd;
@@ -54,12 +56,12 @@ struct discover_boot_option {
 
 
 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;
-       struct network          *network;
        void                    *test_data;
 };
 
@@ -79,6 +81,11 @@ 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);
+int device_handler_get_plugin_count(const struct device_handler *handler);
+const struct plugin_option *device_handler_get_plugin(
+       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 *uuid, const char *id);
@@ -102,6 +109,15 @@ 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, ...);
+void device_handler_status_download(struct device_handler *handler,
+               const struct process_info *procinfo,
+               unsigned int percentage, unsigned int size, char suffix);
+void device_handler_status_download_remove(struct device_handler *handler,
+               struct process_info *procinfo);
 
 struct discover_context *device_handler_discover_context_create(
                struct device_handler *handler,
@@ -114,6 +130,8 @@ struct discover_boot_option *discover_boot_option_create(
                struct discover_device *dev);
 void discover_context_add_boot_option(struct discover_context *ctx,
                struct discover_boot_option *opt);
+void device_handler_add_plugin_option(struct device_handler *handler,
+               struct plugin_option *opt);
 
 int device_handler_user_event(struct device_handler *handler,
                                struct event *event);
@@ -142,6 +160,8 @@ 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_install_plugin(struct device_handler *handler,
+               const char *plugin_file);
 void device_handler_reinit(struct device_handler *handler);
 
 int device_request_write(struct discover_device *dev, bool *release);