X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fsock.c;h=4cf1d79e295a832e44d08a272156f4800fe6eb6b;hp=d7b2ee97324ddef9d32246f9be163ec30152f998;hb=ddb933096618a6bceded29e4dc2b37cb72134366;hpb=23760ca65713cd9b8338f09bf45ec20ff4c3ef8d diff --git a/src/frontend/sock.c b/src/frontend/sock.c index d7b2ee9..4cf1d79 100644 --- a/src/frontend/sock.c +++ b/src/frontend/sock.c @@ -26,27 +26,24 @@ */ #include "sysdb.h" -#include "core/error.h" #include "core/object.h" +#include "frontend/connection-private.h" #include "frontend/sock.h" #include "utils/channel.h" +#include "utils/error.h" #include "utils/llist.h" #include "utils/strbuf.h" #include #include -#include - #include #include #include #include -#include - #include #include #include @@ -55,31 +52,10 @@ #include -/* name of connection objects */ -#define CONN_FD_PREFIX "conn#" -#define CONN_FD_PLACEHOLDER "XXXXXXX" - /* * private data types */ -typedef struct { - sdb_object_t super; - - /* connection and client information */ - int fd; - struct sockaddr_storage client_addr; - socklen_t client_addr_len; - - /* read buffer */ - sdb_strbuf_t *buf; - - /* state information for the currently executed command */ - uint32_t cmd; - uint32_t cmd_len; -} connection_obj_t; -#define CONN(obj) ((connection_obj_t *)(obj)) - typedef struct { char *address; int type; @@ -282,156 +258,10 @@ socket_close(sdb_fe_socket_t *sock) listener_close(sock->listeners + i); } /* socket_close */ -/* - * private data types - */ - -static int -connection_init(sdb_object_t *obj, va_list ap) -{ - connection_obj_t *conn; - int sock_fd; - int sock_fl; - - assert(obj); - conn = CONN(obj); - - sock_fd = va_arg(ap, int); - - CONN(obj)->buf = sdb_strbuf_create(/* size = */ 128); - if (! CONN(obj)->buf) { - sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate a read buffer " - "for a new remote 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); - - /* 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) -{ - connection_obj_t *conn; - size_t len; - - assert(obj); - conn = CONN(obj); - - len = sdb_strbuf_len(conn->buf); - if (len) - sdb_log(SDB_LOG_INFO, "frontend: Discarding incomplete command " - "(%zu bytes left in buffer)", len); - - sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection on fd=%i", conn->fd); - close(conn->fd); - conn->fd = -1; - - sdb_strbuf_destroy(CONN(obj)->buf); -} /* connection_destroy */ - -static sdb_type_t connection_type = { - /* size = */ sizeof(connection_obj_t), - /* init = */ connection_init, - /* destroy = */ connection_destroy, -}; - /* * connection handler functions */ -static uint32_t -connection_get_int32(connection_obj_t *conn, size_t offset) -{ - const char *data; - uint32_t n; - - assert(conn && (sdb_strbuf_len(conn->buf) >= offset + sizeof(uint32_t))); - - data = sdb_strbuf_string(conn->buf); - memcpy(&n, data + offset, sizeof(n)); - n = ntohl(n); - return n; -} /* connection_get_int32 */ - -static int -command_handle(connection_obj_t *conn) -{ - assert(conn && conn->cmd && conn->cmd_len); - /* XXX */ - sdb_strbuf_skip(conn->buf, conn->cmd_len); - return 0; -} /* command_handle */ - -/* initialize the connection state information */ -static int -command_init(connection_obj_t *conn) -{ - assert(conn && (! conn->cmd) && (! 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)); - return 0; -} /* command_init */ - -/* returns negative value on error, 0 on EOF, number of octets else */ -static ssize_t -connection_read(connection_obj_t *conn) -{ - ssize_t n = 0; - - while (42) { - ssize_t status; - - errno = 0; - status = sdb_strbuf_read(conn->buf, conn->fd, 1024); - if (status < 0) { - if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) - return n; - return (int)status; - } - else if (! status) /* EOF */ - return n; - - n += status; - } - - return n; -} /* connection_read */ - static void * connection_handler(void *data) { @@ -441,7 +271,7 @@ connection_handler(void *data) while (42) { struct timespec timeout = { 0, 500000000 }; /* .5 seconds */ - connection_obj_t *conn; + sdb_conn_t *conn; int status; errno = 0; @@ -460,18 +290,13 @@ connection_handler(void *data) continue; } - status = (int)connection_read(conn); + status = (int)sdb_connection_read(conn); if (status <= 0) { /* error or EOF -> close connection */ sdb_object_deref(SDB_OBJ(conn)); continue; } - 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 the connection to the main loop */ if (sdb_llist_append(sock->open_connections, SDB_OBJ(conn))) { sdb_log(SDB_LOG_ERR, "frontend: Failed to re-append " @@ -489,25 +314,21 @@ static int connection_accept(sdb_fe_socket_t *sock, listener_t *listener) { sdb_object_t *obj; + int status; - /* the placeholder will be replaced with the accepted file - * descriptor when initializing the object */ - obj = sdb_object_create(CONN_FD_PREFIX CONN_FD_PLACEHOLDER, - connection_type, listener->sock_fd); + obj = SDB_OBJ(sdb_connection_accept(listener->sock_fd)); if (! obj) return -1; - if (sdb_llist_append(sock->open_connections, obj)) { + status = sdb_llist_append(sock->open_connections, obj); + if (status) sdb_log(SDB_LOG_ERR, "frontend: Failed to append " "connection %s to list of open connections", obj->name); - sdb_object_deref(obj); - return -1; - } - /* hand ownership over to the list */ + /* hand ownership over to the list; or destroy in case of an error */ sdb_object_deref(obj); - return 0; + return status; } /* connection_accept */ static int @@ -629,7 +450,7 @@ sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop) max_listen_fd = listener->sock_fd; } - sock->chan = sdb_channel_create(1024, sizeof(connection_obj_t *)); + sock->chan = sdb_channel_create(1024, sizeof(sdb_conn_t *)); if (! sock->chan) { socket_close(sock); return -1;