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

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 962cd9c..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>
@@ -203,7 +204,7 @@ command_handle(sdb_conn_t *conn)
 
 	/* 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;
@@ -223,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 */
 
@@ -301,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));
+	status = sdb_proto_send_msg(conn->fd, code, msg_len, msg);
+	if (status < 0) {
+		char errbuf[1024];
 
-	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];
-
-			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