X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=29816ee6a3614d4ad4500b2b7d31307e43fb19dd;hp=4ba91eeba5526c3ce85bd87e4c181fe542a434af;hb=59747ee01e0158f97bdf8c182305e757d90a8d7a;hpb=57ee6ff66071deb4e03f414ed00433061b8bef93

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 4ba91ee..29816ee 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -182,20 +182,30 @@ static int discover_server_process_message(void *arg)
 	}
 
 
-	if (message->action != PB_PROTOCOL_ACTION_BOOT) {
-		pb_log("%s: invalid action %d\n", __func__, message->action);
-		return 0;
-	}
+	switch (message->action) {
+	case PB_PROTOCOL_ACTION_BOOT:
+		boot_command = talloc(client, struct boot_command);
+
+		rc = pb_protocol_deserialise_boot_command(boot_command,
+				message);
+		if (rc) {
+			pb_log("%s: no boot command?", __func__);
+			return 0;
+		}
+
+		device_handler_boot(client->server->device_handler,
+				boot_command);
+		break;
 
-	boot_command = talloc(client, struct boot_command);
+	case PB_PROTOCOL_ACTION_CANCEL_DEFAULT:
+		device_handler_cancel_default(client->server->device_handler);
+		break;
 
-	rc = pb_protocol_deserialise_boot_command(boot_command, message);
-	if (rc) {
-		pb_log("%s: no boot command?", __func__);
+	default:
+		pb_log("%s: invalid action %d\n", __func__, message->action);
 		return 0;
 	}
 
-	device_handler_boot(client->server->device_handler, boot_command);
 
 	return 0;
 }
@@ -241,8 +251,9 @@ static int discover_server_process_connection(void *arg)
 		}
 	}
 
-	client->waiter = waiter_register(server->waitset, client->fd, WAIT_IN,
-				discover_server_process_message, client);
+	client->waiter = waiter_register_io(server->waitset, client->fd,
+				WAIT_IN, discover_server_process_message,
+				client);
 
 	return 0;
 }
@@ -327,7 +338,7 @@ struct discover_server *discover_server_init(struct waitset *waitset)
 		goto out_err;
 	}
 
-	server->waiter = waiter_register(server->waitset, server->socket,
+	server->waiter = waiter_register_io(server->waitset, server->socket,
 			WAIT_IN, discover_server_process_connection, server);
 
 	return server;