![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index ed1eb2c8565058f562922f3d0b11071d46287ccb..44247ebd4961988035b7c90c70baf12e377b8c0b 100644 (file)
#include <arpa/inet.h>
#include <fcntl.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 <sys/un.h>
-#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
#include <pthread.h>
+#include <netdb.h>
/*
* private variables
#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;
+ return sdb_strbuf_read(conn->buf, conn->fd, len);
+} /* conn_read */
- struct passwd pw_entry;
- struct passwd *result = NULL;
- char buf[1024];
-
-#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)
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;
- }
+ /* 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;
sock_fl = fcntl(conn->fd, F_GETFL);
if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) {
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->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 */
conn->ready = 0;
+ if (conn->finish)
+ conn->finish(conn);
+ conn->finish = NULL;
+
if (conn->buf) {
len = sdb_strbuf_len(conn->buf);
if (len)
assert(conn && (conn->cmd != SDB_CONNECTION_IDLE));
assert(! conn->skip_len);
- sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
- conn->cmd, conn->cmd_len);
-
if (conn->cmd == SDB_CONNECTION_PING)
status = sdb_connection_ping(conn);
else if (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;
} /* sdb_connection_enable_logging */
sdb_conn_t *
-sdb_connection_accept(int fd)
+sdb_connection_accept(int fd, sdb_conn_setup_cb setup, void *user_data)
{
+ sdb_conn_t *conn;
+ const char *peer = "unknown";
+
if (fd < 0)
return NULL;
/* 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,
+ conn = CONN(sdb_object_create(CONN_FD_PREFIX CONN_FD_PLACEHOLDER,
connection_type, fd));
+ if (setup && (setup(conn, user_data) < 0)) {
+ sdb_object_deref(SDB_OBJ(conn));
+ return NULL;
+ }
+
+ if (conn->username)
+ peer = conn->username;
+
+ if (conn->client_addr.ss_family == AF_UNIX) {
+ sdb_log(SDB_LOG_INFO,
+ "frontend: Accepted connection from peer %s", peer);
+ }
+ else {
+ char host[1024] = "<unknown>", port[32] = "";
+ getnameinfo((struct sockaddr *)&conn->client_addr,
+ conn->client_addr_len, host, sizeof(host), port, sizeof(port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
+ sdb_log(SDB_LOG_INFO, "frontend: Accepted connection from "
+ "peer %s at %s:%s", peer, host, port);
+ }
+ return conn;
} /* sdb_connection_create */
void
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);
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];