X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=6b359d347a9f14e3026ebcd6a6df37708eab7da7;hb=6ae8a44475eef39fa376a657df581a52b5472697;hp=bb0f494f2d432c849e4c60be174b3cfec3f786ab;hpb=8a9f437224378cfcb738603db86620bb3763d50d;p=sysdb.git

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index bb0f494..6b359d3 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
 #include "sysdb.h"
 #include "core/object.h"
 #include "core/plugin.h"
@@ -32,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>
@@ -49,7 +54,7 @@
  */
 
 static pthread_key_t conn_ctx_key;
-static _Bool         conn_ctx_key_initialized = 0;
+static bool          conn_ctx_key_initialized = 0;
 
 /*
  * private types
@@ -59,6 +64,18 @@ static _Bool         conn_ctx_key_initialized = 0;
 #define CONN_FD_PREFIX "conn#"
 #define CONN_FD_PLACEHOLDER "XXXXXXX"
 
+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)
 {
@@ -96,11 +113,15 @@ connection_init(sdb_object_t *obj, va_list ap)
 		return -1;
 	}
 
-	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);
-		return -1;
-	}
+	/* update the object name */
+	snprintf(obj->name + strlen(CONN_FD_PREFIX),
+			strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd);
+
+	/* defaults */
+	conn->read = conn_read;
+	conn->write = conn_write;
+	conn->finish = NULL;
+	conn->session = NULL;
 
 	sock_fl = fcntl(conn->fd, F_GETFL);
 	if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) {
@@ -111,16 +132,15 @@ connection_init(sdb_object_t *obj, va_list ap)
 		return -1;
 	}
 
+	conn->username = NULL;
+	conn->ready = 0;
+
 	sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
 			conn->fd);
 
-	conn->cmd = CONNECTION_IDLE;
+	conn->cmd = SDB_CONNECTION_IDLE;
 	conn->cmd_len = 0;
 	conn->skip_len = 0;
-
-	/* update the object name */
-	snprintf(obj->name + strlen(CONN_FD_PREFIX),
-			strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd);
 	return 0;
 } /* connection_init */
 
@@ -135,6 +155,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)
@@ -143,9 +167,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);
@@ -241,7 +263,7 @@ connection_log(int prio, const char *msg,
 	memcpy(tmp, &p, sizeof(p));
 	strcpy(tmp + sizeof(p), msg);
 
-	if (sdb_connection_send(conn, CONNECTION_LOG, len, tmp) < 0)
+	if (sdb_connection_send(conn, SDB_CONNECTION_LOG, len, tmp) < 0)
 		return -1;
 	return 0;
 } /* connection_log */
@@ -251,24 +273,26 @@ command_handle(sdb_conn_t *conn)
 {
 	int status = -1;
 
-	assert(conn && (conn->cmd != CONNECTION_IDLE));
+	assert(conn && (conn->cmd != SDB_CONNECTION_IDLE));
 	assert(! conn->skip_len);
 
 	sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
 			conn->cmd, conn->cmd_len);
 
-	if (conn->cmd == CONNECTION_PING)
+	if (conn->cmd == SDB_CONNECTION_PING)
 		status = sdb_connection_ping(conn);
-	else if (conn->cmd == CONNECTION_STARTUP)
+	else if (conn->cmd == SDB_CONNECTION_STARTUP)
 		status = sdb_fe_session_start(conn);
-	else if (conn->cmd == CONNECTION_QUERY)
+	else if (conn->cmd == SDB_CONNECTION_QUERY)
 		status = sdb_fe_query(conn);
-	else if (conn->cmd == CONNECTION_FETCH)
+	else if (conn->cmd == SDB_CONNECTION_FETCH)
 		status = sdb_fe_fetch(conn);
-	else if (conn->cmd == CONNECTION_LIST)
+	else if (conn->cmd == SDB_CONNECTION_LIST)
 		status = sdb_fe_list(conn);
-	else if (conn->cmd == CONNECTION_LOOKUP)
+	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);
@@ -279,7 +303,7 @@ command_handle(sdb_conn_t *conn)
 	if (status) {
 		if (! sdb_strbuf_len(conn->errbuf))
 			sdb_strbuf_sprintf(conn->errbuf, "Failed to execute command");
-		sdb_connection_send(conn, CONNECTION_ERROR,
+		sdb_connection_send(conn, SDB_CONNECTION_ERROR,
 				(uint32_t)sdb_strbuf_len(conn->errbuf),
 				sdb_strbuf_string(conn->errbuf));
 	}
@@ -292,7 +316,7 @@ command_init(sdb_conn_t *conn)
 {
 	const char *errmsg = NULL;
 
-	assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
+	assert(conn && (conn->cmd == SDB_CONNECTION_IDLE) && (! conn->cmd_len));
 
 	if (conn->skip_len)
 		return -1;
@@ -300,24 +324,24 @@ 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 != CONNECTION_STARTUP))
+	if ((! conn->ready) && (conn->cmd != SDB_CONNECTION_STARTUP))
 		errmsg = "Authentication required";
-	else if (conn->cmd == CONNECTION_IDLE)
+	else if (conn->cmd == SDB_CONNECTION_IDLE)
 		errmsg = "Invalid command 0";
 
 	if (errmsg) {
 		size_t len = sdb_strbuf_len(conn->buf);
 
 		sdb_strbuf_sprintf(conn->errbuf, "%s", errmsg);
-		sdb_connection_send(conn, CONNECTION_ERROR,
+		sdb_connection_send(conn, SDB_CONNECTION_ERROR,
 				(uint32_t)strlen(errmsg), errmsg);
 		conn->skip_len += conn->cmd_len;
-		conn->cmd = CONNECTION_IDLE;
+		conn->cmd = SDB_CONNECTION_IDLE;
 		conn->cmd_len = 0;
 
 		if (len > conn->skip_len)
@@ -342,13 +366,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 */
@@ -384,15 +407,22 @@ sdb_connection_enable_logging(void)
 } /* sdb_connection_enable_logging */
 
 sdb_conn_t *
-sdb_connection_accept(int fd)
+sdb_connection_accept(int fd, sdb_conn_setup_cb setup, void *user_data)
 {
+	sdb_conn_t *conn;
+
 	if (fd < 0)
 		return NULL;
 
 	/* the placeholder will be replaced with the accepted file
 	 * descriptor when initializing the object */
-	return CONN(sdb_object_create(CONN_FD_PREFIX CONN_FD_PLACEHOLDER,
+	conn = CONN(sdb_object_create(CONN_FD_PREFIX CONN_FD_PLACEHOLDER,
 				connection_type, fd));
+	if (setup && (setup(conn, user_data) < 0)) {
+		sdb_object_deref(SDB_OBJ(conn));
+		return NULL;
+	}
+	return conn;
 } /* sdb_connection_create */
 
 void
@@ -401,16 +431,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;
 
@@ -419,17 +451,17 @@ sdb_connection_read(sdb_conn_t *conn)
 	while (42) {
 		ssize_t status = connection_read(conn);
 
-		if ((conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len)
+		if ((conn->cmd == SDB_CONNECTION_IDLE) && (! conn->cmd_len)
 				&& (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)))
 			command_init(conn);
-		if ((conn->cmd != CONNECTION_IDLE)
+		if ((conn->cmd != SDB_CONNECTION_IDLE)
 				&& (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) {
 			command_handle(conn);
 
 			/* remove the command from the buffer */
 			if (conn->cmd_len)
 				sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
-			conn->cmd = CONNECTION_IDLE;
+			conn->cmd = SDB_CONNECTION_IDLE;
 			conn->cmd_len = 0;
 		}
 
@@ -441,25 +473,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 "
@@ -472,11 +506,11 @@ sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 int
 sdb_connection_ping(sdb_conn_t *conn)
 {
-	if ((! conn) || (conn->cmd != CONNECTION_PING))
+	if ((! conn) || (conn->cmd != SDB_CONNECTION_PING))
 		return -1;
 
 	/* we're alive */
-	sdb_connection_send(conn, CONNECTION_OK, 0, NULL);
+	sdb_connection_send(conn, SDB_CONNECTION_OK, 0, NULL);
 	return 0;
 } /* sdb_connection_ping */