* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+/* API used by UST components to communicate with each other via sockets. */
+
#define _GNU_SOURCE
#include <sys/types.h>
#include <signal.h>
#include "ustcomm.h"
#include "usterr.h"
#include "share.h"
+#include "multipoll.h"
#define UNIX_PATH_MAX 108
-#define MSG_MAX 10000
-
-/* FIXME: ustcomm blocks on message sending, which might be problematic in
- * some cases. Fix the poll() usage so sends are buffered until they don't
- * block.
- */
-
-//static void bt(void)
-//{
-// void *buffer[100];
-// int result;
-//
-// result = backtrace(&buffer, 100);
-// backtrace_symbols_fd(buffer, result, STDERR_FILENO);
-//}
-
static int mkdir_p(const char *path, mode_t mode)
{
const char *path_p;
return retval;
}
-char *strdup_malloc(const char *s)
-{
- char *retval;
-
- if(s == NULL)
- return NULL;
-
- retval = (char *) malloc(strlen(s)+1);
-
- strcpy(retval, s);
-
- return retval;
-}
-
static int signal_process(pid_t pid)
{
return 0;
if(i == 0) {
/* problem */
+ WARN("received empty message");
}
*msg = strndup(*recv_buf, i);
*recv_buf_size = 0;
return 0;
}
- /* real error */
- PERROR("recv");
- return -1;
+ else if(errno == EINTR) {
+ return -1;
+ }
+ else {
+ PERROR("recv");
+ return -1;
+ }
}
if(result == 0) {
return 0;
list_for_each_entry(conn, &server->connections, list) {
free(deletable_conn);
deletable_conn = conn;
- close(conn->fd);
+ ustcomm_close_app(conn);
list_del(&conn->list);
}
conn_table = (struct ustcomm_connection **) malloc(n_fds * sizeof(struct ustcomm_connection *));
if(conn_table == NULL) {
ERR("malloc returned NULL");
- return -1;
+ retval = -1;
+ goto free_fds_return;
}
/* special idx 0 is for listening socket */
idx++;
}
- while((result = poll(fds, n_fds, timeout)) == -1 && errno == EINTR)
- /* nothing */;
- if(result == -1) {
+ result = poll(fds, n_fds, timeout);
+ if(result == -1 && errno == EINTR) {
+ /* That's ok. ustd receives signals to notify it must shutdown. */
+ retval = -1;
+ goto free_conn_table_return;
+ }
+ else if(result == -1) {
PERROR("poll");
- return -1;
+ retval = -1;
+ goto free_conn_table_return;
+ }
+ else if(result == 0) {
+ retval = 0;
+ goto free_conn_table_return;
}
-
- if(result == 0)
- return 0;
if(fds[0].revents) {
struct ustcomm_connection *newconn;
result = newfd = accept(server->listen_fd, NULL, NULL);
if(result == -1) {
PERROR("accept");
- return -1;
+ retval = -1;
+ goto free_conn_table_return;
}
newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
if(retval == 0) {
/* connection finished */
- close(fds[idx].fd);
-
list_for_each_entry(conn, &server->connections, list) {
if(conn->fd == fds[idx].fd) {
+ ustcomm_close_app(conn);
list_del(&conn->list);
+ free(conn);
break;
}
}
}
else {
- goto free_fds_return;
+ goto free_conn_table_return;
}
}
}
free(fds);
+ free(conn_table);
}
+free_conn_table_return:
+ free(conn_table);
free_fds_return:
free(fds);
return retval;
PERROR("unlink of socket file");
goto close_sock;
}
- WARN("socket already exists; overwriting");
+ DBG("socket already exists; overwriting");
}
result = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
return 1;
}
+/* Return value:
+ * 0: success
+ * -1: error
+ */
+
int ustcomm_connect_path(const char *path, struct ustcomm_connection *conn, pid_t signalpid)
{
int fd;
return close(conn->fd);
}
+/* Open a connection to a traceable app.
+ *
+ * Return value:
+ * 0: success
+ * -1: error
+ */
+
int ustcomm_connect_app(pid_t pid, struct ustcomm_connection *conn)
{
int result;
return ustcomm_connect_path(path, conn, pid);
}
+/* Close a connection to a traceable app. It frees the
+ * resources. It however does not free the
+ * ustcomm_connection itself.
+ */
+
+int ustcomm_close_app(struct ustcomm_connection *conn)
+{
+ close(conn->fd);
+ free(conn->recv_buf);
+
+ return 0;
+}
+
static int ensure_dir_exists(const char *dir)
{
struct stat st;
return -1;
}
-void ustcomm_free_app(struct ustcomm_app *app)
-{
- int result;
- result = close(app->server.listen_fd);
- if(result == -1) {
- PERROR("close");
- return;
- }
-}
-
/* Used by the daemon to initialize its server so applications
* can connect to it.
*/
return retval;
}
-void ustcomm_fini_app(struct ustcomm_app *handle)
+static void ustcomm_fini_server(struct ustcomm_server *server, int keep_socket_file)
{
int result;
struct stat st;
- /* Destroy socket */
- result = stat(handle->server.socketpath, &st);
- if(result == -1) {
- PERROR("stat (%s)", handle->server.socketpath);
- return;
- }
+ if(!keep_socket_file) {
+ /* Destroy socket */
+ result = stat(server->socketpath, &st);
+ if(result == -1) {
+ PERROR("stat (%s)", server->socketpath);
+ return;
+ }
- /* Paranoid check before deleting. */
- result = S_ISSOCK(st.st_mode);
- if(!result) {
- ERR("The socket we are about to delete is not a socket.");
- return;
+ /* Paranoid check before deleting. */
+ result = S_ISSOCK(st.st_mode);
+ if(!result) {
+ ERR("The socket we are about to delete is not a socket.");
+ return;
+ }
+
+ result = unlink(server->socketpath);
+ if(result == -1) {
+ PERROR("unlink");
+ }
}
- result = unlink(handle->server.socketpath);
+ free(server->socketpath);
+
+ result = close(server->listen_fd);
if(result == -1) {
- PERROR("unlink");
+ PERROR("close");
+ return;
}
}
+/* Free a traceable application server */
+
+void ustcomm_fini_app(struct ustcomm_app *handle, int keep_socket_file)
+{
+ ustcomm_fini_server(&handle->server, keep_socket_file);
+}
+
+/* Free a ustd server */
+
+void ustcomm_fini_ustd(struct ustcomm_ustd *handle)
+{
+ ustcomm_fini_server(&handle->server, 0);
+}
+
static const char *find_tok(const char *str)
{
while(*str == ' ') {
return retval;
}
+/* Callback from multipoll.
+ * Receive a new connection on the listening socket.
+ */
+
+static int process_mp_incoming_conn(void *priv, int fd, short events)
+{
+ struct ustcomm_connection *newconn;
+ struct ustcomm_server *server = (struct ustcomm_server *) priv;
+ int newfd;
+ int result;
+
+ result = newfd = accept(server->listen_fd, NULL, NULL);
+ if(result == -1) {
+ PERROR("accept");
+ return -1;
+ }
+
+ newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
+ if(newconn == NULL) {
+ ERR("malloc returned NULL");
+ return -1;
+ }
+
+ ustcomm_init_connection(newconn);
+ newconn->fd = newfd;
+
+ list_add(&newconn->list, &server->connections);
+
+ return 0;
+}
+
+/* Callback from multipoll.
+ * Receive a message on an existing connection.
+ */
+
+static int process_mp_conn_msg(void *priv, int fd, short revents)
+{
+ struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *) priv;
+ int result;
+ char *msg;
+ struct ustcomm_source src;
+
+ if(revents) {
+ src.fd = fd;
+
+ result = recv_message_conn(mpinfo->conn, &msg);
+ if(result == -1) {
+ ERR("error in recv_message_conn");
+ }
+
+ else if(result == 0) {
+ /* connection finished */
+ ustcomm_close_app(mpinfo->conn);
+ list_del(&mpinfo->conn->list);
+ free(mpinfo->conn);
+ }
+ else {
+ mpinfo->cb(msg, &src);
+ free(msg);
+ }
+ }
+
+ return 0;
+}
+
+int free_ustcomm_client_poll(void *data)
+{
+ free(data);
+ return 0;
+}
+
+void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(char *recvbuf, struct ustcomm_source *src))
+{
+ struct ustcomm_connection *conn;
+
+ /* add listener socket */
+ multipoll_add(ent, app->server.listen_fd, POLLIN, process_mp_incoming_conn, &app->server, NULL);
+
+ list_for_each_entry(conn, &app->server.connections, list) {
+ struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *) malloc(sizeof(struct ustcomm_multipoll_conn_info));
+ mpinfo->conn = conn;
+ mpinfo->cb = cb;
+ multipoll_add(ent, conn->fd, POLLIN, process_mp_conn_msg, mpinfo, free_ustcomm_client_poll);
+ }
+}