X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=636396a2434c1edca22edfdb9b3b2103036499cc;hp=04d12222c89838e8b9ed2a126e3a778773a912bf;hb=ddb7ffc175e49abfa69c82777b88d73e1f1103fb;hpb=c2b7616c8a80c5de6356b675d55a4ee36415fd7b

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 04d1222..636396a 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -26,10 +26,11 @@
  */
 
 #include "sysdb.h"
-#include "core/error.h"
 #include "core/object.h"
 #include "frontend/connection-private.h"
+#include "utils/error.h"
 #include "utils/strbuf.h"
+#include "utils/proto.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -65,6 +66,12 @@ connection_init(sdb_object_t *obj, va_list ap)
 				"for a new connection");
 		return -1;
 	}
+	conn->errbuf = sdb_strbuf_create(0);
+	if (! conn->errbuf) {
+		sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate an error buffer "
+				"for a new connection");
+		return -1;
+	}
 
 	conn->client_addr_len = sizeof(conn->client_addr);
 	conn->fd = accept(sock_fd, (struct sockaddr *)&conn->client_addr,
@@ -128,6 +135,8 @@ connection_destroy(sdb_object_t *obj)
 
 	sdb_strbuf_destroy(conn->buf);
 	conn->buf = NULL;
+	sdb_strbuf_destroy(conn->errbuf);
+	conn->errbuf = NULL;
 } /* connection_destroy */
 
 static sdb_type_t connection_type = {
@@ -164,12 +173,15 @@ command_handle(sdb_conn_t *conn)
 	sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
 			conn->cmd, conn->cmd_len);
 
+	/* reset */
+	sdb_strbuf_sprintf(conn->errbuf, "");
+
 	switch (conn->cmd) {
 		case CONNECTION_PING:
 			status = sdb_connection_ping(conn);
 			break;
 		case CONNECTION_STARTUP:
-			status = sdb_session_start(conn);
+			status = sdb_fe_session_start(conn);
 			break;
 
 		case CONNECTION_LIST:
@@ -178,19 +190,21 @@ command_handle(sdb_conn_t *conn)
 
 		default:
 		{
-			char errbuf[1024];
 			sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command");
-			snprintf(errbuf, sizeof(errbuf), "Invalid command %#x", conn->cmd);
-			sdb_connection_send(conn, CONNECTION_ERROR,
-					(uint32_t)(strlen(errbuf) + 1), errbuf);
+			sdb_strbuf_sprintf(conn->errbuf, "Invalid command %#x", conn->cmd);
 			status = -1;
 			break;
 		}
 	}
 
+	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, conn->cmd_len);
+		sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
 	conn->cmd = CONNECTION_IDLE;
 	conn->cmd_len = 0;
 	return status;
@@ -210,7 +224,7 @@ command_init(sdb_conn_t *conn)
 	len = 2 * sizeof(uint32_t);
 	if (conn->cmd == CONNECTION_IDLE)
 		len += conn->cmd_len;
-	sdb_strbuf_skip(conn->buf, len);
+	sdb_strbuf_skip(conn->buf, 0, len);
 	return 0;
 } /* command_init */
 
@@ -288,50 +302,20 @@ ssize_t
 sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 		uint32_t msg_len, const char *msg)
 {
-	size_t len = 2 * sizeof(uint32_t) + msg_len;
-	char buffer[len];
-	char *buf;
-
-	uint32_t tmp;
+	ssize_t status;
 
 	if ((! conn) || (conn->fd < 0))
 		return -1;
 
-	tmp = htonl(code);
-	memcpy(buffer, &tmp, sizeof(uint32_t));
-
-	tmp = htonl(msg_len);
-	memcpy(buffer + sizeof(uint32_t), &tmp, sizeof(uint32_t));
-
-	if (msg_len)
-		memcpy(buffer + 2 * sizeof(uint32_t), msg, msg_len);
-
-	buf = buffer;
-	while (len > 0) {
-		ssize_t status;
-
-		/* XXX: use select() */
-
-		errno = 0;
-		status = write(conn->fd, buf, len);
-		if (status < 0) {
-			char errbuf[1024];
+	status = sdb_proto_send_msg(conn->fd, code, msg_len, msg);
+	if (status < 0) {
+		char errbuf[1024];
 
-			if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
-				continue;
-			if (errno == EINTR)
-				continue;
-
-			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)));
-			return status;
-		}
-
-		len -= (size_t)status;
-		buf += status;
+		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)));
 	}
-	return (ssize_t)len;
+	return status;
 } /* sdb_connection_send */
 
 int