connection: Use sdb_connection_close to close a connection.

[sysdb.git] / src / frontend / connection.c

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index b27b3dd28bfbfd0324941d1861bc2bdd5d60a8ca..55843fd049d9e2569c24b8d42c6d20776039929d 100644 (file)
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -36,6 +36,7 @@
 #include "utils/error.h"
 #include "utils/strbuf.h"
 #include "utils/proto.h"
+#include "utils/os.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -200,9 +201,7 @@ connection_destroy(sdb_object_t *obj)
        }
 
        sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name);
-       if (conn->fd >= 0)
-               close(conn->fd);
-       conn->fd = -1;
+       sdb_connection_close(conn);
 
        if (conn->username)
                free(conn->username);
@@ -357,9 +356,8 @@ command_init(sdb_conn_t *conn)
        /* reset */
        sdb_strbuf_clear(conn->errbuf);
 
-       conn->cmd = sdb_proto_get_int(conn->buf, 0);
-       conn->cmd_len = sdb_proto_get_int(conn->buf, sizeof(uint32_t));
-
+       if (sdb_proto_unmarshal_header(conn->buf, &conn->cmd, &conn->cmd_len))
+               return -1;
        sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
 
        if ((! conn->ready) && (conn->cmd != SDB_CONNECTION_STARTUP))
@@ -404,8 +402,7 @@ connection_read(sdb_conn_t *conn)
                        if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
                                break;
 
-                       close(conn->fd);
-                       conn->fd = -1;
+                       sdb_connection_close(conn);
                        return (int)status;
                }
                else if (! status) /* EOF */
@@ -462,12 +459,10 @@ sdb_connection_close(sdb_conn_t *conn)
        if (conn->fd >= 0)
                close(conn->fd);
        conn->fd = -1;
-
-       sdb_object_deref(SDB_OBJ(conn));
 } /* sdb_connection_close */
 
 ssize_t
-sdb_connection_read(sdb_conn_t *conn)
+sdb_connection_handle(sdb_conn_t *conn)
 {
        ssize_t n = 0;
 
@@ -498,25 +493,27 @@ sdb_connection_read(sdb_conn_t *conn)
 
        sdb_conn_set_ctx(NULL);
        return n;
-} /* sdb_connection_read */
+} /* sdb_connection_handle */
 
 ssize_t
 sdb_connection_send(sdb_conn_t *conn, uint32_t code,
                uint32_t msg_len, const char *msg)
 {
+       char buf[2 * sizeof(uint32_t) + msg_len];
        ssize_t status;
 
        if ((! conn) || (conn->fd < 0))
                return -1;
+       if (sdb_proto_marshal(buf, sizeof(buf), code, msg_len, msg) < 0)
+               return -1;
 
-       status = sdb_proto_send_msg(conn->fd, code, msg_len, msg);
+       status = sdb_write(conn->fd, sizeof(buf), buf);
        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_connection_close(conn);
                conn->ready = 0;
 
                sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "