X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=f35f7b39c82a8278f47137e65810163094c33044;hp=b27b3dd28bfbfd0324941d1861bc2bdd5d60a8ca;hb=ad77ec3d257ac66d74e91452d098882247abdc0a;hpb=13fe0f9ec3d161fab7a015054649910541d75f5e

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index b27b3dd..f35f7b3 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -36,6 +36,7 @@
 #include "utils/error.h"
 #include "utils/strbuf.h"
 #include "utils/proto.h"
+#include "utils/os.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -106,6 +107,18 @@ peer(int sockfd)
 	return strdup(result->pw_name);
 } /* peer */
 
+static ssize_t
+conn_read(sdb_conn_t *conn, size_t len)
+{
+	return sdb_strbuf_read(conn->buf, conn->fd, len);
+} /* conn_read */
+
+static ssize_t
+conn_write(sdb_conn_t *conn, const void *buf, size_t len)
+{
+	return sdb_write(conn->fd, len, buf);
+} /* conn_write */
+
 static int
 connection_init(sdb_object_t *obj, va_list ap)
 {
@@ -143,6 +156,12 @@ connection_init(sdb_object_t *obj, va_list ap)
 		return -1;
 	}
 
+	/* defaults */
+	conn->read = conn_read;
+	conn->write = conn_write;
+	conn->finish = NULL;
+	conn->session = NULL;
+
 	if (conn->client_addr.ss_family != AF_UNIX) {
 		sdb_log(SDB_LOG_ERR, "frontend: Accepted connection using "
 				"unexpected family type %d", conn->client_addr.ss_family);
@@ -192,6 +211,10 @@ connection_destroy(sdb_object_t *obj)
 
 	conn->ready = 0;
 
+	if (conn->finish)
+		conn->finish(conn);
+	conn->finish = NULL;
+
 	if (conn->buf) {
 		len = sdb_strbuf_len(conn->buf);
 		if (len)
@@ -200,9 +223,7 @@ connection_destroy(sdb_object_t *obj)
 	}
 
 	sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name);
-	if (conn->fd >= 0)
-		close(conn->fd);
-	conn->fd = -1;
+	sdb_connection_close(conn);
 
 	if (conn->username)
 		free(conn->username);
@@ -326,6 +347,8 @@ command_handle(sdb_conn_t *conn)
 		status = sdb_fe_list(conn);
 	else if (conn->cmd == SDB_CONNECTION_LOOKUP)
 		status = sdb_fe_lookup(conn);
+	else if (conn->cmd == SDB_CONNECTION_STORE)
+		status = sdb_fe_store(conn);
 	else {
 		sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
 				conn->cmd);
@@ -357,9 +380,9 @@ command_init(sdb_conn_t *conn)
 	/* reset */
 	sdb_strbuf_clear(conn->errbuf);
 
-	conn->cmd = sdb_proto_get_int(conn->buf, 0);
-	conn->cmd_len = sdb_proto_get_int(conn->buf, sizeof(uint32_t));
-
+	if (sdb_proto_unmarshal_header(SDB_STRBUF_STR(conn->buf),
+				&conn->cmd, &conn->cmd_len) < 0)
+		return -1;
 	sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
 
 	if ((! conn->ready) && (conn->cmd != SDB_CONNECTION_STARTUP))
@@ -399,13 +422,12 @@ connection_read(sdb_conn_t *conn)
 		ssize_t status;
 
 		errno = 0;
-		status = sdb_strbuf_read(conn->buf, conn->fd, 1024);
+		status = conn->read(conn, 1024);
 		if (status < 0) {
 			if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
 				break;
 
-			close(conn->fd);
-			conn->fd = -1;
+			sdb_connection_close(conn);
 			return (int)status;
 		}
 		else if (! status) /* EOF */
@@ -458,16 +480,18 @@ sdb_connection_close(sdb_conn_t *conn)
 	if (! conn)
 		return;
 
+	if (conn->finish)
+		conn->finish(conn);
+	conn->finish = NULL;
+
 	/* close the connection even if someone else still references it */
 	if (conn->fd >= 0)
 		close(conn->fd);
 	conn->fd = -1;
-
-	sdb_object_deref(SDB_OBJ(conn));
 } /* sdb_connection_close */
 
 ssize_t
-sdb_connection_read(sdb_conn_t *conn)
+sdb_connection_handle(sdb_conn_t *conn)
 {
 	ssize_t n = 0;
 
@@ -498,25 +522,27 @@ sdb_connection_read(sdb_conn_t *conn)
 
 	sdb_conn_set_ctx(NULL);
 	return n;
-} /* sdb_connection_read */
+} /* sdb_connection_handle */
 
 ssize_t
 sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 		uint32_t msg_len, const char *msg)
 {
+	char buf[2 * sizeof(uint32_t) + msg_len];
 	ssize_t status;
 
 	if ((! conn) || (conn->fd < 0))
 		return -1;
+	if (sdb_proto_marshal(buf, sizeof(buf), code, msg_len, msg) < 0)
+		return -1;
 
-	status = sdb_proto_send_msg(conn->fd, code, msg_len, msg);
+	status = conn->write(conn, buf, sizeof(buf));
 	if (status < 0) {
 		char errbuf[1024];
 
 		/* tell other code that there was a problem and, more importantly,
 		 * make sure we don't try to send further logs to the connection */
-		close(conn->fd);
-		conn->fd = -1;
+		sdb_connection_close(conn);
 		conn->ready = 0;
 
 		sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "