X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=777775053af71f0c6ec2fb88d788d47d9f06592d;hp=3d288410ee357ae4317477e255791afbc5bb5251;hb=54a8eacb74ab82fe004d818e7994b220220e205e;hpb=bba90846072424cde3afec679fedec706cb4f005

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 3d28841..7777750 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -117,6 +117,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),
@@ -259,18 +260,11 @@ 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_strbuf_sprintf(conn->errbuf, errmsg);
-		sdb_connection_send(conn, CONNECTION_ERROR,
-				(uint32_t)strlen(errmsg), errmsg);
-		return -1;
-	}
-
 	switch (conn->cmd) {
 		case CONNECTION_PING:
 			status = sdb_connection_ping(conn);
@@ -320,10 +314,11 @@ command_handle(sdb_conn_t *conn)
 		}
 
 		case CONNECTION_FETCH:
-			status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf));
+			status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf),
+					/* filter = */ NULL);
 			break;
 		case CONNECTION_LIST:
-			status = sdb_fe_list(conn);
+			status = sdb_fe_list(conn, /* filter = */ NULL);
 			break;
 		case CONNECTION_LOOKUP:
 		{
@@ -338,7 +333,7 @@ command_handle(sdb_conn_t *conn)
 				break;
 			}
 
-			status = sdb_fe_lookup(conn, m);
+			status = sdb_fe_lookup(conn, m, /* filter = */ NULL);
 			sdb_object_deref(SDB_OBJ(m));
 			break;
 		}
@@ -364,20 +359,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 */
 
@@ -406,7 +423,19 @@ connection_read(sdb_conn_t *conn)
 		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;