X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=636396a2434c1edca22edfdb9b3b2103036499cc;hp=028f3776966b233ec2371b52653f10ce1752c5c0;hb=ddb7ffc175e49abfa69c82777b88d73e1f1103fb;hpb=25ee4640ebe9532d137024cb45760869eef1eee9 diff --git a/src/frontend/connection.c b/src/frontend/connection.c index 028f377..636396a 100644 --- a/src/frontend/connection.c +++ b/src/frontend/connection.c @@ -26,16 +26,125 @@ */ #include "sysdb.h" -#include "frontend/connection.h" +#include "core/object.h" +#include "frontend/connection-private.h" +#include "utils/error.h" #include "utils/strbuf.h" +#include "utils/proto.h" #include #include #include +#include #include +/* + * private data types + */ + +/* name of connection objects */ +#define CONN_FD_PREFIX "conn#" +#define CONN_FD_PLACEHOLDER "XXXXXXX" + +static int +connection_init(sdb_object_t *obj, va_list ap) +{ + sdb_conn_t *conn; + int sock_fd; + int sock_fl; + + assert(obj); + conn = CONN(obj); + + sock_fd = va_arg(ap, int); + + conn->buf = sdb_strbuf_create(/* size = */ 128); + if (! conn->buf) { + sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate a read buffer " + "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, + &conn->client_addr_len); + + if (conn->fd < 0) { + char buf[1024]; + sdb_log(SDB_LOG_ERR, "frontend: Failed to accept remote " + "connection: %s", sdb_strerror(errno, + buf, sizeof(buf))); + return -1; + } + + if (conn->client_addr.ss_family != AF_UNIX) { + sdb_log(SDB_LOG_ERR, "frontend: Accepted connection using " + "unexpected family type %d", conn->client_addr.ss_family); + return -1; + } + + sock_fl = fcntl(conn->fd, F_GETFL); + if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) { + char buf[1024]; + sdb_log(SDB_LOG_ERR, "frontend: Failed to switch connection conn#%i " + "to non-blocking mode: %s", conn->fd, + sdb_strerror(errno, buf, sizeof(buf))); + return -1; + } + + sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i", + conn->fd); + + conn->cmd = CONNECTION_IDLE; + conn->cmd_len = 0; + + /* update the object name */ + snprintf(obj->name + strlen(CONN_FD_PREFIX), + strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd); + return 0; +} /* connection_init */ + +static void +connection_destroy(sdb_object_t *obj) +{ + sdb_conn_t *conn; + size_t len; + + assert(obj); + conn = CONN(obj); + + if (conn->buf) { + len = sdb_strbuf_len(conn->buf); + if (len) + sdb_log(SDB_LOG_INFO, "frontend: Discarding incomplete command " + "(%zu byte%s left in buffer)", len, len == 1 ? "" : "s"); + } + + sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection on fd=%i", + conn->fd); + close(conn->fd); + conn->fd = -1; + + sdb_strbuf_destroy(conn->buf); + conn->buf = NULL; + sdb_strbuf_destroy(conn->errbuf); + conn->errbuf = NULL; +} /* connection_destroy */ + +static sdb_type_t connection_type = { + /* size = */ sizeof(sdb_conn_t), + /* init = */ connection_init, + /* destroy = */ connection_destroy, +}; + /* * connection handler functions */ @@ -57,21 +166,65 @@ connection_get_int32(sdb_conn_t *conn, size_t offset) static int command_handle(sdb_conn_t *conn) { - assert(conn && conn->cmd && conn->cmd_len); - /* XXX */ - sdb_strbuf_skip(conn->buf, conn->cmd_len); - return 0; + int status = -1; + + assert(conn && (conn->cmd != CONNECTION_IDLE)); + + 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_fe_session_start(conn); + break; + + case CONNECTION_LIST: + status = sdb_fe_list(conn); + break; + + default: + { + sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command"); + 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, 0, conn->cmd_len); + conn->cmd = CONNECTION_IDLE; + conn->cmd_len = 0; + return status; } /* command_handle */ /* initialize the connection state information */ static int command_init(sdb_conn_t *conn) { - assert(conn && (! conn->cmd) && (! conn->cmd_len)); + size_t len; + + assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len)); conn->cmd = connection_get_int32(conn, 0); conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t)); - sdb_strbuf_skip(conn->buf, 2 * sizeof(uint32_t)); + + len = 2 * sizeof(uint32_t); + if (conn->cmd == CONNECTION_IDLE) + len += conn->cmd_len; + sdb_strbuf_skip(conn->buf, 0, len); return 0; } /* command_init */ @@ -104,6 +257,24 @@ connection_read(sdb_conn_t *conn) * public API */ +sdb_conn_t * +sdb_connection_accept(int fd) +{ + if (fd < 0) + return NULL; + + /* the placeholder will be replaced with the accepted file + * descriptor when initializing the object */ + return CONN(sdb_object_create(CONN_FD_PREFIX CONN_FD_PLACEHOLDER, + connection_type, fd)); +} /* sdb_connection_create */ + +void +sdb_connection_close(sdb_conn_t *conn) +{ + sdb_object_deref(SDB_OBJ(conn)); +} /* sdb_connection_close */ + ssize_t sdb_connection_read(sdb_conn_t *conn) { @@ -111,18 +282,52 @@ sdb_connection_read(sdb_conn_t *conn) while (42) { ssize_t status = connection_read(conn); + + if ((conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len) + && (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t))) + command_init(conn); + if ((conn->cmd != CONNECTION_IDLE) + && (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) + command_handle(conn); + if (status <= 0) break; n += status; - - if (conn->cmd_len && (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) - command_handle(conn); - else if (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)) - command_init(conn); } return n; } /* sdb_connection_read */ +ssize_t +sdb_connection_send(sdb_conn_t *conn, uint32_t code, + uint32_t msg_len, const char *msg) +{ + ssize_t status; + + if ((! conn) || (conn->fd < 0)) + return -1; + + status = sdb_proto_send_msg(conn->fd, code, msg_len, msg); + if (status < 0) { + char errbuf[1024]; + + 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; +} /* sdb_connection_send */ + +int +sdb_connection_ping(sdb_conn_t *conn) +{ + if ((! conn) || (conn->cmd != CONNECTION_PING)) + return -1; + + /* we're alive */ + sdb_connection_send(conn, CONNECTION_OK, 0, NULL); + return 0; +} /* sdb_connection_ping */ + /* vim: set tw=78 sw=4 ts=4 noexpandtab : */