X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fclient%2Fsock.c;h=336d0620539531e0428525ad3607a52b1315405e;hb=af4c2ce97981b933df4cbe47f0b333a284741485;hp=fd18a1efc689c331df0740feab0f1d4e2a9d3e86;hpb=ac6c1fc5a852376c43ee4fa48f01b21199a87e0f;p=sysdb.git

diff --git a/src/client/sock.c b/src/client/sock.c
index fd18a1e..336d062 100644
--- a/src/client/sock.c
+++ b/src/client/sock.c
@@ -25,13 +25,19 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "client/sock.h"
 #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>
 
@@ -52,13 +58,28 @@
 struct sdb_client {
 	char *address;
 	int   fd;
-	_Bool eof;
+	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)
 {
@@ -107,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);
@@ -162,7 +186,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];
@@ -175,8 +199,10 @@ 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;
+	}
 
 	if (status < 0) {
 		char errbuf[1024];
@@ -187,8 +213,14 @@ 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_OK) {
-		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 != SDB_CONNECTION_OK) {
+		sdb_log(SDB_LOG_ERR, "Received unsupported authentication request "
+				"(status %d) during startup", (int)rstatus);
 		status = -((int)rstatus);
 	}
 
@@ -205,6 +237,22 @@ sdb_client_sockfd(sdb_client_t *client)
 	return client->fd;
 } /* sdb_client_sockfd */
 
+int
+sdb_client_shutdown(sdb_client_t *client, int how)
+{
+	if (! client) {
+		errno = ENOTSOCK;
+		return -1;
+	}
+
+	if (client->fd < 0) {
+		errno = EBADF;
+		return -1;
+	}
+
+	return shutdown(client->fd, how);
+} /* sdb_client_shutdown */
+
 void
 sdb_client_close(sdb_client_t *client)
 {
@@ -220,10 +268,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 client->write(client, buf, sizeof(buf));
 } /* sdb_client_send */
 
 ssize_t
@@ -249,11 +301,11 @@ 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;
-		status = sdb_strbuf_read(buf, client->fd, req);
+		status = client->read(client, buf, req);
 		if (status < 0) {
 			if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
 				continue;
@@ -270,9 +322,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;
@@ -300,7 +358,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))