![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 23bbb33920f2186b56004c5b3d8d52d5730a6b01..636396a2434c1edca22edfdb9b3b2103036499cc 100644 (file)
*/
#include "sysdb.h"
-#include "core/error.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 <assert.h>
#include <errno.h>
#include <arpa/inet.h>
+#include <fcntl.h>
#include <string.h>
+/*
+ * 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
*/
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_session_start(conn);
+ 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, conn->cmd_len);
+ sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
conn->cmd = CONNECTION_IDLE;
conn->cmd_len = 0;
return status;
len = 2 * sizeof(uint32_t);
if (conn->cmd == CONNECTION_IDLE)
len += conn->cmd_len;
- sdb_strbuf_skip(conn->buf, len);
+ sdb_strbuf_skip(conn->buf, 0, len);
return 0;
} /* command_init */
* public API
*/
-int
-sdb_connection_init(sdb_conn_t *conn)
+sdb_conn_t *
+sdb_connection_accept(int fd)
{
- if (conn->buf) {
- sdb_log(SDB_LOG_WARNING, "frontend: Attempted to re-initialize "
- "a frontend connection");
- return -1;
- }
+ if (fd < 0)
+ return NULL;
- 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");
- sdb_connection_close(conn);
- return -1;
- }
-
- conn->cmd = CONNECTION_IDLE;
- conn->cmd_len = 0;
- conn->fd = -1;
- return 0;
-} /* sdb_connection_init */
+ /* 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)
{
- size_t len;
-
- 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_connection_fini */
+ sdb_object_deref(SDB_OBJ(conn));
+} /* sdb_connection_close */
ssize_t
sdb_connection_read(sdb_conn_t *conn)
ssize_t
sdb_connection_send(sdb_conn_t *conn, uint32_t code,
- uint32_t msg_len, char *msg)
+ uint32_t msg_len, const char *msg)
{
- size_t len = 2 * sizeof(uint32_t) + msg_len;
- char buffer[len];
- char *buf;
-
- uint32_t tmp;
+ ssize_t status;
if ((! conn) || (conn->fd < 0))
return -1;
- tmp = htonl(code);
- memcpy(buffer, &tmp, sizeof(uint32_t));
-
- tmp = htonl(msg_len);
- memcpy(buffer + sizeof(uint32_t), &tmp, sizeof(uint32_t));
+ status = sdb_proto_send_msg(conn->fd, code, msg_len, msg);
+ if (status < 0) {
+ char errbuf[1024];
- if (msg_len)
- memcpy(buffer + 2 * sizeof(uint32_t), msg, msg_len);
-
- buf = buffer;
- while (len > 0) {
- ssize_t status;
-
- /* XXX: use select() */
-
- errno = 0;
- status = write(conn->fd, buf, len);
- if (status < 0) {
- char errbuf[1024];
-
- if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
- continue;
- if (errno == EINTR)
- continue;
-
- 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;
- }
-
- len -= (size_t)status;
- buf += status;
+ 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 (ssize_t)len;
+ return status;
} /* sdb_connection_send */
int