+ if(result == 0)
+ return 0;
+
+ if(fds[0].revents) {
+ struct ustcomm_connection *newconn;
+ int newfd;
+
+ 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;
+ }
+
+ newconn->fd = newfd;
+
+ list_add(&newconn->list, &server->connections);
+ }
+
+ for(idx=1; idx<n_fds; idx++) {
+ if(fds[idx].revents) {
+ retval = recv_message_fd(fds[idx].fd, msg, src);
+ if(**msg == 0) {
+ /* connection finished */
+ close(fds[idx].fd);
+
+ list_for_each_entry(conn, &server->connections, list) {
+ if(conn->fd == fds[idx].fd) {
+ list_del(&conn->list);
+ break;
+ }
+ }
+ }
+ else {
+ goto free_fds_return;
+ }
+ }
+ }
+
+ free(fds);
+ }
+
+free_fds_return:
+ free(fds);
+ return retval;
+}
+
+int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src, int timeout)
+{
+ return ustcomm_recv_message(&ustd->server, msg, src, timeout);
+}
+
+int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src, int timeout)
+{
+ return ustcomm_recv_message(&app->server, msg, src, timeout);
+}
+
+/* This removes src from the list of active connections of app.
+ */
+
+int ustcomm_app_detach_client(struct ustcomm_app *app, struct ustcomm_source *src)
+{
+ struct ustcomm_server *server = (struct ustcomm_server *)app;
+ struct ustcomm_connection *conn;
+
+ list_for_each_entry(conn, &server->connections, list) {
+ if(conn->fd == src->fd) {
+ list_del(&conn->list);
+ goto found;
+ }
+ }
+
+ return -1;
+found:
+ return src->fd;
+}
+
+static int init_named_socket(char *name, char **path_out)
+{
+ int result;
+ int fd;
+
+ struct sockaddr_un addr;
+
+ result = fd = socket(PF_UNIX, SOCK_STREAM, 0);
+ if(result == -1) {
+ PERROR("socket");
+ return -1;
+ }
+
+ addr.sun_family = AF_UNIX;
+
+ strncpy(addr.sun_path, name, UNIX_PATH_MAX);
+ addr.sun_path[UNIX_PATH_MAX-1] = '\0';
+
+ result = access(name, F_OK);
+ if(result == 0) {
+ /* file exists */
+ result = unlink(name);
+ if(result == -1) {
+ PERROR("unlink of socket file");
+ goto close_sock;
+ }
+ WARN("socket already exists; overwriting");
+ }
+
+ result = bind(fd, (struct sockaddr *)&addr, sizeof(addr));