proto: Let unmarshal functions return the number of bytes processed.

[sysdb.git] / src / client / sock.c

diff --git a/src/client/sock.c b/src/client/sock.c
index 82a48a62534a6e0d0b00dee704e58cf821dc998c..0d734f3a9462ba74bb7405beb94c9fdeecb67d8a 100644 (file)
--- a/src/client/sock.c
+++ b/src/client/sock.c
@@ -33,9 +33,11 @@
 #include "utils/error.h"
 #include "utils/strbuf.h"
 #include "utils/proto.h"
+#include "utils/os.h"
 
 #include <arpa/inet.h>
 
+#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 
@@ -56,7 +58,7 @@
 struct sdb_client {
        char *address;
        int   fd;
-       _Bool eof;
+       bool  eof;
 };
 
 /*
@@ -166,7 +168,7 @@ sdb_client_connect(sdb_client_t *client, const char *username)
        if (! username)
                username = "";
 
-       status = sdb_client_send(client, CONNECTION_STARTUP,
+       status = sdb_client_send(client, SDB_CONNECTION_STARTUP,
                        (uint32_t)strlen(username), username);
        if (status < 0) {
                char errbuf[1024];
@@ -179,7 +181,7 @@ sdb_client_connect(sdb_client_t *client, const char *username)
        buf = sdb_strbuf_create(64);
        rstatus = 0;
        status = sdb_client_recv(client, &rstatus, buf);
-       if ((status > 0) && (rstatus == CONNECTION_OK)) {
+       if ((status > 0) && (rstatus == SDB_CONNECTION_OK)) {
                sdb_strbuf_destroy(buf);
                return 0;
        }
@@ -193,11 +195,12 @@ sdb_client_connect(sdb_client_t *client, const char *username)
                sdb_log(SDB_LOG_ERR, "Encountered end-of-file while waiting "
                                "for server response");
 
-       if (rstatus == CONNECTION_ERROR) {
-               sdb_log(SDB_LOG_ERR, "Access denied for user '%s'", username);
+       if (rstatus == SDB_CONNECTION_ERROR) {
+               sdb_log(SDB_LOG_ERR, "Access denied for user '%s': %s",
+                               username, sdb_strbuf_string(buf));
                status = -((int)rstatus);
        }
-       else if (rstatus != CONNECTION_OK) {
+       else if (rstatus != SDB_CONNECTION_OK) {
                sdb_log(SDB_LOG_ERR, "Received unsupported authentication request "
                                "(status %d) during startup", (int)rstatus);
                status = -((int)rstatus);
@@ -247,10 +250,14 @@ ssize_t
 sdb_client_send(sdb_client_t *client,
                uint32_t cmd, uint32_t msg_len, const char *msg)
 {
+       char buf[2 * sizeof(uint32_t) + msg_len];
+
        if ((! client) || (! client->fd))
                return -1;
+       if (sdb_proto_marshal(buf, sizeof(buf), cmd, msg_len, msg) < 0)
+               return -1;
 
-       return sdb_proto_send_msg(client->fd, cmd, msg_len, msg);
+       return sdb_write(client->fd, sizeof(buf), buf);
 } /* sdb_client_send */
 
 ssize_t
@@ -276,7 +283,7 @@ sdb_client_recv(sdb_client_t *client,
        while (42) {
                ssize_t status;
 
-               if (sdb_proto_select(client->fd, SDB_PROTO_SELECTIN))
+               if (sdb_select(client->fd, SDB_SELECTIN))
                        return -1;
 
                errno = 0;
@@ -297,9 +304,15 @@ sdb_client_recv(sdb_client_t *client,
                        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 */
-                       rstatus = sdb_proto_get_int(buf, data_offset);
-                       rlen = sdb_proto_get_int(buf, data_offset + sizeof(rstatus));
+                       assert(len >= 2 * sizeof(uint32_t));
+                       n = sdb_proto_unmarshal_int32(str, len, &rstatus);
+                       str += n; len -= (size_t)n;
+                       sdb_proto_unmarshal_int32(str, len, &rlen);
 
                        if (! rlen)
                                break;
@@ -327,7 +340,7 @@ sdb_client_recv(sdb_client_t *client,
        return (ssize_t)total;
 } /* sdb_client_recv */
 
-_Bool
+bool
 sdb_client_eof(sdb_client_t *client)
 {
        if ((! client) || (client->fd < 0))