X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=ed1eb2c8565058f562922f3d0b11071d46287ccb;hb=af24300b64d721ec7e3be3edee1477d83b135f8b;hp=09f906c045183fc9ab4e6d59b538580d7eed5e1f;hpb=62bcef8f27358d680dc2b6c0abee051b3f9d4a98;p=sysdb.git diff --git a/src/frontend/connection.c b/src/frontend/connection.c index 09f906c..ed1eb2c 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); @@ -327,6 +325,8 @@ command_handle(sdb_conn_t *conn) status = sdb_fe_list(conn); else if (conn->cmd == SDB_CONNECTION_LOOKUP) status = sdb_fe_lookup(conn); + else if (conn->cmd == SDB_CONNECTION_STORE) + status = sdb_fe_store(conn); else { sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x", conn->cmd); @@ -358,7 +358,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 +405,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 +516,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 "