diff --git a/src/client/sock.c b/src/client/sock.c
index ef35166bab13162e84156facbd75d83fdd937b85..0d734f3a9462ba74bb7405beb94c9fdeecb67d8a 100644 (file)
--- a/src/client/sock.c
+++ b/src/client/sock.c
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
+#include "utils/os.h"
#include <arpa/inet.h>
#include <arpa/inet.h>
+#include <assert.h>
#include <errno.h>
#include <limits.h>
#include <errno.h>
#include <limits.h>
"for server response");
if (rstatus == SDB_CONNECTION_ERROR) {
"for server response");
if (rstatus == SDB_CONNECTION_ERROR) {
- sdb_log(SDB_LOG_ERR, "Access denied for user '%s'", username);
+ sdb_log(SDB_LOG_ERR, "Access denied for user '%s': %s",
+ username, sdb_strbuf_string(buf));
status = -((int)rstatus);
}
else if (rstatus != SDB_CONNECTION_OK) {
status = -((int)rstatus);
}
else if (rstatus != SDB_CONNECTION_OK) {
sdb_client_send(sdb_client_t *client,
uint32_t cmd, uint32_t msg_len, const char *msg)
{
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 ((! 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
} /* sdb_client_send */
ssize_t
while (42) {
ssize_t status;
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;
return -1;
errno = 0;
continue;
if (rstatus == UINT32_MAX) {
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 */
/* 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;
if (! rlen)
break;