X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=422c1820cc57d45bcb5ce718c681a804d878b773;hp=bc5a4fab3192ce5795f776d0b04d2ad09499b34a;hb=35cc5798268f4fce3291748406211bb149a57571;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index bc5a4fa..422c182 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -1,4 +1,5 @@
 
+#include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -9,9 +10,9 @@
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
+#include <log.h>
 
 #include "ui/common/discover-client.h"
-#include "ui/common/device.h"
 #include "pb-protocol/pb-protocol.h"
 
 struct discover_client {
@@ -42,7 +43,7 @@ struct discover_client* discover_client_init(struct discover_client_ops *ops)
 
 	client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (!client->fd < 0) {
-		perror("socket");
+		pb_log("%s: socket: %s\n", __func__, strerror(errno));
 		goto out_err;
 	}
 
@@ -52,7 +53,7 @@ struct discover_client* discover_client_init(struct discover_client_ops *ops)
 	strcpy(addr.sun_path, PB_SOCKET_PATH);
 
 	if (connect(client->fd, (struct sockaddr *)&addr, sizeof(addr))) {
-		perror("connect");
+		pb_log("%s: connect: %s\n", __func__, strerror(errno));
 		goto out_err;
 	}
 
@@ -82,13 +83,13 @@ int discover_client_process(struct discover_client *client)
 	message = pb_protocol_read_message(client, client->fd);
 
 	if (!message)
-		return 0;
+		return -1;
 
 	switch (message->action) {
 	case PB_PROTOCOL_ACTION_ADD:
 		dev = pb_protocol_deserialise_device(client, message);
 		if (!dev) {
-			printf("no device?\n");
+			pb_log("%s: no device?\n", __func__);
 			return 0;
 		}
 		client->ops.add_device(dev);
@@ -97,13 +98,13 @@ int discover_client_process(struct discover_client *client)
 	case PB_PROTOCOL_ACTION_REMOVE:
 		dev_id = pb_protocol_deserialise_string(client, message);
 		if (!dev_id) {
-			printf("no device id?\n");
+			pb_log("%s: no device id?\n", __func__);
 			return 0;
 		}
 		client->ops.remove_device(dev_id);
 		break;
 	default:
-		printf("unknown action %d\n", message->action);
+		pb_log("%s: unknown action %d\n", __func__, message->action);
 	}