index 09f906c045183fc9ab4e6d59b538580d7eed5e1f..700c84ae42af2e0793b289e82c770807df609e51 100644 (file)
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/param.h>
-
-#ifdef HAVE_UCRED_H
-# include <ucred.h>
-#endif
-#ifdef HAVE_SYS_UCRED_H
-# include <sys/ucred.h>
-#endif
-
-#include <pwd.h>
-
#include <pthread.h>
/*
#include <pthread.h>
/*
#define CONN_FD_PREFIX "conn#"
#define CONN_FD_PLACEHOLDER "XXXXXXX"
#define CONN_FD_PREFIX "conn#"
#define CONN_FD_PLACEHOLDER "XXXXXXX"
-/* XXX: only supports UNIX sockets so far */
-static char *
-peer(int sockfd)
+static ssize_t
+conn_read(sdb_conn_t *conn, size_t len)
{
{
- uid_t uid;
-
- struct passwd pw_entry;
- struct passwd *result = NULL;
- char buf[1024];
+ return sdb_strbuf_read(conn->buf, conn->fd, len);
+} /* conn_read */
-#ifdef SO_PEERCRED
- struct ucred cred;
- socklen_t len = sizeof(cred);
-
- if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &cred, &len)
- || (len != sizeof(cred)))
- return NULL;
- uid = cred.uid;
-#else /* SO_PEERCRED */
- errno = ENOSYS;
- return NULL;
-#endif
-
- memset(&pw_entry, 0, sizeof(pw_entry));
- if (getpwuid_r(uid, &pw_entry, buf, sizeof(buf), &result)
- || (! result))
- return NULL;
- return strdup(result->pw_name);
-} /* peer */
+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);
return -1;
}
return -1;
}
- conn->username = peer(conn->fd);
- if (! conn->username) {
- char buf[1024];
- sdb_log(SDB_LOG_ERR, "frontend: Failed to retrieve peer for "
- "connection conn#%i: %s", conn->fd,
- sdb_strerror(errno, buf, sizeof(buf)));
- return -1;
- }
+ conn->username = NULL;
conn->ready = 0;
sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
conn->ready = 0;
sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
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)
}
sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name);
}
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);
if (conn->username)
free(conn->username);
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);
/* reset */
sdb_strbuf_clear(conn->errbuf);
/* reset */
sdb_strbuf_clear(conn->errbuf);
- if (sdb_proto_unmarshal_header(conn->buf, &conn->cmd, &conn->cmd_len))
+ 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));
return -1;
sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
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;
- close(conn->fd);
- conn->fd = -1;
+ sdb_connection_close(conn);
return (int)status;
}
else if (! status) /* EOF */
return (int)status;
}
else if (! status) /* EOF */
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];
/* tell other code that there was a problem and, more importantly,
* make sure we don't try to send further logs to the connection */
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 "
conn->ready = 0;
sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "