discover: Use device_handler_status_dev_* for device-specific status

[petitboot] / discover / discover-server.c

diff --git a/discover/discover-server.c b/discover/discover-server.c
index e4f3b67767a0ed08ee1fffda3bc7147b6c137a4b..ad184f66a43559fcc78707b7aa69c204bfec69f2 100644 (file)
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -157,7 +157,7 @@ static int write_device_remove_message(struct discover_server *server,
 }
 
 static int write_boot_status_message(struct discover_server *server,
-               struct client *client, const struct boot_status *status)
+               struct client *client, const struct status *status)
 {
        struct pb_protocol_message *message;
        int len;
@@ -266,7 +266,8 @@ static int discover_server_process_message(void *arg)
        case PB_PROTOCOL_ACTION_ADD_URL:
                url = pb_protocol_deserialise_string((void *) client, message);
 
-               device_handler_process_url(client->server->device_handler, url);
+               device_handler_process_url(client->server->device_handler,
+                               url, NULL, NULL);
                break;
 
        default:
@@ -285,7 +286,7 @@ static int discover_server_process_connection(void *arg)
        struct client *client;
 
        /* accept the incoming connection */
-       fd = accept(server->socket, NULL, 0);
+       fd = accept(server->socket, NULL, NULL);
        if (fd < 0) {
                pb_log("accept: %s\n", strerror(errno));
                return 0;
@@ -365,7 +366,7 @@ void discover_server_notify_device_remove(struct discover_server *server,
 }
 
 void discover_server_notify_boot_status(struct discover_server *server,
-               struct boot_status *status)
+               struct status *status)
 {
        struct client *client;