index 91a9710e6b8e4789b625bcab1448343a6770e410..c35d2d213bd5cee21e9d0e5d3a069f17bce45736 100644 (file)
return strdup(result->pw_name);
} /* peer */
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)
{
static int
connection_init(sdb_object_t *obj, va_list ap)
{
return -1;
}
return -1;
}
+ /* update the object name */
+ snprintf(obj->name + strlen(CONN_FD_PREFIX),
+ strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd);
+
+ /* 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);
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->cmd = SDB_CONNECTION_IDLE;
conn->cmd_len = 0;
conn->skip_len = 0;
conn->cmd = SDB_CONNECTION_IDLE;
conn->cmd_len = 0;
conn->skip_len = 0;
-
- /* update the object name */
- snprintf(obj->name + strlen(CONN_FD_PREFIX),
- strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd);
return 0;
} /* connection_init */
return 0;
} /* connection_init */
conn->ready = 0;
conn->ready = 0;
+ if (conn->finish)
+ conn->finish(conn);
+ conn->finish = NULL;
+
if (conn->buf) {
len = sdb_strbuf_len(conn->buf);
if (len)
if (conn->buf) {
len = sdb_strbuf_len(conn->buf);
if (len)
status = sdb_fe_list(conn);
else if (conn->cmd == SDB_CONNECTION_LOOKUP)
status = sdb_fe_lookup(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);
else {
sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
conn->cmd);
ssize_t status;
errno = 0;
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;
if (status < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
break;
if (! conn)
return;
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);
/* close the connection even if someone else still references it */
if (conn->fd >= 0)
close(conn->fd);
if (sdb_proto_marshal(buf, sizeof(buf), code, msg_len, msg) < 0)
return -1;
if (sdb_proto_marshal(buf, sizeof(buf), code, msg_len, msg) < 0)
return -1;
- status = sdb_write(conn->fd, sizeof(buf), buf);
+ status = conn->write(conn, buf, sizeof(buf));
if (status < 0) {
char errbuf[1024];
if (status < 0) {
char errbuf[1024];