![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index 3b9799496df8bf1e70d501393e36b91de0ebd86e..96bc04baf805640b747f46861d181ec0177e4e4b 100644 (file)
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
#include "utils/channel.h"
#include "utils/error.h"
#include "utils/llist.h"
+#include "utils/os.h"
#include "utils/strbuf.h"
#include <assert.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <libgen.h>
+
#include <pthread.h>
/*
static int
open_unix_sock(listener_t *listener)
{
+ const char *addr;
+ char *addr_copy;
+ char *base_dir;
struct sockaddr_un sa;
int status;
return -1;
}
+ if (*listener->address == '/')
+ addr = listener->address;
+ else
+ addr = listener->address + strlen("unix:");
+
memset(&sa, 0, sizeof(sa));
sa.sun_family = AF_UNIX;
- strncpy(sa.sun_path, listener->address + strlen("unix:"),
- sizeof(sa.sun_path));
+ strncpy(sa.sun_path, addr, sizeof(sa.sun_path));
+
+ addr_copy = strdup(addr);
+ if (! addr_copy) {
+ char errbuf[1024];
+ sdb_log(SDB_LOG_ERR, "frontend: strdup failed: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ return -1;
+ }
+ base_dir = dirname(addr_copy);
+
+ /* ensure that the directory exists */
+ if (sdb_mkdir_all(base_dir, 0777)) {
+ char errbuf[1024];
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to create directory '%s': %s",
+ base_dir, sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ free(addr_copy);
+ return -1;
+ }
+ free(addr_copy);
- if (unlink(listener->address + strlen("unix:")) && (errno != ENOENT)) {
+ if (unlink(addr) && (errno != ENOENT)) {
char errbuf[1024];
sdb_log(SDB_LOG_WARNING, "frontend: Failed to remove stale UNIX "
"socket %s: %s", listener->address + strlen("unix:"),
static void
close_unix_sock(listener_t *listener)
{
+ const char *addr;
assert(listener);
+
if (! listener->address)
return;
+ if (*listener->address == '/')
+ addr = listener->address;
+ else
+ addr = listener->address + strlen("unix:");
+
if (listener->sock_fd >= 0)
close(listener->sock_fd);
listener->sock_fd = -1;
- unlink(listener->address + strlen("unix:"));
+ unlink(addr);
} /* close_unix_sock */
/*
/* the enum has to be sorted the same as the implementations array
* to ensure that the type may be used as index into the array */
enum {
- LISTENER_UNIXSOCK = 0,
+ LISTENER_UNIXSOCK = 0, /* this is the default */
};
static fe_listener_impl_t listener_impls[] = {
{ LISTENER_UNIXSOCK, "unix", open_unix_sock, close_unix_sock },
sep = strchr(address, (int)':');
if (! sep)
- return -1;
+ return listener_impls[0].type;
assert(sep > address);
len = (size_t)(sep - address);
return listener;
} /* listener_create */
+static void
+socket_clear(sdb_fe_socket_t *sock)
+{
+ size_t i;
+
+ assert(sock);
+ for (i = 0; i < sock->listeners_num; ++i)
+ listener_destroy(sock->listeners + i);
+ if (sock->listeners)
+ free(sock->listeners);
+ sock->listeners = NULL;
+ sock->listeners_num = 0;
+} /* socket_clear */
+
static void
socket_close(sdb_fe_socket_t *sock)
{
while (sdb_llist_iter_has_next(iter)) {
sdb_object_t *obj = sdb_llist_iter_get_next(iter);
- if (FD_ISSET(CONN(obj)->fd, exceptions))
+ if (FD_ISSET(CONN(obj)->fd, exceptions)) {
sdb_log(SDB_LOG_INFO, "Exception on fd %d",
CONN(obj)->fd);
+ /* close the connection */
+ sdb_llist_iter_remove_current(iter);
+ sdb_object_deref(obj);
+ continue;
+ }
if (FD_ISSET(CONN(obj)->fd, ready)) {
sdb_llist_iter_remove_current(iter);
void
sdb_fe_sock_destroy(sdb_fe_socket_t *sock)
{
- size_t i;
-
if (! sock)
return;
- for (i = 0; i < sock->listeners_num; ++i) {
- listener_destroy(sock->listeners + i);
- }
- if (sock->listeners)
- free(sock->listeners);
- sock->listeners = NULL;
+ socket_clear(sock);
sdb_llist_destroy(sock->open_connections);
sock->open_connections = NULL;
return 0;
} /* sdb_fe_sock_add_listener */
+void
+sdb_fe_sock_clear_listeners(sdb_fe_socket_t *sock)
+{
+ if (! sock)
+ return;
+
+ socket_clear(sock);
+} /* sdb_fe_sock_clear_listeners */
+
int
sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
{
return -1;
}
- sdb_log(SDB_LOG_INFO, "frontend: Starting %d connection "
- "handler thread%s managing %d listener%s",
+ sdb_log(SDB_LOG_INFO, "frontend: Starting %zu connection "
+ "handler thread%s managing %zu listener%s",
loop->num_threads, loop->num_threads == 1 ? "" : "s",
sock->listeners_num, sock->listeners_num == 1 ? "" : "s");
while (sdb_llist_iter_has_next(iter)) {
sdb_object_t *obj = sdb_llist_iter_get_next(iter);
+
+ if (CONN(obj)->fd < 0) {
+ sdb_llist_iter_remove_current(iter);
+ sdb_object_deref(obj);
+ continue;
+ }
+
FD_SET(CONN(obj)->fd, &ready);
FD_SET(CONN(obj)->fd, &exceptions);