X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=6888e39d39730c77589cbe046971243c9ce08f0f;hb=d48884911904c87e0143b70a1a102d4cf25d638b;hp=b48de2c893ccbc9d9c65de335fecbb66c3421733;hpb=f578f9621aa645ea20c4cd027aeda802f9346f12;p=sysdb.git

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index b48de2c..6888e39 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -116,6 +116,7 @@ connection_init(sdb_object_t *obj, va_list ap)
 
 	conn->cmd = CONNECTION_IDLE;
 	conn->cmd_len = 0;
+	conn->skip_len = 0;
 
 	/* update the object name */
 	snprintf(obj->name + strlen(CONN_FD_PREFIX),
@@ -139,11 +140,15 @@ connection_destroy(sdb_object_t *obj)
 					"(%zu byte%s left in buffer)", len, len == 1 ? "" : "s");
 	}
 
-	sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection on fd=%i",
-			conn->fd);
-	close(conn->fd);
+	sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name);
+	if (conn->fd >= 0)
+		close(conn->fd);
 	conn->fd = -1;
 
+	if (conn->username)
+		free(conn->username);
+	conn->username = NULL;
+
 	sdb_strbuf_destroy(conn->buf);
 	conn->buf = NULL;
 	sdb_strbuf_destroy(conn->errbuf);
@@ -183,7 +188,13 @@ sdb_conn_ctx_init(void)
 static void
 sdb_conn_set_ctx(sdb_conn_t *conn)
 {
+	sdb_conn_t *old;
+
 	sdb_conn_ctx_init();
+
+	old = pthread_getspecific(conn_ctx_key);
+	if (old)
+		sdb_object_deref(SDB_OBJ(old));
 	if (conn)
 		sdb_object_ref(SDB_OBJ(conn));
 	pthread_setspecific(conn_ctx_key, conn);
@@ -248,90 +259,34 @@ command_handle(sdb_conn_t *conn)
 	int status = -1;
 
 	assert(conn && (conn->cmd != CONNECTION_IDLE));
+	assert(! conn->skip_len);
 
 	sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
 			conn->cmd, conn->cmd_len);
 
-	if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP)) {
-		const char *errmsg = "Authentication required";
-		sdb_connection_send(conn, CONNECTION_ERROR,
-				(uint32_t)strlen(errmsg), errmsg);
-		return -1;
-	}
-
-	/* reset */
-	sdb_strbuf_sprintf(conn->errbuf, "");
-
-	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) {
-				sdb_log(SDB_LOG_ERR, "frontend: Failed to parse query '%s'",
-						sdb_strbuf_string(conn->buf));
-				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:
-					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",
-							sdb_strbuf_string(conn->buf));
-					node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
-			}
-
-			if (node)
-				status = sdb_fe_exec(conn, node);
-
-			sdb_llist_destroy(parsetree);
-			break;
-		}
-
-		case CONNECTION_LIST:
-			status = sdb_fe_list(conn);
-			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 == CONNECTION_PING)
+		status = sdb_connection_ping(conn);
+	else if (conn->cmd == CONNECTION_STARTUP)
+		status = sdb_fe_session_start(conn);
+	else if (conn->cmd == CONNECTION_QUERY)
+		status = sdb_fe_query(conn);
+	else if (conn->cmd == CONNECTION_FETCH)
+		status = sdb_fe_fetch(conn);
+	else if (conn->cmd == CONNECTION_LIST)
+		status = sdb_fe_list(conn);
+	else if (conn->cmd == 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,
 				(uint32_t)sdb_strbuf_len(conn->errbuf),
 				sdb_strbuf_string(conn->errbuf));
-
-	/* 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_len = 0;
 	return status;
 } /* command_handle */
 
@@ -339,17 +294,42 @@ command_handle(sdb_conn_t *conn)
 static int
 command_init(sdb_conn_t *conn)
 {
-	size_t len;
+	const char *errmsg = NULL;
 
 	assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
 
+	if (conn->skip_len)
+		return -1;
+
+	/* reset */
+	sdb_strbuf_sprintf(conn->errbuf, "");
+
 	conn->cmd = connection_get_int32(conn, 0);
 	conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
 
-	len = 2 * sizeof(uint32_t);
-	if (conn->cmd == CONNECTION_IDLE)
-		len += conn->cmd_len;
-	sdb_strbuf_skip(conn->buf, 0, len);
+	sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
+
+	if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP))
+		errmsg = "Authentication required";
+	else if (conn->cmd == 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,
+				(uint32_t)strlen(errmsg), errmsg);
+		conn->skip_len += conn->cmd_len;
+		conn->cmd = CONNECTION_IDLE;
+		conn->cmd_len = 0;
+
+		if (len > conn->skip_len)
+			len = conn->skip_len;
+		sdb_strbuf_skip(conn->buf, 0, len);
+		conn->skip_len -= len;
+		/* connection_read will handle anything else */
+	}
 	return 0;
 } /* command_init */
 
@@ -359,6 +339,9 @@ connection_read(sdb_conn_t *conn)
 {
 	ssize_t n = 0;
 
+	if ((! conn) || (conn->fd < 0))
+		return -1;
+
 	while (42) {
 		ssize_t status;
 
@@ -367,12 +350,27 @@ connection_read(sdb_conn_t *conn)
 		if (status < 0) {
 			if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
 				break;
+
+			close(conn->fd);
+			conn->fd = -1;
 			return (int)status;
 		}
 		else if (! status) /* EOF */
 			break;
 
+		if (conn->skip_len) {
+			size_t len = (size_t)status < conn->skip_len
+				? (size_t)status : conn->skip_len;
+			sdb_strbuf_skip(conn->buf, 0, len);
+			conn->skip_len -= len;
+		}
+
 		n += status;
+
+		/* give the main loop a chance to execute commands (and free up buffer
+		 * space) on large amounts of incoming traffic */
+		if (n > 1024 * 1024)
+			break;
 	}
 
 	return n;
@@ -404,6 +402,14 @@ sdb_connection_accept(int fd)
 void
 sdb_connection_close(sdb_conn_t *conn)
 {
+	if (! conn)
+		return;
+
+	/* 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 */
 
@@ -421,9 +427,16 @@ sdb_connection_read(sdb_conn_t *conn)
 				&& (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)))
 			command_init(conn);
 		if ((conn->cmd != CONNECTION_IDLE)
-				&& (sdb_strbuf_len(conn->buf) >= conn->cmd_len))
+				&& (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_len = 0;
+		}
+
 		if (status <= 0)
 			break;
 
@@ -447,6 +460,11 @@ sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 	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_log(SDB_LOG_ERR, "frontend: Failed to send msg "
 				"(code: %u, len: %u) to client: %s", code, msg_len,
 				sdb_strerror(errno, errbuf, sizeof(errbuf)));