diff --git a/src/client/sock.c b/src/client/sock.c
index 6f231bd96a3e6823a405a7468a3cce6901465af4..336d0620539531e0428525ad3607a52b1315405e 100644 (file)
--- a/src/client/sock.c
+++ b/src/client/sock.c
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)
{
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);
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
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;
if (rstatus == UINT32_MAX) {
const char *str = sdb_strbuf_string(buf) + data_offset;
size_t len = sdb_strbuf_len(buf) - data_offset;
+ ssize_t n;
/* retrieve status and data len */
assert(len >= 2 * sizeof(uint32_t));
- rstatus = sdb_proto_unmarshal_int(str, len);
- rlen = sdb_proto_unmarshal_int(str + sizeof(rstatus),
- len - sizeof(rstatus));
+ n = sdb_proto_unmarshal_int32(str, len, &rstatus);
+ str += n; len -= (size_t)n;
+ sdb_proto_unmarshal_int32(str, len, &rlen);
if (! rlen)
break;