From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 11 Jan 2015 13:43:14 +0000 (+0100)
Subject: client: Make I/O handling more flexible.
X-Git-Tag: sysdb-0.7.0~76
X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=commitdiff_plain;h=af4c2ce97981b933df4cbe47f0b333a284741485

client: Make I/O handling more flexible.
---

diff --git a/src/client/sock.c b/src/client/sock.c
index 0d734f3..336d062 100644
--- a/src/client/sock.c
+++ b/src/client/sock.c
@@ -59,12 +59,27 @@ struct sdb_client {
 	char *address;
 	int   fd;
 	bool  eof;
+
+	ssize_t (*read)(sdb_client_t *, sdb_strbuf_t *, size_t);
+	ssize_t (*write)(sdb_client_t *, const void *, size_t);
 };
 
 /*
  * private helper functions
  */
 
+static ssize_t
+client_read(sdb_client_t *client, sdb_strbuf_t *buf, size_t n)
+{
+	return sdb_strbuf_read(buf, client->fd, n);
+} /* client_read */
+
+static ssize_t
+client_write(sdb_client_t *client, const void *buf, size_t n)
+{
+	return sdb_write(client->fd, n, buf);
+} /* client_write */
+
 static int
 connect_unixsock(sdb_client_t *client, const char *address)
 {
@@ -113,6 +128,9 @@ sdb_client_create(const char *address)
 	client->fd = -1;
 	client->eof = 1;
 
+	client->read = client_read;
+	client->write = client_write;
+
 	client->address = strdup(address);
 	if (! client->address) {
 		sdb_client_destroy(client);
@@ -257,7 +275,7 @@ sdb_client_send(sdb_client_t *client,
 	if (sdb_proto_marshal(buf, sizeof(buf), cmd, msg_len, msg) < 0)
 		return -1;
 
-	return sdb_write(client->fd, sizeof(buf), buf);
+	return client->write(client, buf, sizeof(buf));
 } /* sdb_client_send */
 
 ssize_t
@@ -287,7 +305,7 @@ sdb_client_recv(sdb_client_t *client,
 			return -1;
 
 		errno = 0;
-		status = sdb_strbuf_read(buf, client->fd, req);
+		status = client->read(client, buf, req);
 		if (status < 0) {
 			if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
 				continue;