index ea2970f2f61f2f9faa1022b9457ce3e0c217a184..f35f7b39c82a8278f47137e65810163094c33044 100644 (file)
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
+#include "utils/os.h"
#include <assert.h>
#include <errno.h>
return strdup(result->pw_name);
} /* peer */
+static ssize_t
+conn_read(sdb_conn_t *conn, size_t len)
+{
+ return sdb_strbuf_read(conn->buf, conn->fd, len);
+} /* conn_read */
+
+static ssize_t
+conn_write(sdb_conn_t *conn, const void *buf, size_t len)
+{
+ return sdb_write(conn->fd, len, buf);
+} /* conn_write */
+
static int
connection_init(sdb_object_t *obj, va_list ap)
{
return -1;
}
+ /* defaults */
+ conn->read = conn_read;
+ conn->write = conn_write;
+ conn->finish = NULL;
+ conn->session = NULL;
+
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);
conn->ready = 0;
+ if (conn->finish)
+ conn->finish(conn);
+ conn->finish = NULL;
+
if (conn->buf) {
len = sdb_strbuf_len(conn->buf);
if (len)
}
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);
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);
/* reset */
sdb_strbuf_clear(conn->errbuf);
- conn->cmd = sdb_proto_get_int(conn->buf, 0);
- conn->cmd_len = sdb_proto_get_int(conn->buf, sizeof(uint32_t));
-
+ 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));
if ((! conn->ready) && (conn->cmd != SDB_CONNECTION_STARTUP))
ssize_t status;
errno = 0;
- status = sdb_strbuf_read(conn->buf, conn->fd, 1024);
+ status = conn->read(conn, 1024);
if (status < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
break;
- close(conn->fd);
- conn->fd = -1;
+ sdb_connection_close(conn);
return (int)status;
}
else if (! status) /* EOF */
if (! conn)
return;
+ if (conn->finish)
+ conn->finish(conn);
+ conn->finish = NULL;
+
/* close the connection even if someone else still references it */
if (conn->fd >= 0)
close(conn->fd);
conn->fd = -1;
-
- sdb_object_deref(SDB_OBJ(conn));
} /* sdb_connection_close */
ssize_t
if (sdb_proto_marshal(buf, sizeof(buf), code, msg_len, msg) < 0)
return -1;
- status = sdb_proto_send(conn->fd, sizeof(buf), buf);
+ status = conn->write(conn, buf, sizeof(buf));
if (status < 0) {
char errbuf[1024];
/* 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 "