X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=1d8b8b34d2c9ff06eeca3f0aff9584443528540c;hp=2fdc5e9222d33449cb10709d090106f66c866e08;hb=5e20183e0a2264e0aed972ceff913374ab970248;hpb=5128caf8acad1c6a4f308389e6866dfc80db7dbc

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 2fdc5e9..1d8b8b3 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -29,7 +29,6 @@
 #include "core/object.h"
 #include "core/plugin.h"
 #include "frontend/connection-private.h"
-#include "frontend/parser.h"
 #include "utils/error.h"
 #include "utils/strbuf.h"
 #include "utils/proto.h"
@@ -115,7 +114,7 @@ connection_init(sdb_object_t *obj, va_list ap)
 	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;
 
@@ -134,6 +133,8 @@ connection_destroy(sdb_object_t *obj)
 	assert(obj);
 	conn = CONN(obj);
 
+	conn->ready = 0;
+
 	if (conn->buf) {
 		len = sdb_strbuf_len(conn->buf);
 		if (len)
@@ -221,152 +222,67 @@ static int
 connection_log(int prio, const char *msg,
 		sdb_object_t __attribute__((unused)) *user_data)
 {
+	uint32_t len = (uint32_t)sizeof(uint32_t) + (uint32_t)strlen(msg);
+	uint32_t p = htonl((uint32_t)prio);
+	char tmp[len + 1];
+
 	sdb_conn_t *conn;
 
 	conn = sdb_conn_get_ctx();
 	/* no connection associated to this thread
-	 * or user not authenticated yet => don't leak any information */
-	if ((! conn) || (! conn->username))
+	 * or startup not done yet => don't leak any information */
+	if ((! conn) || (! conn->ready))
 		return 0;
 
 	/* XXX: make the log-level configurable by the client at runtime */
 	if (prio >= SDB_LOG_DEBUG)
 		return 0;
 
-	/* TODO: Use CONNECTION_LOG_<prio>? */
-	if (sdb_connection_send(conn, CONNECTION_LOG,
-				(uint32_t)strlen(msg), msg) < 0)
+	memcpy(tmp, &p, sizeof(p));
+	strcpy(tmp + sizeof(p), msg);
+
+	if (sdb_connection_send(conn, SDB_CONNECTION_LOG, len, tmp) < 0)
 		return -1;
 	return 0;
 } /* connection_log */
 
-static uint32_t
-connection_get_int32(sdb_conn_t *conn, size_t offset)
-{
-	const char *data;
-	uint32_t n;
-
-	assert(conn && (sdb_strbuf_len(conn->buf) >= offset + sizeof(uint32_t)));
-
-	data = sdb_strbuf_string(conn->buf);
-	memcpy(&n, data + offset, sizeof(n));
-	n = ntohl(n);
-	return n;
-} /* connection_get_int32 */
-
 static int
 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);
 
