X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=91a9710e6b8e4789b625bcab1448343a6770e410;hp=09f906c045183fc9ab4e6d59b538580d7eed5e1f;hb=d25f3c59b5cf5387acd4e6d1467ce9efffa40f9a;hpb=62bcef8f27358d680dc2b6c0abee051b3f9d4a98

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 09f906c..91a9710 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -201,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);
@@ -358,7 +356,8 @@ command_init(sdb_conn_t *conn)
 	/* reset */
 	sdb_strbuf_clear(conn->errbuf);
 
-	if (sdb_proto_unmarshal_header(conn->buf, &conn->cmd, &conn->cmd_len))
+	if (sdb_proto_unmarshal_header(SDB_STRBUF_STR(conn->buf),
+				&conn->cmd, &conn->cmd_len) < 0)
 		return -1;
 	sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
 
@@ -404,8 +403,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 */
@@ -516,8 +514,7 @@ sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 
 		/* 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 "