-	switch (conn->cmd) {
-		case CONNECTION_PING:
-			status = sdb_connection_ping(conn);
-			break;
-		case CONNECTION_STARTUP:
-			status = sdb_fe_session_start(conn);
-			break;
-
-		case CONNECTION_QUERY:
-		{
-			sdb_llist_t *parsetree;
-			sdb_conn_node_t *node = NULL;
-
-			parsetree = sdb_fe_parse(sdb_strbuf_string(conn->buf),
-					(int)conn->cmd_len);
-			if (! parsetree) {
-				char query[conn->cmd_len + 1];
-				strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
-				query[sizeof(query) - 1] = '\0';
-				sdb_log(SDB_LOG_ERR, "frontend: Failed to parse query '%s'",
-						query);
-				status = -1;
-				break;
-			}
-
-			switch (sdb_llist_len(parsetree)) {
-				case 0:
-					/* skipping empty command */
-					break;
-				case 1:
-					node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
-					break;
-
-				default:
-				{
-					char query[conn->cmd_len + 1];
-					strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
-					query[sizeof(query) - 1] = '\0';
-					sdb_log(SDB_LOG_WARNING, "frontend: Ignoring %d command%s "
-							"in multi-statement query '%s'",
-							sdb_llist_len(parsetree) - 1,
-							sdb_llist_len(parsetree) == 2 ? "" : "s",
-							query);
-					node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
-				}
-			}
-
-			if (node) {
-				status = sdb_fe_exec(conn, node);
-				sdb_object_deref(SDB_OBJ(node));
-			}
-
-			sdb_llist_destroy(parsetree);
-			break;
-		}
-
-		case CONNECTION_FETCH:
-		{
-			char hostname[conn->cmd_len + 1];
-			strncpy(hostname, sdb_strbuf_string(conn->buf), conn->cmd_len);
-			hostname[sizeof(hostname) - 1] = '\0';
-			status = sdb_fe_exec_fetch(conn, hostname, /* filter = */ NULL);
-			break;
-		}
-		case CONNECTION_LIST:
-			status = sdb_fe_exec_list(conn, /* filter = */ NULL);
-			break;
-		case CONNECTION_LOOKUP:
-		{
-			sdb_store_matcher_t *m;
-
-			m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
-					(int)conn->cmd_len);
-			if (! m) {
-				char expr[conn->cmd_len + 1];
-				strncpy(expr, sdb_strbuf_string(conn->buf), conn->cmd_len);
-				expr[sizeof(expr) - 1] = '\0';
-				sdb_log(SDB_LOG_ERR, "frontend: Failed to parse "
-						"lookup condition '%s'", expr);
-				status = -1;
-				break;
-			}
-
-			status = sdb_fe_exec_lookup(conn, m, /* filter = */ NULL);
-			sdb_object_deref(SDB_OBJ(m));
-			break;
-		}
-
-		default:
-		{
-			sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
-					conn->cmd);
-			sdb_strbuf_sprintf(conn->errbuf, "Invalid command %#x", conn->cmd);
-			status = -1;
-			break;
-		}
+	if (conn->cmd == SDB_CONNECTION_PING)
+		status = sdb_connection_ping(conn);
+	else if (conn->cmd == SDB_CONNECTION_STARTUP)
+		status = sdb_fe_session_start(conn);
+	else if (conn->cmd == SDB_CONNECTION_QUERY)
+		status = sdb_fe_query(conn);
+	else if (conn->cmd == SDB_CONNECTION_FETCH)
+		status = sdb_fe_fetch(conn);
+	else if (conn->cmd == SDB_CONNECTION_LIST)
+		status = sdb_fe_list(conn);
+	else if (conn->cmd == SDB_CONNECTION_LOOKUP)
+		status = sdb_fe_lookup(conn);
+	else {
+		sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
+				conn->cmd);
+		sdb_strbuf_sprintf(conn->errbuf, "Invalid command %#x", conn->cmd);
+		status = -1;
 	}
 
-	if (status)
-		sdb_connection_send(conn, CONNECTION_ERROR,
+	if (status) {
+		if (! sdb_strbuf_len(conn->errbuf))
+			sdb_strbuf_sprintf(conn->errbuf, "Failed to execute command");
+		sdb_connection_send(conn, SDB_CONNECTION_ERROR,
 				(uint32_t)sdb_strbuf_len(conn->errbuf),
 				sdb_strbuf_string(conn->errbuf));
+	}
 	return status;
 } /* command_handle */
 
@@ -376,32 +292,32 @@ 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;
 
 	/* reset */
-	sdb_strbuf_sprintf(conn->errbuf, "");
+	sdb_strbuf_clear(conn->errbuf);
 
-	conn->cmd = connection_get_int32(conn, 0);
-	conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
+	conn->cmd = sdb_proto_get_int(conn->buf, 0);
+	conn->cmd_len = sdb_proto_get_int(conn->buf, sizeof(uint32_t));
 
 	sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
 
-	if ((! conn->username) && (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, errmsg);
-		sdb_connection_send(conn, CONNECTION_ERROR,
+		sdb_strbuf_sprintf(conn->errbuf, "%s", errmsg);
+		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)
@@ -503,17 +419,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;
 		}
 
@@ -544,6 +460,7 @@ sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 		 * make sure we don't try to send further logs to the connection */
 		close(conn->fd);
 		conn->fd = -1;
+		conn->ready = 0;
 
 		sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "
 				"(code: %u, len: %u) to client: %s", code, msg_len,
@@ -555,11 +472,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 */